77892c9dfc
fixed pull request #25
2020-05-24 20:05:50 +02:00
cff9417dc5
fixed pull request #24
2020-05-24 20:04:03 +02:00
e571e21281
Merge pull request 'feature/image' ( #26 ) from feature/image into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-23 18:51:15 +02:00
019f5d8f1b
code cleanup
2020-05-23 14:19:43 +02:00
620e163a14
added feature to change an article image
2020-05-23 14:18:33 +02:00
6892a11688
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-23 11:16:46 +02:00
fcdf0e776d
set default img if article is added to listed articles
2020-05-23 10:45:14 +02:00
a3efa4092a
removed old static product images
2020-05-23 09:40:52 +02:00
32c6b8cb68
Merge pull request 'feature/offeredArticle' ( #23 ) from feature/offeredArticle into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-21 20:25:53 +02:00
525a5f7eb1
Merge branch 'master' into feature/offeredArticle
2020-05-21 20:23:47 +02:00
ba570852a7
added id´s to inputs
2020-05-21 10:27:26 +02:00
8ede86fdce
add Errorhandling to UpdateSettingsAction
2020-05-20 12:08:57 +02:00
caf5430a06
delivery_api finished
2020-05-19 20:38:22 +02:00
9a24fa306d
gitignore push
2020-05-19 20:37:26 +02:00
da78ab4990
register working
2020-05-19 18:47:15 +02:00
9cfb1cd0ad
add offered article to listed article
2020-05-19 16:30:27 +02:00
7686c4cda6
Create rudimentary register class
2020-05-19 15:41:43 +02:00
39eefbdd3e
implement change User Settings
2020-05-19 15:18:48 +02:00
6e3d1cbcf5
remove notification center
2020-05-19 14:17:38 +02:00
1ce9a971ba
show all Orders
2020-05-19 11:52:41 +02:00
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +02:00
4711527971
show usersettings from db
2020-05-18 14:41:33 +02:00
b7b5c7a6b3
remove bonuspoints
2020-05-18 12:49:37 +02:00
5c5df83872
Merge pull request 'feature/search' ( #19 ) from feature/search into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-18 09:42:06 +02:00
7b6882b12b
format code
2020-05-18 09:41:02 +02:00
d739b15410
fix missing import
2020-05-17 13:11:32 +02:00
0c66a713b4
add some comments
2020-05-17 13:10:04 +02:00
d0785308d4
code cleanup
2020-05-17 13:09:51 +02:00
bc350b3177
implement only show Searchresults which are in Stock
2020-05-17 13:09:26 +02:00
8d6a1f4053
implement only show advertisements which are in stock
2020-05-17 13:09:26 +02:00
6b9db3eed5
implement errorhandling
2020-05-17 13:09:26 +02:00
3f5b1efa0c
implement search
2020-05-17 13:08:18 +02:00
d4be2b9e94
Revert "Revert "added link from listedArticles page to related offered article""
...
This reverts commit 3c69f38367
2020-05-16 22:48:40 +02:00
14bef592c4
Revert "Revert "UImodel for offeredArticle page, html cleanup""
...
This reverts commit 0840eda369
2020-05-16 22:48:20 +02:00
0840eda369
Revert "UImodel for offeredArticle page, html cleanup"
...
This reverts commit e0f638f0bd
2020-05-16 22:46:42 +02:00
3c69f38367
Revert "added link from listedArticles page to related offered article"
...
This reverts commit 39fb735f21
2020-05-16 22:46:18 +02:00
39fb735f21
added link from listedArticles page to related offered article
2020-05-16 21:49:31 +02:00
e0f638f0bd
UImodel for offeredArticle page, html cleanup
2020-05-16 13:42:07 +02:00
4f6388e4b9
fixed links to offered articles page
2020-05-15 20:57:56 +02:00
2bbf8260f4
Merge pull request 'WIP feature/listedArticles' ( #15 ) from feature/listedArticles into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-15 19:48:21 +02:00
b1840dd845
code cleanup
2020-05-15 19:47:26 +02:00
dc49bc2e8d
code cleanuo
2020-05-15 19:45:10 +02:00
8c777ca1ff
fixed merge bug: cascade = CascadeType.ALL in Article to Categories
2020-05-15 19:31:31 +02:00
c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles
2020-05-15 19:04:02 +02:00
ea8aaa3931
removed PW bypass
2020-05-15 18:16:03 +02:00
56efbd7940
code cleanup
2020-05-15 18:13:12 +02:00
a98782bc01
added new route in external controller
2020-05-15 14:14:29 +02:00
0de35f1a51
Implement scheduled execution of cronjobs
2020-05-15 13:47:54 +02:00
f403a6e1c4
fix in stock bug
2020-05-15 12:33:32 +02:00
d06fd57447
added new route for offered articles page
2020-05-15 11:57:20 +02:00
