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

2 Commits

Author SHA1 Message Date
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
c4440a2bbe Merge pull request #14 in TEA/dafa-web-monorepo from feature/more-mock-api-fixes to develop 
Squashed commit of the following:

commit 9473ca4e23eb6c5967d9df3403cc071d48e0ab73
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Jun 1 08:18:39 2021 +0200

    Adding footer

commit 8f13809ad3928fd09fd67d713a61c2ca4ef27bc4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Jun 1 06:57:34 2021 +0200

    Added footer

commit ee8a5be048786843e3c5672368a0663ead424852
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 31 16:07:14 2021 +0200

    Added size to edit icon

commit b8e99713bc0190075cfe201f8cd515dca78e184e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 24 15:54:15 2021 +0200

    Renamed create account to employee form and fixed some validation

commit 935509bc5dd6bc7f6533b580197da2f8c15affc3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 24 08:28:40 2021 +0200

    More changes to mock-api and views

commit d0bb8e1c0130c996ee89413f5ddda015fcf49ec5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri May 21 11:22:40 2021 +0200

    Modified mock-api and implemented a part inside employee-list
 2021-06-01 11:19:22 +02:00