arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #184 in TEA/mina-sidor-fa-web from feature/TV-731-refaktorisera-avvikelserapport to develop

Browse Source 
Squashed commit of the following:

commit 62ea9988b66107457da553bf2cd0e423a6f44606
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 7 08:26:52 2021 +0200

    simplify post requests

commit bf35fa3f4972536c52c15d0ef942678e565fff74
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 7 07:44:15 2021 +0200

    Update deltagare-avvikelse.component.html

commit 22e55d0e51eb83f2d8bbc6c9e3a65d2bd479fa92
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 17:06:27 2021 +0200

    wip

commit 2836a0c7687755dbf7b7e20d98f24d9bf3bc3f40
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:55:14 2021 +0200

    merge with develop

commit 77f16e8a1961b623bb741056882a1df3480f9d13
Merge: a4e3b940 890573b1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:51:50 2021 +0200

    Merge branch 'develop' into feature/TV-731-refaktorisera-avvikelserapport

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/deltagare-avvikelse.component.html
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelse/deltagare-avvikelse.component.ts

commit a4e3b940ca9e2e484f92dd5d05e14a65e714b897
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 16:38:35 2021 +0200

    Refactor avvikelse

commit 5e1923324801baba29bcf2273908075ccc5e29e1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 15:13:34 2021 +0200

    Update deltagare-avvikelse.component.html

commit e57b42761b07899f3922f65995bc905abed44c83
Merge: 14a776bc 19a3b05e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Oct 6 12:54:23 2021 +0200

    Merged develop

commit 14a776bc2e72dd7145dfe27e5e5745cc0d5b43a1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 12:33:57 2021 +0200

    correct API

commit 9c155b578454865aaa6a4557348d3fd460459434
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 11:36:38 2021 +0200

    match utv API

commit 6625524adab2e04269ad14a3c581505e83c8483a
Merge: 2a9cbee7 3d941fdd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 6 10:45:46 2021 +0200

    Merge branch 'develop' into feature/TV-731-refaktorisera-avvikelserapport

commit 2a9cbee7e544decb0a897063bcbbe6b0ac883608
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 5 15:06:42 2021 +0200

    Update deltagare-avvikelse.component.ts
This commit is contained in:
Daniel Appelgren
2021-10-07 09:28:58 +02:00
parent 890573b1fe
commit 28f94c7a29
9 changed files with 267 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/proxy.conf.json
View File

@@ -8,6 +8,8 @@
"target": "https://298b3305d4834aa4869f8250a0d0b314.ece-test.arbetsformedlingen.se:9243",
"secure": false,
"changeOrigin": true,
"pathRewrite": { "^/logging": "" }
"pathRewrite": {
"^/logging": ""
}
}
}