922e3cadef
Bugfix register
2020-06-01 11:13:03 +02:00
0fb1d5704e
Bufix: After register, you now logged in
2020-06-01 11:11:34 +02:00
1a1502b38c
Merge pull request 'feature/reorder_cronjob' ( #27 ) from feature/reorder_cronjob into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-29 16:20:04 +02:00
d55a50ab29
[supplier] update gradle to version 6.4
2020-05-29 16:18:22 +02:00
e4489ff3a6
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-29 16:13:29 +02:00
2c2b5c1d0f
Add Missing Gradle Folder to Repo
2020-05-29 16:12:28 +02:00
e9a3cb51ba
Merge pull request 'fix/intern_articles' ( #39 ) from fix/intern_articles into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-28 13:23:01 +02:00
f4b0d6a576
fix html warnings [2]
2020-05-28 13:22:28 +02:00
2bf383b113
fix html warnings
2020-05-28 13:20:42 +02:00
ff5b0afc93
Merge pull request 'feature/delivery_api' ( #25 ) from feature/delivery_api into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-28 12:19:29 +02:00
d5540c1979
Small changes according to comments on the pullrequest
2020-05-28 10:58:11 +02:00
e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob
2020-05-28 10:39:38 +02:00
35861d3664
fixed styling for edit/add btn
2020-05-27 21:53:58 +02:00
08dc4bcb47
fixed spaces in textarea
2020-05-27 21:43:26 +02:00
a38b817f20
fixed empty input fields fixes #32
2020-05-27 21:07:31 +02:00
42a02effa6
fixed pull request #25
2020-05-27 14:24:05 +02:00
7c467c8641
bugfix register
2020-05-27 12:22:24 +02:00
ffb683bdd0
Set the advertise flag if at least one supplier wants it to be set
2020-05-25 17:19:25 +02:00
8386629088
Implement the reorder cronjob
2020-05-25 17:08:15 +02:00
747eb1cde2
Merge pull request 'feature/register' ( #24 ) from feature/register into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-05-25 10:51:33 +02:00
ac79e1cf22
Check for inactive accounts
...
Check for employee by access on /intern
2020-05-24 21:51:40 +02:00
40013f0812
Merge remote-tracking branch 'origin/feature/delivery_api' into feature/delivery_api
2020-05-24 20:06:43 +02:00
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
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
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +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
