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

• ea940672d7 final commit master localhorst 2020-08-02 17:07:30 +02:00
• f667d41c3c [HOTFIX] Fix broken link in supplier detail release CodeSteak 2020-07-02 14:30:17 +02:00
• 3a85997f99 [HOTFIX] Fix broken link in supplier details CodeSteak 2020-07-02 14:26:37 +02:00
• 471d859987 [HOTFIX] Fix change password in intern CodeSteak 2020-07-02 00:50:20 +02:00
• d03d94049d Merge pull request 'Modultests' (#132) from feature/module_tests into master CodeSteak 2020-06-29 10:44:48 +02:00
• 701e3c9cf6 remove sql debug output. Closes #125 v1.0-final-1 CodeSteak 2020-06-29 09:47:38 +02:00
• 6a23759bbc Merge remote-tracking branch 'origin/master' into feature/module_tests Lukas 2020-06-26 17:21:44 +02:00
• b039e2d568 Implement module tests Lukas 2020-06-26 17:17:29 +02:00
• e320f5b02b Merge pull request 'Cleanup. closes #75' (#131) from feature/rename into master Seil0 2020-06-26 10:09:39 +02:00
• 5aca84c43b delete old files. Cleanup repo CodeSteak 2020-06-26 10:06:41 +02:00
• 5b483d5c5d rename prototype folder -> web_backend. closes #75 CodeSteak 2020-06-26 10:00:05 +02:00
• 037f1ff671 Merge pull request 'revisit ShoppingCart' (#130) from feature/revisit_shopping_cart into master Seil0 2020-06-26 09:52:11 +02:00
• 0edb9572b6 move Tests to the correct location Seil0 2020-06-25 17:42:03 +02:00
• a2e05edb7a Try to activate JUnit - not working yet Lukas 2020-06-25 17:29:13 +02:00
• 99896a4f77 revisit ShoppingCart CodeSteak 2020-06-25 16:52:13 +02:00
• 624ade2032 Merge pull request 'Set Default Payment on first order' (#128) from feature/update_credit_card_on_order into master Seil0 2020-06-25 12:40:19 +02:00
• 99b123565c Merge pull request 'Show all articles if no term is provided. fixes #127' (#129) from feature/fix_seatch_showing_err into master Seil0 2020-06-25 12:39:33 +02:00
• be6de240bb fix encoding err in supplier cfg CodeSteak 2020-06-25 12:13:47 +02:00
• 7cf1819460 add session timeout CodeSteak 2020-06-25 12:10:38 +02:00
• 17f0c645f1 Show all articles if no term is provided. fixes #127 CodeSteak 2020-06-25 11:52:27 +02:00
• bdd1017232 Set Default Payment on first order CodeSteak 2020-06-25 11:46:01 +02:00
• f4299c33c1 Merge pull request 'feature/email_validation_fe' (#126) from feature/email_validation_fe into master Lukas 2020-06-25 11:23:44 +02:00
• f86a14b2f8 Fix Email pattern, disallow whitespace CodeSteak 2020-06-25 11:16:54 +02:00
• 2fb5826a3b Validate Email in FE CodeSteak 2020-06-25 11:10:20 +02:00
• b993700ae4 Merge pull request 'feature/employee_login_defaults' (#124) from feature/employee_login_defaults into master 1.0.0 Seil0 2020-06-24 19:00:36 +02:00
• 5d506a1526 Merge pull request 'Fix display order in various locations. closes #120' (#121) from feateure/display_order_intern into master Seil0 2020-06-24 18:59:14 +02:00
• e87d0d8cdd Merge pull request 'feature/optimize_create_order_whbookings' (#117) from feature/optimize_create_order_whbookings into master Seil0 2020-06-24 18:57:45 +02:00
• fb222c9213 Merge branch 'master' into feature/employee_login_defaults CodeSteak 2020-06-24 18:57:05 +02:00
• cf9ab66e68 Hide /intern/ link if non employee. closes #76 CodeSteak 2020-06-24 18:40:57 +02:00
• cdc372d574 Redirect to intern if employee. CodeSteak 2020-06-24 18:40:22 +02:00
• 2290f01a8f Merge pull request 'feature/fix_delivery_api' (#116) from feature/fix_delivery_api into master Seil0 2020-06-24 18:38:03 +02:00
• 3bc0996c73 Merge pull request 'Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110' (#114) from feature/supplier_tracking into master Seil0 2020-06-24 18:37:15 +02:00
• 758c6810ab Merge pull request 'Clean Shopping Cart on Logout' (#123) from feature/clean_shopping_on_logout into master Seil0 2020-06-24 18:27:24 +02:00
• 577a4f72f0 Clean Shopping Cart on Logout for real CodeSteak 2020-06-24 18:25:42 +02:00
• a2aca7a8ca Clean Shopping Cart on Logout CodeSteak 2020-06-24 18:23:01 +02:00
• 3b7317a831 Fix typo 7 Lukas 2020-06-24 18:19:14 +02:00
• 32921a3f87 Merge pull request 'Remove WarehouseBookingReason it was not used.' (#115) from feature/remove_unused_warehouse_booking_reason into master Seil0 2020-06-24 15:03:47 +02:00
• 63e9bc2336 Merge pull request 'Fix in stock calculation. closes #118' (#119) from feature/display_article_shop_in_stock into master Seil0 2020-06-24 15:03:04 +02:00
• 31bff55a20 Merge pull request 'Show advertisements distinct.' (#122) from feature/show_ads_distinct into master Seil0 2020-06-24 14:59:50 +02:00
• 5861b61565 Merge branch 'master' into feature/supplier_tracking CodeSteak 2020-06-24 10:44:38 +02:00
• f0c9823e45 Clearify Inventory view with text. CodeSteak 2020-06-24 09:53:19 +02:00
• 6fbb16fea2 Show advertisements distinct. CodeSteak 2020-06-24 02:20:24 +02:00
• 0d547c8903 Fix display order in various locations. closes #120 CodeSteak 2020-06-24 02:15:31 +02:00
• 5162e3fc19 Fix in stock calculation. closes #118 CodeSteak 2020-06-24 02:05:25 +02:00
• 8bfe8b37f5 Maybe Fix warehouse booking repo CodeSteak 2020-06-24 02:00:37 +02:00
• 2e07d03908 Fix warehouse bookings on CreateOrderAction CodeSteak 2020-06-24 01:48:33 +02:00
• b9e87f5bd4 Add additional infos for order history in /user/... fixes #109 CodeSteak 2020-06-24 01:19:37 +02:00
• cd641d6cc4 Fix #113 by fixing initialization of RestServiceForDelivery. CodeSteak 2020-06-24 01:18:16 +02:00
• 4e9f7800be Remove WarehouseBookingReason it was not used. CodeSteak 2020-06-24 00:42:55 +02:00
• 8d27c486d5 Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 CodeSteak 2020-06-24 00:37:58 +02:00
• 714ac4f1de Fix issues with class loading in Cronjobs CodeSteak 2020-06-24 00:35:18 +02:00
• 186db31b17 Merge pull request 'Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order' (#108) from feature/fix_show_orders into master CodeSteak 2020-06-21 22:22:53 +02:00
• fb53c68be3 Merge pull request 'implement Config for Supplier and Delivery Service' (#107) from feature/reading_config into master CodeSteak 2020-06-21 22:22:43 +02:00
• 19cf6ccfc5 Merge pull request 'Implement Supplier AutoSupplierPayment. closes #100' (#105) from feature/supplier_auto_payment into master CodeSteak 2020-06-21 22:13:41 +02:00
• 7fafd14715 Fix variable name CodeSteak 2020-06-21 19:01:25 +02:00
• d5181f149a Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order CodeSteak 2020-06-21 18:58:15 +02:00
• a950ecb2b9 Make delivery/gradlew executable Lukas 2020-06-21 18:42:33 +02:00
• f42a50d24d fix CustomerOrder find by order CodeSteak 2020-06-21 18:32:04 +02:00
• 33118ddb2f Mark lost delivery as delivered. #spaghetticode CodeSteak 2020-06-21 18:25:33 +02:00
• a6a2adc7db implement Config for Supplier and Delivery Service CodeSteak 2020-06-21 16:49:35 +02:00
• 62df2346c3 fix template crashing when defaultAddr == null CodeSteak 2020-06-21 16:28:00 +02:00
• c1a0ecdcf3 fix delivery server crashing when tracking id not found CodeSteak 2020-06-21 16:13:48 +02:00
• a1abbf5329 Implement Supplier AutoSupplierPayment. closes #100 CodeSteak 2020-06-21 15:50:27 +02:00
• deaf283a98 remove db blob CodeSteak 2020-06-21 01:08:58 +02:00
• ffe9af0633 Prevent duplicate Articles from ArticleOffer CodeSteak 2020-06-21 00:58:53 +02:00
• 2989b54593 Merge pull request 'fix_change_user_name' (#104) from fix_change_user_name into master CodeSteak 2020-06-21 00:15:57 +02:00
• b846b919b7 code clean up localhorst 2020-06-21 00:14:00 +02:00
• 1f83a82f17 removed user.name and use user.defaultDeliveryAddress.name instead localhorst 2020-06-21 00:13:10 +02:00
• cd1a8568e6 show only one entry per article suggestions fix #96 hhuber 2020-06-21 00:06:15 +02:00
• 53cdb20091 Merge pull request 'Fix the warehouse diagrams on the dashboard' (#103) from fix/dashboard_warehouse_statistics into master CodeSteak 2020-06-21 00:02:50 +02:00
• 9389675b5c Do not show dupliactes in category search. fixes #85 CodeSteak 2020-06-21 00:01:28 +02:00
• 97a7f3a8ad Fix the warehouse diagrams on the dashboard Lukas 2020-06-20 23:54:33 +02:00
• aa2f42a10a Add password restrictions fixes #91 CodeSteak 2020-06-20 23:47:53 +02:00
• f128a8b9ed Make reason for manuel booking required. fixes #90 CodeSteak 2020-06-20 23:35:56 +02:00
• ffea25c082 Merge pull request 'Fix bad query for article slot sum' (#102) from feature/89_fix_lagerstand into master CodeSteak 2020-06-20 23:30:12 +02:00
• d77b8c046a Fix bad query for article slot sum CodeSteak 2020-06-20 23:24:06 +02:00
• 8fdfe9cc69 Catch failing delivery server CodeSteak 2020-06-20 22:51:18 +02:00
• e5332a3348 Fix String -> UUIDs -> String in method causing crash CodeSteak 2020-06-20 22:25:52 +02:00
• c3eaf5ac11 Remove unused db fields CodeSteak 2020-06-20 22:10:53 +02:00
• fa75beb9c4 Fix 6284a4d7bf altering template CodeSteak 2020-06-20 22:09:25 +02:00
• 4bef17dc0a Merge pull request 'feature/dashboard' (#83) from feature/dashboard into master Seil0 2020-06-19 14:12:44 +02:00
• 79e4986880 delete blank line Danny 2020-06-19 14:11:32 +02:00
• 181a09e16b Merge pull request 'feature/config' (#78) from feature/config into master CodeSteak 2020-06-18 14:09:46 +02:00
• f4aae9c581 ignore config.yml Seil0 2020-06-18 14:07:59 +02:00
• ea0c8c45d6 rename eCommerce_config.yml to config.yml Seil0 2020-06-18 14:04:54 +02:00
• 8416783e0a merged Pheanox 2020-06-18 01:13:03 +02:00
• bcbebe8e8d master merged into feature/customer_orders Pheanox 2020-06-18 01:07:11 +02:00
• a570696795 feature/customer_orders merged into master Pheanox 2020-06-18 01:07:11 +02:00
• 187656814e String Error -> Enum ErrorHandling Logic removed from model class Pheanox 2020-06-18 00:50:43 +02:00
• 8c0652b26b exit if the settings file has not been found Seil0 2020-06-17 22:32:48 +02:00
• ef07447abc fix json-file hhuber 2020-06-17 20:42:08 +02:00
• bb7b35dc28 Increase the amount of commits Lukas 2020-06-17 19:00:49 +02:00
• 93cfbb4a27 Merge remote-tracking branch 'origin/master' Lukas 2020-06-17 18:59:10 +02:00
• 68cc35cec3 Fix typo 6 Lukas 2020-06-17 18:57:42 +02:00
• b2ee048f25 Fix typo 5 Lukas 2020-06-17 18:57:23 +02:00
• 020a30474e Fix typo 4 Lukas 2020-06-17 18:56:32 +02:00
• 4bfc8a2cc6 Fix typo 3 Lukas 2020-06-17 18:56:02 +02:00
• 0ff873baaa Fix typo 2 Lukas 2020-06-17 18:55:50 +02:00
• 1812c89994 Fix typo Lukas 2020-06-17 18:55:29 +02:00
• 2442a477c8 add missing "|" Seil0 2020-06-17 18:43:06 +02:00