Hannes Huber
ef07447abc
fix json-file
2020-06-17 20:42:08 +02:00
Lukas Fürderer
bb7b35dc28
Increase the amount of commits
2020-06-17 19:00:49 +02:00
Lukas Fürderer
93cfbb4a27
Merge remote-tracking branch 'origin/master'
2020-06-17 18:59:10 +02:00
Lukas Fürderer
68cc35cec3
Fix typo 6
2020-06-17 18:57:42 +02:00
Lukas Fürderer
b2ee048f25
Fix typo 5
2020-06-17 18:57:23 +02:00
Lukas Fürderer
020a30474e
Fix typo 4
2020-06-17 18:56:32 +02:00
Lukas Fürderer
4bfc8a2cc6
Fix typo 3
2020-06-17 18:56:02 +02:00
Lukas Fürderer
0ff873baaa
Fix typo 2
2020-06-17 18:55:50 +02:00
Lukas Fürderer
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00
Jannik
2442a477c8
add missing "|"
2020-06-17 18:43:06 +02:00
Philipp Schweizer
ebb3c8c235
removes unused Imports and fomattet
2020-06-17 17:23:29 +02:00
CodeSteak
e6c068e71a
Secretly fix number 0 showing on 'Warenkorb'
2020-06-17 00:23:05 +02:00
CodeSteak
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
CodeSteak
44df9e4b4f
Secretly add Favicon
2020-06-17 00:11:55 +02:00
CodeSteak
18cbfbf148
Fix template strings with a starting "/"
2020-06-17 00:02:46 +02:00
Hendrik Schutter
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
CodeSteak
486f237135
fix creditcard num not being set leading to crash
2020-06-16 23:50:10 +02:00
Hendrik Schutter
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
CodeSteak
3b1d378968
Fix not creating directory when uploading file
2020-06-16 23:38:35 +02:00
Jannik
5a0b303601
Merge branch 'master' into feature/config
2020-06-16 20:44:10 +02:00
Jannik
d5825ba7a0
use @Autowired to get AppSettings Object
2020-06-16 20:42:40 +02:00
Jannik
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
Jannik
774e62f892
add suppliers to YAMLData, store data in AppSettings()
2020-06-16 19:19:58 +02:00
Jannik
e1c00eca8f
fix ApplicationSettings.readConfig()
2020-06-16 18:52:33 +02:00
Danny
e904eba7a4
Merge remote-tracking branch 'origin/feature/manual_cronjobs' into feature/dashboard
...
Butfixes
2020-06-15 21:41:54 +02:00
Danny
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
Lukas Fürderer
3b364ae815
Allow employees to trigger cronjobs manually
2020-06-15 16:23:42 +02:00
Jannik
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
Hendrik Schutter
18f35c43e7
remove spaces
2020-06-15 10:46:04 +02:00
Hendrik Schutter
709c80fa37
add fist admin user after start
2020-06-15 10:43:16 +02:00
Hannes Huber
87bade71b4
Dateien hochladen nach „supplier/config“
2020-06-15 10:20:40 +02:00
Hannes Huber
b6eb66e348
Dateien hochladen nach „supplier/config“
2020-06-15 10:19:16 +02:00
Hendrik Schutter
0a7722d612
removed register user type and ad
2020-06-15 09:40:32 +02:00
Jannik
d121532fba
Merge remote-tracking branch 'origin/master' into feature/config
2020-06-14 21:15:37 +02:00
Hannes Huber
985169117d
fix nullpointer in settings
2020-06-14 18:19:59 +02:00
Hannes Huber
fa610cae3b
if no orders show hint
2020-06-14 17:56:09 +02:00
CodeSteak
3bb3c5b513
[HOTFIX] of HOTFIX: Use CanonicalPath for check
2020-06-14 16:51:59 +02:00
CodeSteak
15616e05f3
[HOTFIX] Prevent path directory traversal attack for deploy
2020-06-14 15:54:56 +02:00
Philipp Schweizer
0ab185f143
impl trackingID for the UserController
2020-06-13 21:59:18 +02:00
Philipp Schweizer
1dd4b5cfa5
del update query and impl error for trackigID
2020-06-13 20:05:22 +02:00
Philipp Schweizer
266bba095a
merged feature/customer_orders with master
2020-06-13 19:58:30 +02:00
Philipp Schweizer
fa7bdf2f7e
impl error handling
2020-06-13 19:37:34 +02:00
Jannik
76550be9e7
Merge pull request 'Allow partial discount on supplier orders' ( #68 ) from fix/discount_calculation_in_supplier_service into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 12:21:26 +02:00
Jannik
ef8aa826a3
Merge pull request 'Fix the cash booking sum on customer order' ( #67 ) from fix/wrong_bookings_on_customer_order into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 12:19:18 +02:00
Jannik
114453b5b9
Merge pull request 'Implement Arrival of Supplier Order.' ( #62 ) from feature/supplier_order_arrived_button into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:59:17 +02:00
CodeSteak
7397698929
fix check for missing article
2020-06-13 11:54:25 +02:00
Lukas Fürderer
9fa2c1f3a7
Allow partial discount on supplier orders
...
Closes #46
2020-06-13 11:46:16 +02:00
Lukas Fürderer
327ba182f5
Fix the cash booking sum on customer order
...
Closes #57
2020-06-13 11:10:20 +02:00
Jannik
30226c5c19
Merge pull request 'fixes_ui' ( #66 ) from fixes_ui into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:03:20 +02:00
Hendrik Schutter
e0e853a575
fixes from PR review
2020-06-13 10:41:59 +02:00