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

• ff4c984f54 fix error message hhuber 2020-06-01 20:24:45 +02:00
• 21502a0b1c Merge branch 'master' into feature/user Seil0 2020-06-01 19:03:42 +02:00
• b38ffdea34 Merge pull request 'feature/offered_article_supplier' (#40) from feature/offered_article_supplier into master Seil0 2020-06-01 17:10:21 +02:00
• 6988d3f213 minor code clean up Seil0 2020-06-01 17:10:04 +02:00
• f5ad05f49f Merge branch 'master' into feature/offered_article_supplier Seil0 2020-06-01 17:04:52 +02:00
• e539a9433a Merge pull request 'implement better search' (#43) from feature/search into master Seil0 2020-06-01 16:59:37 +02:00
• b14c565e81 Merge pull request 'Store the cheapest supplier for each offered article in the database' (#41) from feature/reorder_cronjob into master Seil0 2020-06-01 16:53:58 +02:00
• b04d627695 Merge pull request 'check if article.image is null' (#44) from fix/image_null into master Seil0 2020-06-01 16:51:23 +02:00
• 839bebcd89 trim searchterm hhuber 2020-06-01 11:58:08 +02:00
• 3775f96f3f implement getCustomerOrderDetail hhuber 2020-06-01 11:53:29 +02:00
• 2394157be8 implement getCustomerOrder hhuber 2020-06-01 11:31:12 +02:00
• 922e3cadef Bugfix register Danny 2020-06-01 11:13:03 +02:00
• 0fb1d5704e Bufix: After register, you now logged in Danny 2020-06-01 11:11:34 +02:00
• dfa528484c Merge branch 'master' into feature/user hhuber 2020-06-01 10:57:55 +02:00
• 38fcda708f check if article.image is null localhorst 2020-06-01 10:53:10 +02:00
• 9238162a4c implement better search hhuber 2020-05-29 11:06:00 +02:00
• 1cb52a20d4 finished supplier orders localhorst 2020-05-30 23:32:01 +02:00
• 67c101ebea finished show orders based on supplier localhorst 2020-05-30 21:13:25 +02:00
• 657d315850 show orders based on supplier localhorst 2020-05-30 20:16:27 +02:00
• e7e3864b4c Store the cheapest supplier for each offered article in the database Lukas 2020-05-30 18:25:23 +02:00
• 407229f15d changed cheapest supplier ref in offered article entity localhorst 2020-05-30 16:49:20 +02:00
• 5d7ecbdfb7 basic detail page for supplier localhorst 2020-05-30 16:43:07 +02:00
• c8d3ab3ff0 list suppliers page localhorst 2020-05-30 16:16:14 +02:00
• 1b2e75a82c updates scripts localhorst 2020-05-30 12:29:40 +02:00
• 286edb33ed show supplier name at offered article page localhorst 2020-05-30 11:52:30 +02:00
• 1a1502b38c Merge pull request 'feature/reorder_cronjob' (#27) from feature/reorder_cronjob into master Seil0 2020-05-29 16:20:04 +02:00
• d55a50ab29 [supplier] update gradle to version 6.4 Seil0 2020-05-29 16:18:22 +02:00
• e4489ff3a6 Merge branch 'feature/supplier_api' into feature/reorder_cronjob CodeSteak 2020-05-29 16:13:29 +02:00
• 2c2b5c1d0f Add Missing Gradle Folder to Repo CodeSteak 2020-05-29 16:12:28 +02:00
• e9a3cb51ba Merge pull request 'fix/intern_articles' (#39) from fix/intern_articles into master Seil0 2020-05-28 13:23:01 +02:00
• f4b0d6a576 fix html warnings [2] Seil0 2020-05-28 13:22:28 +02:00
• 2bf383b113 fix html warnings Seil0 2020-05-28 13:20:42 +02:00
• ff5b0afc93 Merge pull request 'feature/delivery_api' (#25) from feature/delivery_api into master Seil0 2020-05-28 12:19:29 +02:00
• d5540c1979 Small changes according to comments on the pullrequest Lukas 2020-05-28 10:58:11 +02:00
• e1df56147b Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob Lukas 2020-05-28 10:39:38 +02:00
• 35861d3664 fixed styling for edit/add btn localhorst 2020-05-27 21:53:58 +02:00
• 08dc4bcb47 fixed spaces in textarea localhorst 2020-05-27 21:43:26 +02:00
• a38b817f20 fixed empty input fields fixes #32 localhorst 2020-05-27 21:07:31 +02:00
• 8a2eff1fe9 code cleanup hhuber 2020-05-27 19:03:18 +02:00
• e4d6642d61 order orders by newest first hhuber 2020-05-27 15:52:51 +02:00
• 9406bbc4ac fix nullpointer again hhuber 2020-05-27 15:10:12 +02:00
• e5b28250c2 fix payment method null pointer hhuber 2020-05-27 14:56:15 +02:00
• db1d3d31b2 fix register hhuber 2020-05-27 14:55:51 +02:00
• 42a02effa6 fixed pull request #25 Pheanox 2020-05-27 14:24:05 +02:00
• 819cca7f2a Merge remote-tracking branch 'origin/feature/user' into feature/user hhuber 2020-05-27 13:41:04 +02:00
• 846e448f01 code cleanup hhuber 2020-05-25 12:17:09 +02:00
• 614a929592 code cleanup hhuber 2020-05-25 10:21:36 +02:00
• 60699ed847 fix error handling hhuber 2020-05-25 10:10:42 +02:00
• 83ad1f3999 remove advertisementflag hhuber 2020-05-25 09:36:40 +02:00
• 5b4c0be1c8 add Errorhandling to UpdateSettingsAction hhuber 2020-05-20 12:08:57 +02:00
• 0256c19e8f implement change User Settings hhuber 2020-05-19 15:18:48 +02:00
• adcd840154 remove notification center hhuber 2020-05-19 14:17:38 +02:00
• b5495bda3d show all Orders hhuber 2020-05-19 11:52:41 +02:00
• 106b00a907 show usersettings from db hhuber 2020-05-18 14:41:33 +02:00
• 7c73f69865 remove bonuspoints hhuber 2020-05-18 12:49:37 +02:00
• 7c467c8641 bugfix register Danny 2020-05-27 12:22:24 +02:00
• ffb683bdd0 Set the advertise flag if at least one supplier wants it to be set Lukas 2020-05-25 17:19:25 +02:00
• 8386629088 Implement the reorder cronjob Lukas 2020-05-25 17:08:15 +02:00
• 86a2e5d8c2 code cleanup hhuber 2020-05-25 12:17:09 +02:00
• 747eb1cde2 Merge pull request 'feature/register' (#24) from feature/register into master Seil0 2020-05-25 10:51:33 +02:00
• 8d65998ac2 code cleanup hhuber 2020-05-25 10:21:36 +02:00
• 178f98d664 fix error handling hhuber 2020-05-25 10:10:42 +02:00
• 33ff754b9d remove advertisementflag hhuber 2020-05-25 09:36:40 +02:00
• ac79e1cf22 Check for inactive accounts Check for employee by access on /intern Tyro 2020-05-24 21:51:40 +02:00
• 40013f0812 Merge remote-tracking branch 'origin/feature/delivery_api' into feature/delivery_api Pheanox 2020-05-24 20:06:43 +02:00
• 77892c9dfc fixed pull request #25 Pheanox 2020-05-24 20:04:03 +02:00
• cff9417dc5 fixed pull request #24 Pheanox 2020-05-24 20:04:03 +02:00
• e571e21281 Merge pull request 'feature/image' (#26) from feature/image into master Seil0 2020-05-23 18:51:15 +02:00
• 019f5d8f1b code cleanup localhorst 2020-05-23 14:19:43 +02:00
• 620e163a14 added feature to change an article image localhorst 2020-05-23 14:18:33 +02:00
• 6892a11688 Merge branch 'feature/supplier_api' into feature/reorder_cronjob Lukas 2020-05-23 11:16:46 +02:00
• fcdf0e776d set default img if article is added to listed articles localhorst 2020-05-23 10:45:14 +02:00
• a3efa4092a removed old static product images localhorst 2020-05-23 09:40:52 +02:00
• 32c6b8cb68 Merge pull request 'feature/offeredArticle' (#23) from feature/offeredArticle into master Seil0 2020-05-21 20:25:53 +02:00
• 525a5f7eb1 Merge branch 'master' into feature/offeredArticle Seil0 2020-05-21 20:23:47 +02:00
• ba570852a7 added id´s to inputs localhorst 2020-05-21 10:27:26 +02:00
• 8ede86fdce add Errorhandling to UpdateSettingsAction hhuber 2020-05-20 12:08:57 +02:00
• caf5430a06 delivery_api finished Pheanox 2020-05-19 20:38:22 +02:00
• 9a24fa306d gitignore push Pheanox 2020-05-19 20:37:26 +02:00
• da78ab4990 register working Tyro 2020-05-19 18:47:15 +02:00
• 9cfb1cd0ad add offered article to listed article localhorst 2020-05-19 16:30:27 +02:00
• 7686c4cda6 Create rudimentary register class Tyro 2020-05-19 15:41:43 +02:00
• 39eefbdd3e implement change User Settings hhuber 2020-05-19 15:18:48 +02:00
• 6e3d1cbcf5 remove notification center hhuber 2020-05-19 14:17:38 +02:00
• 1ce9a971ba show all Orders hhuber 2020-05-19 11:52:41 +02:00
• d8032c2bd7 load offeredArticles from DB and display basic info localhorst 2020-05-19 00:12:26 +02:00
• 4711527971 show usersettings from db hhuber 2020-05-18 14:41:33 +02:00
• b7b5c7a6b3 remove bonuspoints hhuber 2020-05-18 12:49:37 +02:00
• 5c5df83872 Merge pull request 'feature/search' (#19) from feature/search into master Seil0 2020-05-18 09:42:06 +02:00
• 7b6882b12b format code hhuber 2020-05-18 09:41:02 +02:00
• d739b15410 fix missing import hhuber 2020-05-17 13:11:32 +02:00
• 0c66a713b4 add some comments hhuber 2020-05-17 12:59:03 +02:00
• d0785308d4 code cleanup hhuber 2020-05-17 12:54:30 +02:00
• bc350b3177 implement only show Searchresults which are in Stock hhuber 2020-05-15 14:18:17 +02:00
• 8d6a1f4053 implement only show advertisements which are in stock hhuber 2020-05-15 12:54:28 +02:00
• 6b9db3eed5 implement errorhandling hhuber 2020-05-15 12:23:32 +02:00
• 3f5b1efa0c implement search hhuber 2020-05-14 15:43:16 +02:00
• d4be2b9e94 Revert "Revert "added link from listedArticles page to related offered article"" localhorst 2020-05-16 22:48:40 +02:00
• 14bef592c4 Revert "Revert "UImodel for offeredArticle page, html cleanup"" localhorst 2020-05-16 22:48:20 +02:00
• 0840eda369 Revert "UImodel for offeredArticle page, html cleanup" localhorst 2020-05-16 22:46:42 +02:00