Commit Graph

133 Commits

Author SHA1 Message Date
33d1d1743b Merge pull request 'add month API endpoint' (#60) from add-moth-api-endpoint into master
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Reviewed-by: falk <falk.ba@gmx.de>
2020-05-13 21:05:36 +02:00
18a927da3b add month API endpoint
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
2020-05-13 20:59:07 +02:00
25b89b3da2 Merge pull request 'add mockdata for week API endpoint' (#59) from add-weekfunction-for-backend into master
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Reviewed-by: falk <falk.ba@gmx.de>
2020-05-13 20:51:41 +02:00
2d03129996 add mockdata for week API endpoint 2020-05-13 20:46:53 +02:00
b4d77cfb4a Merge pull request 'add-weekfunction-for-backend' (#58) from add-weekfunction-for-backend into master
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Reviewed-by: falk <falk.ba@gmx.de>
2020-05-13 20:41:00 +02:00
c114ddd892 revert authentication skip 2020-05-13 20:36:12 +02:00
eb54f12bfd add function week API point 2020-05-13 20:35:51 +02:00
f17a40504f bugfix in day API endpoint
add temporary data
2020-05-13 20:11:43 +02:00
054f77b998 Merge pull request 'fixed issue with double login close #53' (#57) from loginFix into master
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-05-13 19:48:17 +02:00
e3fe3ae881 fixed issue with double login close #53
Some checks failed
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
SimcoDash/simcompanies-dashboard/pipeline/pr-master There was a failure building this commit
2020-05-13 00:26:06 +02:00
8e3f53baca Merge pull request 'add jenkinsfile' (#54) from falk-patch-1 into master
All checks were successful
SimcoDash/simcompanies-dashboard/pipeline/head This commit looks good
Reviewed-by: falksjenkins <jenkins1@boehlk.io>
2020-05-12 21:28:27 +02:00
f0cdafe8c9 add jenkinsfile
Some checks failed
SimcoDash/simcompanies-dashboard/pipeline/head There was a failure building this commit
2020-05-12 21:24:48 +02:00
99dfaa8b8e Merge pull request 'addFeatures' (#51) from addFeatures into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-05-03 22:23:10 +02:00
5806373236 added profile #48 2020-05-03 20:56:52 +02:00
23a0e3d8d0 added logout functionality close #47 2020-05-03 20:46:53 +02:00
65ce311b2c Merge pull request 'fixed text wrap issue + restructure' (#50) from responsive into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-05-02 20:54:54 +02:00
06f0ac9d85 fixed text wrap issue + restructure 2020-05-02 20:43:24 +02:00
14bc337091 Merge pull request 'responsive' (#49) from responsive into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-05-02 18:39:19 +02:00
bea593c326 Merge branch 'master' into responsive 2020-05-02 18:38:45 +02:00
c8040ed02b resource list and drawer menu responsive close#25 2020-05-02 18:24:34 +02:00
7c8914bc52 made chart responsive #25 2020-05-02 18:01:44 +02:00
6318e32f42 updated deployment script to yarn 2020-05-02 17:27:29 +02:00
f4bd6dfd7b Merge branch 'master' of cloud.ol:oliver/simcompanies-dashboard 2020-05-02 11:35:53 +02:00
a02dcbf2dc make backend more reliable 2020-05-02 11:35:05 +02:00
f5d70d157b Merge pull request 'qualityselection' (#46) from qualityselection into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-05-02 09:07:28 +02:00
d4c96fdabc added names for resource chart 2020-05-02 02:06:09 +02:00
6a80af99f3 added quality selection close #28 2020-05-02 01:21:40 +02:00
d680eb2943 migrated frontend to yarn close #19 2020-05-01 23:43:16 +02:00
b41ee381a6 migrated to yarn #19 2020-05-01 23:42:18 +02:00
b524cd71c9 Added loadingbar for resource loading close #38 2020-05-01 20:56:04 +02:00
bfabc36a75 Merge branch 'master' of cloud.ol:oliver/simcompanies-dashboard 2020-04-30 23:13:17 +02:00
d12e82347f change update to a more stable version 2020-04-30 23:13:11 +02:00
08b1c218a9 Merge pull request 'login-feedback' (#44) from login-feedback into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-04-30 23:04:40 +02:00
cb27a0946f edited labels 2020-04-30 23:01:01 +02:00
3c7fb72d8e Merge branch 'master' into login-feedback 2020-04-30 22:36:28 +02:00
38b7a903d6 fixed var names 2020-04-30 22:34:47 +02:00
5bf47622ef bugfix createaccount backend feedback message 2020-04-30 22:25:27 +02:00
eb01399e04 backend send details on error 2020-04-30 22:23:30 +02:00
c964dfdb86 edited status text 2020-04-30 22:06:08 +02:00
4848b32b1a disable buttons and inputs while post. close #37 2020-04-30 21:56:43 +02:00
083f73ec2b added fixes 2020-04-30 21:27:54 +02:00
847c73a1ee Merge pull request 'enable-local-debug' (#43) from enable-local-debug into master
Reviewed-by: falk <falk.ba@gmx.de>
2020-04-30 20:52:22 +02:00
198e56d302 Merge remote-tracking branch 'origin/master' into enable-local-debug 2020-04-30 20:47:38 +02:00
457d4f05af enable local testing without database 2020-04-30 20:47:22 +02:00
43d04e0a32 updated mock data with quality 2020-04-30 20:46:01 +02:00
1eaea6c7ed use cross-env for plattform-independet env 2020-04-30 20:45:46 +02:00
6d24cb5c53 added login feedback snackbar 2020-04-30 20:27:19 +02:00
35f848aca0 Merge pull request 'refresh-button' (#36) from refresh-button into master
Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>
2020-04-25 03:26:30 +02:00
81564bb5a7 Created resource categories close #9 2020-04-25 03:16:55 +02:00
08c83ad481 Merge pull request 'login' (#35) from login into master
Reviewed-by: falk <falk.ba@gmx.de>
2020-04-25 02:48:34 +02:00