arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180 Commits 1 Branch 0 Tags
59ce3932591c21d5a8b5a2aa0ee369778363f587
Commit Graph

3 Commits

Author SHA1 Message Date
Christian Gårdebrink fae7d9ad8c Merge pull request #59 in TEA/dafa-web-monorepo from feature/TV-244 to develop 
Squashed commit of the following:

commit b8ea6da64b2fbdc1bbc0d7546c6ce859ce6981cd
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 15:17:39 2021 +0200

    minor changes to get correct employee data from mock-api

commit 715eff33a8f3cccd7ddce8bd32996190dc6597f3
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 15:05:26 2021 +0200

    minor changes and added employee email to mock-data (TV-244)

commit 454641e1fd486e4aee271d63406a28f47c299b45
Merge: f5e0950 ecb929a
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 14:52:39 2021 +0200

    merged with develop and fixed conflicts (TV-244)

commit f5e0950da2de0465fb6eaee39a0e1c13b1c52281
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 13:31:01 2021 +0200

    flyttat över grundstrukturen till edit-employee-form componenten

commit bcce2e41646b45c65929d057248b6767a832d807
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 12:42:12 2021 +0200

    pre-populated email-input and minor changes to employee model and moch-api

commit 088ed6efb0cebdea86d25094ca1fd55827f938d2
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 11:12:57 2021 +0200

    TV-244 small adjustments.

commit be17adf5d898b42467a557832e728ca3827f58d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 10:43:26 2021 +0200

    TV-244 extended emplyee authorizations to a list with two random authorizations.

commit cc57a6d2ceae4069d48aa670a6fea95c21ebd628
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 19 10:25:42 2021 +0200

    minor changes and re-wrote the mock-api to similar data for authorizations and employee-auth

commit 0a22b310729e2a359aa9f1c9d475ac875b6b2301
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 05:37:05 2021 +0200

    TV-244 wip

commit 0e80b5bc4ac14b74f1a8c58ec257ca1f6453e119
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 17:14:48 2021 +0200

    TV-244 WIP
 2021-08-19 15:56:00 +02:00
Nicolas Fuentes Maturana d4874d6cd5 Merge pull request #55 in TEA/dafa-web-monorepo from feature/TV-366 to develop 
Squashed commit of the following:

commit 41f27ba3701d7b690e941f2038676218facaab84
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:40:44 2021 +0200

    TV-366 removed redundant import

commit f31d3d6545375e2c84254a60b9e072333fddaa80
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:38:41 2021 +0200

    TV-366 made a bunch of changes in accordance with the feedback from the current pull request.

commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5
Merge: 721b58e e712f2f
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:10:28 2021 +0200

    Co-authored-by: af-aden <af-aden@users.noreply.github.com>

commit 721b58e1767c465673cb817414e1410b403f5e60
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 10:16:40 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts
    #	apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts

commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82
Merge: fbda233 218e3d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 09:41:54 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit fbda233782a0850edb5e23b50f0030486a15effe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:50:08 2021 +0200

    TV-366 removing stored selected organization when logging out.

commit ed51909892cd92f180f6785635f85c735ec3f129
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:05:14 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/dafa-web/src/app/shared/services/api/user.service.ts

commit 6a77f2497aec71d174c719d27c6d5c644ba53fed
Merge: 17f643d 6d29baa
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:04:22 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit 17f643d18abcbdbfe12a91a63179278d559fdba5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 17:35:59 2021 +0200

    TV-366 First version od organization-picker
 2021-08-19 08:17:59 +02:00
Erik Tiekstra 03a2c7a42f refactor(project): Renamed all instances of dafa to msfa or mina-sidor-fa. (TV-379) 
Squashed commit of the following:

commit d3f52ff6876f6e246c7d3c188e56cc2370289341
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Aug 17 14:10:38 2021 +0200

    Renamed all dafa instances to msfa
 2021-08-18 07:10:28 +02:00