Commit Graph

91 Commits

Author SHA1 Message Date
Erik Tiekstra eb18ea03a2 Updated api for employee 2021-05-11 15:19:53 +02:00
Erik Tiekstra 178b15fcc5 Updated nginx 2021-05-11 14:54:03 +02:00
Erik Tiekstra 2b84413ba0 Updated nginx version inside nginx.conf 2021-05-11 14:41:32 +02:00
Erik Tiekstra 2c54c58e2e Copy nginx.conf inside Jenkinsfile instead of angular.json 2021-05-11 14:10:34 +02:00
Erik Tiekstra 91d30bd9bd Updated angular.json 2021-05-11 09:19:49 +02:00
Erik Tiekstra 6f8bf890ba Added fetch for single employee and prepared data for access-groups 2021-05-06 15:33:21 +02:00
Gustav Ek 923cc737ae Merge pull request #11 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-npm-cache-fix to develop
* commit '1c18b46fa22b4b64487414a760a05600056c4958':
  Jenkinsfile edited online with Bitbucket
2021-05-06 10:17:50 +02:00
Gustav Ek 1c18b46fa2 Jenkinsfile edited online with Bitbucket 2021-05-06 10:17:37 +02:00
Erik Tiekstra 6a573d0e87 Moved back node_modules cache 2021-05-06 10:06:20 +02:00
Erik Tiekstra b208d24af6 Test just running npm install 2021-05-06 10:03:38 +02:00
Erik Tiekstra 7fa4b4ce63 Testing to add nginx.conf inside application source 2021-05-06 09:47:55 +02:00
Erik Tiekstra f24ab48943 Updated some models and changed to custom api 2021-05-06 07:23:09 +02:00
Erik Tiekstra cd60e9383a Added user service 2021-05-05 10:12:47 +02:00
Erik Tiekstra 1c0f77b506 Merge branch 'develop' into feature/pega-api 2021-05-05 09:19:11 +02:00
Erik Tiekstra 4525953a78 Fixed some tests 2021-05-05 07:53:33 +02:00
Erik Tiekstra 788b49ca3e Changed node-engine to 15 2021-05-04 15:55:21 +02:00
Erik Tiekstra 9f5570ca6a Added Pega API 2021-05-04 15:47:03 +02:00
Erik Tiekstra 067b25c3aa Renamed staff to employees 2021-05-04 14:44:48 +02:00
Erik Tiekstra e56b92c0d9 Now using more digi-core components 2021-05-04 14:28:47 +02:00
Erik Tiekstra 3debdc6ecc Merge pull request #4 in TEA/dafa-web-monorepo from TV-107 to develop
* commit '5f10baae0c438b079f2620ea9b9c0088194561c3':
  more changes
  more changes according to PR comments
  changed code according to comments from pull request
  updated startpage from flex to grid, and other minor changes
  startpage added and employee, administration page updated
2021-05-04 11:21:36 +02:00
Erik Tiekstra 5f10baae0c Merged develop and fixed conflicts 2021-05-04 11:19:14 +02:00
Erik Tiekstra 6ac295c8b2 updated to new @digi/core and @af/digi-ng 2021-05-04 11:14:49 +02:00
Erik Tiekstra 94c4316553 Updated prod Jenkinsfile 2021-05-04 10:14:15 +02:00
Erik Tiekstra 55c4e7cfc2 Changed namespace variables 2021-05-04 10:08:06 +02:00
Erik Tiekstra b1a4ecf92b Testing with simple nginx.conf setup 2021-05-04 10:03:59 +02:00
Erik Tiekstra f33f844c67 Updated names 2021-05-04 09:38:46 +02:00
Erik Tiekstra 21f94db524 Updated Jenkinsfile with correct path to nginx 2021-05-04 09:25:28 +02:00
Erik Tiekstra cd8d7cbbe1 Updated Jenkinsfile and nginx.template 2021-05-04 09:00:10 +02:00
Erik Tiekstra 87cf24ceb6 Updated nginx.conf 2021-05-04 08:08:56 +02:00
Erik Tiekstra 797b7ad078 Updated Jenkinsfile 2021-05-03 14:41:48 +02:00
Erik Tiekstra 7af2061f77 Fixing issues with dist path 2021-05-03 13:36:03 +02:00
Zaid Abed Jaser f0ae33c05e more changes 2021-05-03 10:26:03 +02:00
Gustav Ek 3a17c843c2 Merge pull request #10 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-1619786920861 to develop
* commit '5a49c3896163a691106846e7c8a0da301f2a404b':
  Jenkinsfile edited online with Bitbucket
2021-04-30 14:48:51 +02:00
Gustav Ek 5a49c38961 Jenkinsfile edited online with Bitbucket 2021-04-30 14:48:43 +02:00
Gustav Ek 711620bafa Merge pull request #9 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-1619782768433 to develop
* commit '649e2904327de1f2f05f086331fbb4c573dbf5c0':
  Jenkinsfile edited online with Bitbucket
2021-04-30 13:39:37 +02:00
Gustav Ek 649e290432 Jenkinsfile edited online with Bitbucket 2021-04-30 13:39:31 +02:00
Gustav Ek bd4c873f6c Merge pull request #8 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-1619782008669 to develop
* commit '92b0db5635cbd1e5af6e189be8b674ad81df16fd':
  Jenkinsfile edited online with Bitbucket
2021-04-30 13:26:56 +02:00
Gustav Ek 92b0db5635 Jenkinsfile edited online with Bitbucket 2021-04-30 13:26:51 +02:00
Zaid Abed Jaser 2dc620c723 more changes according to PR comments 2021-04-30 13:12:28 +02:00
Gustav Ek ec4477e8e7 Merge pull request #7 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-1619779059044 to develop
* commit '9115e1a64c12c9c6a3dbc390e26b725db0833c53':
  Jenkinsfile edited online with Bitbucket
2021-04-30 12:37:47 +02:00
Gustav Ek 9115e1a64c Jenkinsfile edited online with Bitbucket 2021-04-30 12:37:41 +02:00
Gustav Ek f9994f46e6 Merge pull request #6 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-1619777320292 to develop
* commit 'e96c9ce1a7337720d6a1f1e467aaf5c5c6514011':
  Jenkinsfile edited online with Bitbucket
2021-04-30 12:08:52 +02:00
Gustav Ek e96c9ce1a7 Jenkinsfile edited online with Bitbucket 2021-04-30 12:08:45 +02:00
Gustav Ek 4e5d00bea7 Merge pull request #5 in TEA/dafa-web-monorepo from hotfix/debug-jenkinsfile to develop
* commit '14799c28ec2be96900944359cf1a45e1c45ac467':
  Seeing what OC binary has for permissions.
2021-04-30 11:54:43 +02:00
Gustav Ek 14799c28ec Seeing what OC binary has for permissions. 2021-04-30 11:54:28 +02:00
Zaid Abed Jaser b6c9219818 changed code according to comments from pull request 2021-04-29 16:47:53 +02:00
Erik Tiekstra 5f945f4d7e Updated to node 15 again 2021-04-29 09:43:59 +02:00
Zaid Abed Jaser 9a947d65c7 updated startpage from flex to grid, and other minor changes 2021-04-28 16:59:03 +02:00
Zaid Abed Jaser 0d848d9ef2 startpage added and employee, administration page updated 2021-04-28 13:02:52 +02:00
Erik Tiekstra edbd508e10 Changed mock-api to support node 14 2021-04-28 12:29:05 +02:00