Commit Graph

Select branches

Hide Pull Requests

enablePWA

market-cap-view

master

new-mockdata-for-amount

#11

#12

#14

#15

#17

#18

#21

#23

#27

#35

#36

#43

#44

#5

#51

#54

#57

#58

#59

#60

#61

#62

#63

#64

#67

#70

#71

#72

#75

#78

#82

#83

#84

Mono Color

• d436942617 Merge pull request 'fixes icon issue' (#84) from enablePWA into master master Oliver Boehlk 2020-05-29 20:33:39 +02:00
• f50380313e fixes icon issue enablePWA Hawk 2020-05-29 20:30:08 +02:00
• 2183ecb560 Merge pull request 'enablePWA' (#83) from enablePWA into master Oliver Boehlk 2020-05-29 20:15:26 +02:00
• 6167326e0f edited manifest Hawk 2020-05-29 20:09:14 +02:00
• 9dbf0de7d0 edited index.html Hawk 2020-05-29 20:07:54 +02:00
• 47d2f4c75d close #79 Hawk 2020-05-29 20:01:56 +02:00
• bba412b0d1 edited Hawk 2020-05-29 19:57:54 +02:00
• 0d104f3136 Merge pull request 'added more icons for PWA installability #41' (#82) from enablePWA into master Oliver Boehlk 2020-05-29 19:46:18 +02:00
• 7a6659c3f7 add information about mockdata in readme market-cap-view Oliver Boehlk 2020-05-29 19:44:01 +02:00
• 6c174948f8 prepare for new mockdata new-mockdata-for-amount Oliver Boehlk 2020-05-29 19:42:42 +02:00
• 6616cec0e7 added more icons for PWA installability #41 Hawk 2020-05-29 19:40:57 +02:00
• 92e630f24f add backend readme closes #77 Oliver Boehlk 2020-05-29 19:37:46 +02:00
• e40cc80ec2 remove package-lock closes #79 Oliver Boehlk 2020-05-29 19:30:25 +02:00
• cefe56cd11 Merge branch 'market-cap-view' of cloud.ol:oliver/simcompanies-dashboard into market-cap-view Oliver Boehlk 2020-05-29 19:26:17 +02:00
• 57c4bf2c38 add amount endpoints Oliver Boehlk 2020-05-29 19:26:11 +02:00
• 1ffcd56342 changed api endpoint Hawk 2020-05-29 19:20:48 +02:00
• 93a811fb08 change price API endpoint route Oliver Boehlk 2020-05-29 19:18:15 +02:00
• 7d1a9ff86e Merge pull request 'enablePWA' (#78) from enablePWA into master Oliver Boehlk 2020-05-25 17:11:56 +02:00
• 3c3a9bc511 register service worker for PWA functionality Hawk 2020-05-25 16:38:59 +02:00
• 1d4bc6f765 remove package-lock file Hawk 2020-05-25 16:38:32 +02:00
• 2f6ed68c58 Merge pull request 'damn I hate CSS (and bugs): fix #69 strange render bug in aerospace' (#75) from fix-weird-display-bug into master falk 2020-05-24 10:34:10 +02:00
• 848191140d fix #69 strange render bug in aerospace Oliver Boehlk 2020-05-24 09:47:37 +02:00
• ffc256780f Merge pull request 'ui-change-name-passwd' (#72) from ui-change-name-passwd into master Oliver Boehlk 2020-05-17 10:38:47 +02:00
• 78735b7fb7 bugfix backend feedback for password changes Oliver Boehlk 2020-05-17 10:36:39 +02:00
• 28b3e426d1 added automatic logout Hawk 2020-05-17 00:47:07 +02:00
• 3bc17e1883 added change username and pw close #68 Hawk 2020-05-17 00:43:45 +02:00
• 480ec85374 fixed all warnings (if it was possible) Hawk 2020-05-16 23:44:31 +02:00
• 9cf15fee59 edit-jenkinsfile (#71) falk 2020-05-16 00:23:12 +02:00
• c90a550c2b Merge pull request 'add API endpoints for changing username and password' (#70) from change-username-password-api-endpoint into master falk 2020-05-15 23:29:36 +02:00
• babc2c8ea8 limit logout function to logged in users Oliver Boehlk 2020-05-15 23:21:47 +02:00
• ab7b2d907d add setpassword function backend is #68 ready Oliver Boehlk 2020-05-15 23:15:49 +02:00
• 07d601ea36 bugfix password validation Oliver Boehlk 2020-05-15 23:03:04 +02:00
• 6591cf877a require password for username change Oliver Boehlk 2020-05-15 23:00:23 +02:00
• 7c67c39ca7 add external validatepassword function Oliver Boehlk 2020-05-15 22:57:32 +02:00
• 7b3c262140 create endpoint for changing username #68 Oliver Boehlk 2020-05-15 21:52:51 +02:00
• be49c3b06e Merge pull request 'remove button and loading circle close #65' (#67) from removeButtonAndIcon into master Oliver Boehlk 2020-05-15 01:25:41 +02:00
• eb1843d460 remove button and loading circle close #65 Hawk 2020-05-15 01:19:50 +02:00
• abd6c45ef0 Merge pull request 'fix data order in week' (#64) from fix-data-order-in-week into master falk 2020-05-15 00:06:02 +02:00
• b87e4214a4 Merge pull request 'added loadingbar when fetching other intervals' (#63) from add-week-month-view into master Oliver Boehlk 2020-05-14 23:16:45 +02:00
• 38177c6349 fix data order in week Oliver Boehlk 2020-05-14 23:11:50 +02:00
• 82eba7e932 added loadingbar when fetching other intervals Hawk 2020-05-14 22:47:56 +02:00
• 2e17dc48ca bugfix backend return correct kind bugfix change order for graph display Oliver Boehlk 2020-05-14 01:00:45 +02:00
• 1aea0301c2 Merge pull request 'add-week-month-view' (#62) from add-week-month-view into master Oliver Boehlk 2020-05-14 00:04:07 +02:00
• 049c4ad938 Interval selection Hawk 2020-05-13 23:56:35 +02:00
• ed52f12e7d Merge branch 'master' into add-week-month-view Hawk 2020-05-13 23:25:23 +02:00
• abf19f1de6 added dropdown menu Hawk 2020-05-13 23:06:55 +02:00
• fef01f29b9 Merge pull request 'add mock data for month api endpoint' (#61) from add-moth-api-endpoint into master falk 2020-05-13 23:03:37 +02:00
• 5ac5ee1e41 change id to time Oliver Boehlk 2020-05-13 23:00:31 +02:00
• 66979947dd change avg(price) to price Oliver Boehlk 2020-05-13 22:58:21 +02:00
• 151e2b1dff add mock data for month api endpoint Oliver Boehlk 2020-05-13 21:08:25 +02:00
• 33d1d1743b Merge pull request 'add month API endpoint' (#60) from add-moth-api-endpoint into master falk 2020-05-13 21:05:36 +02:00
• 18a927da3b add month API endpoint Oliver Boehlk 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 falk 2020-05-13 20:51:41 +02:00
• 2d03129996 add mockdata for week API endpoint Oliver Boehlk 2020-05-13 20:46:53 +02:00
• b4d77cfb4a Merge pull request 'add-weekfunction-for-backend' (#58) from add-weekfunction-for-backend into master falk 2020-05-13 20:41:00 +02:00
• c114ddd892 revert authentication skip Oliver Boehlk 2020-05-13 20:36:12 +02:00
• eb54f12bfd add function week API point Oliver Boehlk 2020-05-13 20:35:51 +02:00
• f17a40504f bugfix in day API endpoint add temporary data Oliver Boehlk 2020-05-13 20:11:43 +02:00
• 054f77b998 Merge pull request 'fixed issue with double login close #53' (#57) from loginFix into master Oliver Boehlk 2020-05-13 19:48:17 +02:00
• e3fe3ae881 fixed issue with double login close #53 Hawk 2020-05-13 00:26:06 +02:00
• 8e3f53baca Merge pull request 'add jenkinsfile' (#54) from falk-patch-1 into master falk 2020-05-12 21:28:27 +02:00
• f0cdafe8c9 add jenkinsfile falk 2020-05-12 21:24:48 +02:00
• 99dfaa8b8e Merge pull request 'addFeatures' (#51) from addFeatures into master Oliver Boehlk 2020-05-03 22:23:10 +02:00
• 5806373236 added profile #48 Hawk 2020-05-03 20:56:52 +02:00
• 23a0e3d8d0 added logout functionality close #47 Hawk 2020-05-03 20:46:53 +02:00
• 65ce311b2c Merge pull request 'fixed text wrap issue + restructure' (#50) from responsive into master Oliver Boehlk 2020-05-02 20:54:54 +02:00
• 06f0ac9d85 fixed text wrap issue + restructure Hawk 2020-05-02 20:43:24 +02:00
• 14bc337091 Merge pull request 'responsive' (#49) from responsive into master falk 2020-05-02 18:39:19 +02:00
• bea593c326 Merge branch 'master' into responsive Hawk 2020-05-02 18:38:45 +02:00
• c8040ed02b resource list and drawer menu responsive close#25 Hawk 2020-05-02 18:24:34 +02:00
• 7c8914bc52 made chart responsive #25 Hawk 2020-05-02 18:01:44 +02:00
• 6318e32f42 updated deployment script to yarn Hawk 2020-05-02 17:27:29 +02:00
• f4bd6dfd7b Merge branch 'master' of cloud.ol:oliver/simcompanies-dashboard Oliver Boehlk 2020-05-02 11:35:53 +02:00
• a02dcbf2dc make backend more reliable Oliver Boehlk 2020-05-02 11:35:05 +02:00
• f5d70d157b Merge pull request 'qualityselection' (#46) from qualityselection into master Oliver Boehlk 2020-05-02 09:07:28 +02:00
• d4c96fdabc added names for resource chart Hawk 2020-05-02 02:06:09 +02:00
• 6a80af99f3 added quality selection close #28 Hawk 2020-05-02 01:21:40 +02:00
• d680eb2943 migrated frontend to yarn close #19 Hawk 2020-05-01 23:43:16 +02:00
• b41ee381a6 migrated to yarn #19 Hawk 2020-05-01 23:42:18 +02:00
• b524cd71c9 Added loadingbar for resource loading close #38 Hawk 2020-05-01 20:56:04 +02:00
• bfabc36a75 Merge branch 'master' of cloud.ol:oliver/simcompanies-dashboard Oliver Boehlk 2020-04-30 23:13:17 +02:00
• d12e82347f change update to a more stable version Oliver Boehlk 2020-04-30 23:13:11 +02:00
• 08b1c218a9 Merge pull request 'login-feedback' (#44) from login-feedback into master Oliver Boehlk 2020-04-30 23:04:40 +02:00
• cb27a0946f edited labels Hawk 2020-04-30 23:01:01 +02:00
• 3c7fb72d8e Merge branch 'master' into login-feedback Hawk 2020-04-30 22:36:28 +02:00
• 38b7a903d6 fixed var names Hawk 2020-04-30 22:34:47 +02:00
• 5bf47622ef bugfix createaccount backend feedback message Oliver Boehlk 2020-04-30 22:25:27 +02:00
• eb01399e04 backend send details on error Oliver Boehlk 2020-04-30 22:23:30 +02:00
• c964dfdb86 edited status text Hawk 2020-04-30 22:06:08 +02:00
• 4848b32b1a disable buttons and inputs while post. close #37 Hawk 2020-04-30 21:56:43 +02:00
• 083f73ec2b added fixes Hawk 2020-04-30 21:27:54 +02:00
• 847c73a1ee Merge pull request 'enable-local-debug' (#43) from enable-local-debug into master falk 2020-04-30 20:52:22 +02:00
• 198e56d302 Merge remote-tracking branch 'origin/master' into enable-local-debug Oliver Boehlk 2020-04-30 20:47:38 +02:00
• 457d4f05af enable local testing without database Oliver Boehlk 2020-04-30 20:47:22 +02:00
• 43d04e0a32 updated mock data with quality Oliver Boehlk 2020-04-30 20:46:01 +02:00
• 1eaea6c7ed use cross-env for plattform-independet env Oliver Boehlk 2020-04-30 20:45:46 +02:00
• 6d24cb5c53 added login feedback snackbar Hawk 2020-04-30 20:27:19 +02:00
• 35f848aca0 Merge pull request 'refresh-button' (#36) from refresh-button into master Oliver Boehlk 2020-04-25 03:26:30 +02:00
• 81564bb5a7 Created resource categories close #9 Hawk 2020-04-25 03:16:55 +02:00
• 08c83ad481 Merge pull request 'login' (#35) from login into master falk 2020-04-25 02:48:34 +02:00