arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176 Commits 1 Branch 0 Tags
fae7d9ad8c3b1ce1b3f8179ab9b425feb1f4d01f
Commit Graph
2 Commits
This Branch
This Branch
All Branches
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
Christian Gårdebrink 1e41ab069f Merge pull request #40 in TEA/dafa-web-monorepo from feature/TV-280 to develop 
Squashed commit of the following:

commit d81856c59c267c8a8fe783b74ce1a6fdda36426d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 11 09:21:27 2021 +0200

    TV-280 package-lock fix.

commit 62ea965118c8a423c506663b73e3f6961cef8cc2
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 10 11:50:22 2021 +0200

    TV-280 bytte ut DeltagareAvrop mot Avrop och fixade lite kompileringsfel när man byggde till prod.

commit b12d1f25118de2315475a6a944915b8a2eaf6cdf
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 10 10:52:59 2021 +0200

    TV-280 fixat lite mergningsproblem från develop-branchen..

commit ab26ceaf60c4508ad9fa66aba4e48e85de81d1d8
Merge: 6dec798 8c5bbe2
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 10 09:30:30 2021 +0200

    Merge branch 'develop' into feature/TV-280

commit 8c5bbe2b0c728941566da5e4e290b6b0f66d3149
Merge: ce2dcb0 9a49f9a
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 10 09:27:11 2021 +0200

    Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

commit 6dec7980eb2c3eb845643e7358905d2b85fd3cad
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Aug 9 12:54:45 2021 +0200

    TV-280 anpassade egenskaper till namn i API:et

commit ce2dcb0aaf0604891cf41f4cb56c812b4f985f95
Merge: 06cf023 f7207ae
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Aug 9 10:56:10 2021 +0200

    Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

commit 0c83b68114b43c6263c4fac186f987f17697f8c8
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Aug 9 09:25:06 2021 +0200

    TV-280 ändrade efter feedback i PR..

commit 10724872b3bb19b21c023173c0dd884e47de09ef
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 6 21:45:43 2021 +0200

    TV-280 lade till information om handledare om det finns sådan.

commit e8072207c5d634a244bd9549efdc58de1ea4d69e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 6 21:41:53 2021 +0200

    TV-280 glömde att kryssrutan för att ta bort deltagaren bara ska visas när handledareConfirmed är true, lade till det nu.

commit 248bc391c0943eb9427e803a0694dc0502f55cdf
Merge: b43af52 06cf023
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 6 17:33:25 2021 +0200

    Merge branch 'develop' into feature/TV-280

commit 06cf023e0685574b2dd43d1cd3b5227bb72f58c2
Merge: 0b53b3e 229fb83
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 6 17:32:54 2021 +0200

    Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

commit b43af528b23371a1da7359e0153a4517a890b165
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 6 17:32:42 2021 +0200

    TV-280 första utkast på rad. Model är rena tramset tills vidare..

commit 0b53b3eee95caa759364e627eea7c1118a8702a2
Merge: c2466f1 5d1e357
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 4 10:28:22 2021 +0200

    Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

commit 7fbff2fa570d64da87192b914dfbb2c7e49b1147
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 4 09:57:21 2021 +0200

    TV-280 wip

commit c2466f11190e10666e463b4c85acf1fd94bd0c3a
Merge: 0c0c045 76fbab9
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 3 16:31:44 2021 +0200

    Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop

commit 0c0c045f341d70dd21f246eebf85d5ed71393796
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Aug 2 09:20:41 2021 +0200

    Added open-shift configuration for api-route
 2021-08-11 09:35:53 +02:00