Christian Gårdebrink cac0515c9c Merge pull request #76 in TEA/mina-sidor-fa-web from bugs/TV-520 to develop ...

Squashed commit of the following:

commit 0b09c15d23fb2bfeb54cbf9e9508a65c782ba230
Merge: 32383b6 9a73ffe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 7 10:09:02 2021 +0200

    Merge branch 'develop-remote' into bugs/TV-520

commit 32383b6d1f2b3611cb99c7b05c66b46b561175fe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 12:57:24 2021 +0200

    TV-520 fixed failing test after merge from develop

commit 29fff4e9dd055dd0da2ba21e8b95a9c4ae9714b4
Merge: b28ef1c db03d97
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 12:46:50 2021 +0200

    Merge branch 'develop-remote' into bugs/TV-520

commit b28ef1c1e8645452ab43f1dce8732f69ca73781c
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 10:30:13 2021 +0200

    TV-520 removed unnecessary reference

commit 17d39ec2d396aa4eb60d739a2a04b6e64d2fb5df
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 09:55:23 2021 +0200

    TV-520 varied fixes for template errors..

commit 8196d0305b224475786843bd149d4e13cc3039aa
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 09:06:56 2021 +0200

    Merge branch 'develop-remote' into bugs/TV-520

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/administration/administration-routing.module.ts

commit 8911fdd694d227b901ad492679ed2ed0d044beeb
Merge: 31cd47f ec7b4fc
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 08:56:53 2021 +0200

    Merge branch 'develop-remote' into bugs/TV-520

commit 31cd47ff2e13d090dd3489e21f18fcf292600cbd
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 6 08:52:06 2021 +0200

    TV-520 lade in en funktion i layout komponenten som i stort sett alla sidor verkar använda sig av där title sätts till vad man lagt in för info i data objektet för den aktuella routen.

2021-09-07 12:59:54 +02:00

1.4 KiB

Raw Blame History

View Raw