e5332a3348
Fix String -> UUIDs -> String in method causing crash
2020-06-20 22:25:52 +02:00
c3eaf5ac11
Remove unused db fields
2020-06-20 22:10:53 +02:00
fa75beb9c4
Fix 6284a4d7bf altering template
2020-06-20 22:09:25 +02:00
4bef17dc0a
Merge pull request 'feature/dashboard' ( #83 ) from feature/dashboard into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-19 14:12:44 +02:00
79e4986880
delete blank line
2020-06-19 14:11:32 +02:00
181a09e16b
Merge pull request 'feature/config' ( #78 ) from feature/config into master
...
Reviewed-by: CodeSteak <codesteak@shellf.art >
2020-06-18 14:09:46 +02:00
f4aae9c581
ignore config.yml
2020-06-18 14:07:59 +02:00
ea0c8c45d6
rename eCommerce_config.yml to config.yml
...
* if no config file is present, create a default config file
2020-06-18 14:04:54 +02:00
8416783e0a
merged
2020-06-18 01:13:03 +02:00
bcbebe8e8d
master merged into feature/customer_orders
2020-06-18 01:11:11 +02:00
a570696795
feature/customer_orders merged into master
2020-06-18 01:07:11 +02:00
187656814e
String Error -> Enum ErrorHandling Logic removed from model class
2020-06-18 00:50:43 +02:00
8c0652b26b
exit if the settings file has not been found
...
* use a final variable for the settings file name
2020-06-17 22:32:48 +02:00
ef07447abc
fix json-file
2020-06-17 20:42:08 +02:00
bb7b35dc28
Increase the amount of commits
2020-06-17 19:00:49 +02:00
93cfbb4a27
Merge remote-tracking branch 'origin/master'
2020-06-17 18:59:10 +02:00
68cc35cec3
Fix typo 6
2020-06-17 18:57:42 +02:00
b2ee048f25
Fix typo 5
2020-06-17 18:57:23 +02:00
020a30474e
Fix typo 4
2020-06-17 18:56:32 +02:00
4bfc8a2cc6
Fix typo 3
2020-06-17 18:56:02 +02:00
0ff873baaa
Fix typo 2
2020-06-17 18:55:50 +02:00
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00
2442a477c8
add missing "|"
2020-06-17 18:43:06 +02:00
ebb3c8c235
removes unused Imports and fomattet
2020-06-17 17:23:29 +02:00
e6c068e71a
Secretly fix number 0 showing on 'Warenkorb'
2020-06-17 00:23:05 +02:00
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
44df9e4b4f
Secretly add Favicon
2020-06-17 00:11:55 +02:00
18cbfbf148
Fix template strings with a starting "/"
2020-06-17 00:02:46 +02:00
e037b75f7c
Merge pull request 'fix creditcard num not being set leading to crash' ( #82 ) from feature/80_fix_creditcardnum_null_usersettings into master
2020-06-16 23:51:25 +02:00
486f237135
fix creditcard num not being set leading to crash
2020-06-16 23:50:10 +02:00
396d3fda14
Merge pull request 'Fix not creating directory when uploading file' ( #80 ) from feature/fix_uploading_images into master
2020-06-16 23:40:12 +02:00
3b1d378968
Fix not creating directory when uploading file
2020-06-16 23:38:35 +02:00
5a0b303601
Merge branch 'master' into feature/config
2020-06-16 20:44:10 +02:00
d5825ba7a0
use @Autowired to get AppSettings Object
2020-06-16 20:42:40 +02:00
8199bd8a23
Merge pull request 'Allow employees to trigger cronjobs manually' ( #74 ) from feature/manual_cronjobs into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-16 19:29:38 +02:00
774e62f892
add suppliers to YAMLData, store data in AppSettings()
2020-06-16 19:19:58 +02:00
e1c00eca8f
fix ApplicationSettings.readConfig()
2020-06-16 18:52:33 +02:00
e904eba7a4
Merge remote-tracking branch 'origin/feature/manual_cronjobs' into feature/dashboard
...
Butfixes
2020-06-15 21:41:54 +02:00
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
3b364ae815
Allow employees to trigger cronjobs manually
2020-06-15 16:23:42 +02:00
2ba4968556
Merge pull request 'feature/create_admin' ( #73 ) from feature/create_admin into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-15 11:18:59 +02:00
18f35c43e7
remove spaces
2020-06-15 10:46:04 +02:00
709c80fa37
add fist admin user after start
2020-06-15 10:43:16 +02:00
87bade71b4
Dateien hochladen nach „supplier/config“
2020-06-15 10:20:40 +02:00
b6eb66e348
Dateien hochladen nach „supplier/config“
2020-06-15 10:19:16 +02:00
0a7722d612
removed register user type and ad
2020-06-15 09:40:32 +02:00
d121532fba
Merge remote-tracking branch 'origin/master' into feature/config
2020-06-14 21:15:37 +02:00
985169117d
fix nullpointer in settings
2020-06-14 18:19:59 +02:00
fa610cae3b
if no orders show hint
2020-06-14 17:56:09 +02:00
3bb3c5b513
[HOTFIX] of HOTFIX: Use CanonicalPath for check
2020-06-14 16:51:59 +02:00
