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

• 3c69f38367 Revert "added link from listedArticles page to related offered article" localhorst 2020-05-16 22:46:18 +0200
• 39fb735f21 added link from listedArticles page to related offered article localhorst 2020-05-16 21:49:31 +0200
• e0f638f0bd UImodel for offeredArticle page, html cleanup localhorst 2020-05-16 13:42:07 +0200
• 4f6388e4b9 fixed links to offered articles page localhorst 2020-05-15 20:57:56 +0200
• 2bbf8260f4 Merge pull request 'WIP feature/listedArticles' (#15) from feature/listedArticles into master Jannik Seiler 2020-05-15 19:48:21 +0200
• b1840dd845 code cleanup localhorst 2020-05-15 19:47:26 +0200
• dc49bc2e8d code cleanuo localhorst 2020-05-15 19:45:10 +0200
• 8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories localhorst 2020-05-15 19:31:31 +0200
• c73435b2a0
  
  Merge remote-tracking branch 'origin/master' into feature/listedArticles Seil0 2020-05-15 19:04:02 +0200
• ea8aaa3931 removed PW bypass localhorst 2020-05-15 18:16:03 +0200
• 56efbd7940 code cleanup localhorst 2020-05-15 18:13:12 +0200
• a98782bc01 added new route in external controller localhorst 2020-05-15 14:14:29 +0200
• 0de35f1a51
  
  Implement scheduled execution of cronjobs Lukas Fürderer 2020-05-15 13:47:54 +0200
• f403a6e1c4 fix in stock bug Hannes 2020-05-15 12:33:32 +0200
• d06fd57447 added new route for offered articles page localhorst 2020-05-15 11:57:20 +0200
• 197a774fb2 removed data folder localhorst 2020-05-14 23:14:33 +0200
• af99e8107d added change for stock, price and autobuy values on article edit page localhorst 2020-05-14 22:16:06 +0200
• f2fc51384e Merge pull request 'update dependencies & gradle' (#12) from feature/spring-boot-2.2.7 into master Jannik Seiler 2020-05-13 19:45:46 +0200
• 922e21a454
  
  update dependencies & gradle Seil0 2020-05-13 18:28:21 +0200
• c69b20b914 added POST that changes the article WIP localhorst 2020-05-12 22:52:01 +0200
• c92e485018 Implement API Bindings for SupplierService CodeSteak 2020-05-12 22:42:25 +0200
• 62d811db1d Implement First Draft of Supplier API CodeSteak 2020-05-12 22:41:08 +0200
• fd9dcf141e fixes in listed article page and converted form to POST localhorst 2020-05-11 15:32:39 +0200
• 09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles localhorst 2020-05-11 14:32:07 +0200
• 22d2744c8c GET article edit page localhorst 2020-05-11 11:58:26 +0200
• bba4173269 fixed inputstream once more localhorst 2020-05-10 22:19:58 +0200
• c14ae996be Merge branch 'feature/listedArticles' of git.mosad.xyz:localhorst/e-commerce into feature/listedArticles localhorst 2020-05-10 21:32:19 +0200
• 3a3b7abad0 fix typo Seil0 2020-05-10 15:31:20 +0200
• a2f20938cd show listedArticles localhorst 2020-05-10 15:26:50 +0200
• 2b3ecb2342 changed listedArticles Request to own Controller localhorst 2020-05-09 23:01:25 +0200
• 143a53acf5 fix better quantities for UI Hannes 2020-05-08 13:01:29 +0200
• bb4aa79243 implement personalized suggestions Hannes 2020-05-08 11:44:30 +0200
• 82dacef4c0 Advertised Articles now shown correctly Hannes 2020-05-08 10:37:42 +0200
• 262640a2b4 change Databasename and add Advertisementflag Hannes 2020-05-08 09:58:29 +0200
• 1e7266e554 implement imageserving and first part of ArticleRepository Hannes 2020-05-07 15:48:00 +0200
• 4048d6c5ad Unify Style of error messages to match rest of ui. CodeSteak 2020-05-06 17:00:28 +0200
• 572a999467 Implement proper querying of warehouse slot sums and booking accounts. CodeSteak 2020-05-06 14:10:37 +0200
• 5f071939d3 Renice error handling CodeSteak 2020-05-05 23:34:17 +0200
• 2ec3ad32ea Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching... CodeSteak 2020-05-05 22:56:12 +0200
• d2bf6e8c52 implement checkout for non logged in users. CodeSteak 2020-05-05 18:59:15 +0200
• 7d83d723c1 Implement add Items to ShoppingCart CodeSteak 2020-05-05 17:24:25 +0200
• 4338f188f0 fix local merge conflicts in req ctrl CodeSteak 2020-05-05 17:22:35 +0200
• e9e072b26b ShopIndexController without databasestuff Hannes 2020-05-01 14:40:43 +0200
• 8a28aabaf3 ShopIndexController initial implementation Hannes 2020-05-01 12:19:52 +0200
• e1d7becc2e added yaml dump&parse class localhorst 2020-05-10 21:23:44 +0200
• 89eaeaed40 Merge pull request 'feature/basic_functions' (#7) from feature/basic_functions into master Jannik Seiler 2020-05-10 17:48:31 +0200
• edcdb2e9cf fix use Math.min for loopcount Hannes 2020-05-10 17:25:48 +0200
• 530034a40e fix unused imports and unneeded empty lines Hannes 2020-05-10 17:19:18 +0200
• 8f24aee350 fix add should_be_advertised to script Hannes 2020-05-10 17:16:17 +0200
• bd2aeb63f6 Remove unneeded comment CodeSteak 2020-05-10 17:05:19 +0200
• 713c8ebe86 Comment empty constructors CodeSteak 2020-05-10 17:03:40 +0200
• e406918ca2 Remove commend out code CodeSteak 2020-05-10 16:57:33 +0200
• e167832164 Merge branch 'feature/basic_functions' of git.mosad.xyz:localhorst/e-commerce into feature/basic_functions CodeSteak 2020-05-10 15:39:35 +0200
• 777786f5b6 Remove old missleading comment CodeSteak 2020-05-10 15:39:24 +0200
• 7a42122a9a
  
  fix typo Seil0 2020-05-10 15:31:20 +0200
• a62e3e8a63 fix only show ordered Articles from specific Customer Hannes 2020-05-10 15:28:39 +0200
• 2135c48646 show listedArticles localhorst 2020-05-10 15:26:50 +0200
• 7f95cef13b fix personalized suggestions Hannes 2020-05-10 15:03:45 +0200
• 95e52cc79d fix non-formatted and non-vatted price Hannes 2020-05-10 14:57:02 +0200
• d4d1426438 Fix decimals in checkout page CodeSteak 2020-05-10 14:34:20 +0200
• d1301f6988 Fix naming-convension-error in ArticleOffer CodeSteak 2020-05-10 14:30:00 +0200
• 731f4761fa Show error if articles are not avail during checkout. CodeSteak 2020-05-10 14:29:08 +0200
• d66b3d1385 changed listedArticles Request to own Controller localhorst 2020-05-09 23:01:25 +0200
• 69b5b33af8
  
  fix typo in 8dd4cc4459 Seil0 2020-05-09 19:58:31 +0200
• 8dd4cc4459
  
  use application.properties when run via bootRun Seil0 2020-05-09 19:31:57 +0200
• c0ce1e23c3 fix better quantities for UI Hannes 2020-05-08 13:01:29 +0200
• 1bd267a26d implement personalized suggestions Hannes 2020-05-08 11:44:30 +0200
• e4b4698a27 Advertised Articles now shown correctly Hannes 2020-05-08 10:37:42 +0200
• c097e58bf3 change Databasename and add Advertisementflag Hannes 2020-05-08 09:58:29 +0200
• 4fd80bb3c7 implement imageserving and first part of ArticleRepository Hannes 2020-05-07 15:48:00 +0200
• beb0131b60 Unify Style of error messages to match rest of ui. CodeSteak 2020-05-06 17:00:28 +0200
• cdce22968d Implement proper querying of warehouse slot sums and booking accounts. CodeSteak 2020-05-06 14:10:37 +0200
• f5a99700a0 Renice error handling CodeSteak 2020-05-05 23:34:17 +0200
• b2f927e48d Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching... CodeSteak 2020-05-05 22:56:12 +0200
• d681f240e1 implement checkout for non logged in users. CodeSteak 2020-05-05 18:59:15 +0200
• 31059b4894 Implement add Items to ShoppingCart CodeSteak 2020-05-05 17:24:25 +0200
• cbaec13d38 fix local merge conflicts in req ctrl CodeSteak 2020-05-05 17:22:35 +0200
• a5152aaa3d Merge remote-tracking branch 'origin/feature/start' into feature/basic_functions CodeSteak 2020-05-05 16:48:37 +0200
• f48f5c40f0 ShopArticleController initial Hannes 2020-05-02 14:38:40 +0200
• 6ab3b63923
  
  Revert "split RequestController acording to mapping" Seil0 2020-05-01 14:53:35 +0200
• 41eb4d0b8f
  
  split RequestController acording to mapping Seil0 2020-05-01 14:53:35 +0200
• 8f081823ca ShopIndexController without databasestuff Hannes 2020-05-01 14:40:43 +0200
• f67a23bab9 ShopIndexController initial implementation Hannes 2020-05-01 12:19:52 +0200
• 0d0f8e3272 Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce CodeSteak 2020-05-01 10:52:53 +0200
• da9a737fd0 Fix Duplicate Names of Controllers CodeSteak 2020-05-01 10:48:12 +0200
• 10480bebce Move intern ArticleController to intern Hannes 2020-04-30 10:32:48 +0200
• 411760e1d4 Move repos to own package CodeSteak 2020-04-29 23:07:47 +0200
• de6c750e7f Refactor Package Layout CodeSteak 2020-04-29 22:44:16 +0200
• bad1d94f8a add controllers and packages CodeSteak 2020-04-28 22:41:29 +0200
• 1186c390fb Implement Entries // TODO: Move to packages, add Repos. CodeSteak 2020-04-28 21:02:33 +0200
• 14161b7fd3 Reformat (all the) Code CodeSteak 2020-04-27 09:48:24 +0200
• 7c82b7b547 Build Prototype for Login CodeSteak 2020-04-08 18:27:46 +0200
• 26b64b8ab4
  
  move /user to separate RequestController Seil0 2020-03-16 13:49:51 +0100
• fd27729072 Fix not using var when accessing sessionStorage CodeSteak 2020-03-06 16:34:12 +0100
• 8bc0161e66 Implement some session storage magic for back buttons CodeSteak 2020-03-06 16:11:26 +0100
• d7b9a08829 Refactor checkout CodeSteak 2020-03-06 15:19:56 +0100
• 96e8b19f41 Implement message for info CodeSteak 2020-03-05 20:34:59 +0100
• 4a095fac09
  
  update article via id Seil0 2020-03-02 18:18:29 +0100
• e99dfea609
  
  add Article update via /intern/listedArticles/ID Seil0 2020-02-26 18:13:16 +0100
• 39b29c0f87
  
  add Article as Entity Seil0 2020-02-24 14:52:31 +0100