Commit Graph

Select branches

Hide Pull Requests

master

release

#102

#103

#104

#105

#106

#107

#108

#114

#115

#116

#117

#119

#12

#121

#122

#123

#124

#126

#128

#129

#130

#131

#132

#15

#19

#2

#23

#24

#25

#26

#27

#3

#38

#39

#4

#40

#41

#43

#44

#47

#49

#5

#50

#52

#55

#56

#58

#6

#62

#64

#66

#67

#68

#7

#73

#74

#77

#78

#80

#82

#83

1.0.0

v1.0-final-1

Mono Color

• ebb3c8c235 removes unused Imports and fomattet Pheanox 2020-06-17 17:23:29 +02:00
• e6c068e71a Secretly fix number 0 showing on 'Warenkorb' CodeSteak 2020-06-17 00:23:05 +02:00
• 86e3ced19b Secretly fix searchbar not showing term when searching CodeSteak 2020-06-17 00:17:50 +02:00
• 44df9e4b4f Secretly add Favicon CodeSteak 2020-06-17 00:11:55 +02:00
• 18cbfbf148 Fix template strings with a starting "/" CodeSteak 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 localhorst 2020-06-16 23:51:25 +02:00
• 486f237135 fix creditcard num not being set leading to crash CodeSteak 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 localhorst 2020-06-16 23:40:12 +02:00
• 3b1d378968 Fix not creating directory when uploading file CodeSteak 2020-06-16 23:38:35 +02:00
• 5a0b303601 Merge branch 'master' into feature/config Seil0 2020-06-16 20:44:10 +02:00
• d5825ba7a0 use @Autowired to get AppSettings Object Seil0 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 Seil0 2020-06-16 19:29:38 +02:00
• 774e62f892 add suppliers to YAMLData, store data in AppSettings() Seil0 2020-06-16 19:19:58 +02:00
• e1c00eca8f fix ApplicationSettings.readConfig() Seil0 2020-06-16 18:52:33 +02:00
• e904eba7a4 Merge remote-tracking branch 'origin/feature/manual_cronjobs' into feature/dashboard Danny 2020-06-15 21:41:54 +02:00
• 6284a4d7bf Dashboard working Danny 2020-06-15 17:47:55 +02:00
• 3b364ae815 Allow employees to trigger cronjobs manually Lukas 2020-06-15 16:23:42 +02:00
• 2ba4968556 Merge pull request 'feature/create_admin' (#73) from feature/create_admin into master Seil0 2020-06-15 11:18:59 +02:00
• 18f35c43e7 remove spaces localhorst 2020-06-15 10:46:04 +02:00
• 709c80fa37 add fist admin user after start localhorst 2020-06-15 10:43:16 +02:00
• 87bade71b4 Dateien hochladen nach „supplier/config“ hhuber 2020-06-15 10:20:40 +02:00
• b6eb66e348 Dateien hochladen nach „supplier/config“ hhuber 2020-06-15 10:19:16 +02:00
• 0a7722d612 removed register user type and ad localhorst 2020-06-15 09:40:32 +02:00
• d121532fba Merge remote-tracking branch 'origin/master' into feature/config Seil0 2020-06-14 21:15:37 +02:00
• 985169117d fix nullpointer in settings hhuber 2020-06-14 18:19:59 +02:00
• fa610cae3b if no orders show hint hhuber 2020-06-14 17:56:09 +02:00
• 3bb3c5b513 [HOTFIX] of HOTFIX: Use CanonicalPath for check CodeSteak 2020-06-14 16:51:59 +02:00
• 15616e05f3 [HOTFIX] Prevent path directory traversal attack for deploy CodeSteak 2020-06-14 15:54:56 +02:00
• 0ab185f143 impl trackingID for the UserController Pheanox 2020-06-13 21:59:18 +02:00
• 1dd4b5cfa5 del update query and impl error for trackigID Pheanox 2020-06-13 20:05:22 +02:00
• 266bba095a merged feature/customer_orders with master Pheanox 2020-06-13 19:58:30 +02:00
• fa7bdf2f7e impl error handling Pheanox 2020-06-13 19:37:34 +02:00
• 76550be9e7 Merge pull request 'Allow partial discount on supplier orders' (#68) from fix/discount_calculation_in_supplier_service into master Seil0 2020-06-13 12:21:26 +02:00
• ef8aa826a3 Merge pull request 'Fix the cash booking sum on customer order' (#67) from fix/wrong_bookings_on_customer_order into master Seil0 2020-06-13 12:19:18 +02:00
• 114453b5b9 Merge pull request 'Implement Arrival of Supplier Order.' (#62) from feature/supplier_order_arrived_button into master Seil0 2020-06-13 11:59:17 +02:00
• 7397698929 fix check for missing article CodeSteak 2020-06-13 11:54:25 +02:00
• 9fa2c1f3a7 Allow partial discount on supplier orders Lukas 2020-06-13 11:46:16 +02:00
• 327ba182f5 Fix the cash booking sum on customer order Lukas 2020-06-13 11:10:20 +02:00
• 30226c5c19 Merge pull request 'fixes_ui' (#66) from fixes_ui into master Seil0 2020-06-13 11:03:20 +02:00
• e0e853a575 fixes from PR review localhorst 2020-06-13 10:41:59 +02:00
• d2b98f083b Merge pull request 'fix missing cells in TODO-Warehouse. fixes #63' (#64) from feature/63_fix_todo_ui into master Seil0 2020-06-13 10:26:36 +02:00
• a41889b2cb login in extern loginController, RequestController cleanup, login right after register localhorst 2020-06-12 23:48:28 +02:00
• 0f7d248d40 add radio BTNs to register localhorst 2020-06-12 23:31:57 +02:00
• 11ade7b8f9 fix missing cells in TODO-Warehouse. fixes #63 CodeSteak 2020-06-12 19:57:50 +02:00
• a664b42853 Allow reuse of empty warehouse slots. Also fixes #59 CodeSteak 2020-06-12 19:48:21 +02:00
• 56f4ec0dda Implement Arrival of Supplier Order. CodeSteak 2020-06-12 19:22:36 +02:00
• 1590821f64 delete bonuspoints and notifications html hhuber 2020-06-12 11:15:05 +02:00
• 16803d2b12 Merge pull request 'feature/customers' (#58) from feature/customers into master Seil0 2020-06-12 00:52:53 +02:00
• 938d16301d fix stuff hhuber 2020-06-10 20:10:12 +02:00
• 5a59ac11b0 code cleanup hhuber 2020-06-10 18:45:52 +02:00
• c194f44308 implement customers detail bookings hhuber 2020-06-07 13:38:01 +02:00
• fc68e231d3 Allow the user to create manual bookings Lukas 2020-06-05 18:45:25 +02:00
• 6d8a36b7ac implement customers detail part 2 hhuber 2020-06-05 18:13:10 +02:00
• 49e26039a3 implement customers detail part 1 hhuber 2020-06-05 12:30:51 +02:00
• 28834431ce Display financial bookings in the ui Lukas 2020-06-05 07:49:11 +02:00
• 5691f0eeec implement customers index hhuber 2020-06-03 20:26:36 +02:00
• 7f643987f3 fix wrong closing tags in customerOrder/id.html Seil0 2020-06-10 19:12:34 +02:00
• 6b8bf25e0e Merge pull request 'feature/cash_bookings' (#55) from feature/cash_bookings into master Seil0 2020-06-10 19:04:45 +02:00
• ebeba72278 impl tracking ID Pheanox 2020-06-10 17:03:59 +02:00
• f671baf7f0 Error with package path Pheanox 2020-06-10 14:51:12 +02:00
• 691916894f Apply some changes according to comments on the pullrequest Lukas 2020-06-10 11:48:38 +02:00
• e7e2017825 Merge pull request 'Show a hyphen in supplier column if an article is not offered by anyone' (#56) from fix/null_pointer_deref_in_SupplierOfferController into master Seil0 2020-06-09 14:06:51 +02:00
• 03d557d67b Show a hyphen in supplier column if an article is not offered by anyone Lukas 2020-06-08 18:56:35 +02:00
• 8fff0e2dca Merge remote-tracking branch 'origin/master' into feature/cash_bookings Lukas 2020-06-08 18:15:34 +02:00
• 6317780dfa Merge pull request 'Implement Warehouse....' (#47) from feature/intern_warehouse into master Seil0 2020-06-08 13:40:10 +02:00
• 78a7ad053a Merge branch 'master' into feature/intern_warehouse CodeSteak 2020-06-08 09:22:06 +02:00
• f6554629d7 Merge branch 'master' into feature/intern_warehouse CodeSteak 2020-06-08 09:14:50 +02:00
• eb82d05f4f Use Spring model for template attributes CodeSteak 2020-06-08 09:14:11 +02:00
• 41320473d9 Merge pull request 'feature/supplier_page' (#52) from feature/supplier_page into master Seil0 2020-06-07 15:00:56 +02:00
• bd6be54149 removed space in SupplierOrderRepo localhorst 2020-06-07 11:45:53 +02:00
• 99612165f5 fixed review requests localhorst 2020-06-07 11:44:50 +02:00
• 9dff6adb3d rebase to master localhorst 2020-06-05 21:25:38 +02:00
• 445b504188 code cleanup localhorst 2020-06-05 18:05:10 +02:00
• bd8b3db7f3 added post form for marking order as delivered localhorst 2020-06-05 17:37:19 +02:00
• 8a4ff4cfa5 added supplier bookings table localhorst 2020-06-05 15:43:46 +02:00
• 2245309198 added supplier balance label localhorst 2020-06-05 13:10:16 +02:00
• d078c44027 finished supplier orders localhorst 2020-05-30 23:32:01 +02:00
• bd8b07990b finished show orders based on supplier localhorst 2020-05-30 21:13:25 +02:00
• 2f4c45ed71 show orders based on supplier localhorst 2020-05-30 20:16:27 +02:00
• b600040bf3 basic detail page for supplier localhorst 2020-05-30 16:43:07 +02:00
• 4f5e1fe185 list suppliers page localhorst 2020-05-30 16:16:14 +02:00
• f348d33c94 Show the balances of the main and vat account in the dashboard Lukas 2020-06-05 19:17:44 +02:00
• 6f90b9c941 Fix a bug where bookings were invisible if they affected only one account Lukas 2020-06-05 18:58:16 +02:00
• e53c1e0872 Allow the user to create manual bookings Lukas 2020-06-05 18:45:25 +02:00
• e138476d76 code cleanup localhorst 2020-06-05 18:05:10 +02:00
• c1b9588189 added post form for marking order as delivered localhorst 2020-06-05 17:37:19 +02:00
• 5e05100d21 added supplier bookings table localhorst 2020-06-05 15:43:46 +02:00
• 93a5863fbe added supplier balance label localhorst 2020-06-05 13:10:16 +02:00
• 7f652e38f0 fix nullpointer in category search hhuber 2020-06-05 12:32:34 +02:00
• 0061d25082 Display financial bookings in the ui Lukas 2020-06-05 07:49:11 +02:00
• d4ddd8a9a3 Merge pull request 'feature/user' (#38) from feature/user into master Seil0 2020-06-03 18:36:06 +02:00
• a192f0ac51 Set Tracing Id in Warehouse/finish not in Checkout. This was wrong. CodeSteak 2020-06-03 16:55:36 +02:00
• 9660e52f34 Merge pull request 'feature/31_js_magic_article_edit' (#50) from feature/31_js_magic_article_edit into master localhorst 2020-06-02 07:47:28 +02:00
• 72ddfa42ef Merge pull request 'Show Tax in Article Edit View. Fixes #48' (#49) from feature/48_not_showing_tax_edit_view into master localhorst 2020-06-02 07:47:04 +02:00
• fc239983a7 Fix article links. CodeSteak 2020-06-01 21:15:27 +02:00
• 5e1170839e Update Gross Price in Article Edit View. Fixes #31 CodeSteak 2020-06-01 21:11:15 +02:00
• 2ef9eb29ac Show Tax in Article Edit View. Fixes #48 CodeSteak 2020-06-01 20:46:00 +02:00
• f4ba79a4cd add id's to form inputs hhuber 2020-06-01 20:27:19 +02:00
• 976e2d1949 Implement Warehouse.... CodeSteak 2020-06-01 20:25:51 +02:00
• b7134a60da rename CustomerOrderRepo in Cronjob hhuber 2020-06-01 20:24:59 +02:00