243 Commits (master)
 

Author SHA1 Message Date
  Jannik Seiler e9a3cb51ba Merge pull request 'fix/intern_articles' (#39) from fix/intern_articles into master 20 hours ago
  Jannik Seiler f4b0d6a576
fix html warnings [2] 20 hours ago
  Jannik Seiler 2bf383b113
fix html warnings 20 hours ago
  Jannik Seiler ff5b0afc93 Merge pull request 'feature/delivery_api' (#25) from feature/delivery_api into master 21 hours ago
  Hendrik Schutter 35861d3664 fixed styling for edit/add btn 1 day ago
  Hendrik Schutter 08dc4bcb47 fixed spaces in textarea 1 day ago
  Hendrik Schutter a38b817f20 fixed empty input fields fixes #32 1 day ago
  Philipp Schweizer 42a02effa6 fixed pull request #25 1 day ago
  Danny Huber 7c467c8641 bugfix register 1 day ago
  Jannik Seiler 747eb1cde2 Merge pull request 'feature/register' (#24) from feature/register into master 3 days ago
  Danny Huber ac79e1cf22 Check for inactive accounts 4 days ago
  Philipp Schweizer 40013f0812 Merge remote-tracking branch 'origin/feature/delivery_api' into feature/delivery_api 4 days ago
  Philipp Schweizer 77892c9dfc fixed pull request #25 4 days ago
  Philipp Schweizer cff9417dc5 fixed pull request #24 4 days ago
  Jannik Seiler e571e21281 Merge pull request 'feature/image' (#26) from feature/image into master 5 days ago
  Hendrik Schutter 019f5d8f1b code cleanup 5 days ago
  Hendrik Schutter 620e163a14 added feature to change an article image 5 days ago
  Hendrik Schutter fcdf0e776d set default img if article is added to listed articles 5 days ago
  Hendrik Schutter a3efa4092a removed old static product images 5 days ago
  Jannik Seiler 32c6b8cb68 Merge pull request 'feature/offeredArticle' (#23) from feature/offeredArticle into master 1 week ago
  Jannik Seiler 525a5f7eb1
Merge branch 'master' into feature/offeredArticle 1 week ago
  Hendrik Schutter ba570852a7 added id´s to inputs 1 week ago
  Philipp Schweizer caf5430a06 delivery_api finished 1 week ago
  Philipp Schweizer 9a24fa306d gitignore push 1 week ago
  Danny Huber da78ab4990 register working 1 week ago
  Hendrik Schutter 9cfb1cd0ad add offered article to listed article 1 week ago
  Danny Huber 7686c4cda6 Create rudimentary register class 1 week ago
  Hendrik Schutter d8032c2bd7 load offeredArticles from DB and display basic info 1 week ago
  Jannik Seiler 5c5df83872 Merge pull request 'feature/search' (#19) from feature/search into master 1 week ago
  Hannes Huber 7b6882b12b format code 1 week ago
  Hannes Huber d739b15410 fix missing import 1 week ago
  Hannes Huber 0c66a713b4 add some comments 1 week ago
  Hannes Huber d0785308d4 code cleanup 1 week ago
  Hannes Huber bc350b3177 implement only show Searchresults which are in Stock 1 week ago
  Hannes Huber 8d6a1f4053 implement only show advertisements which are in stock 1 week ago
  Hannes Huber 6b9db3eed5 implement errorhandling 1 week ago
  Hannes Huber 3f5b1efa0c implement search 2 weeks ago
  Hendrik Schutter d4be2b9e94 Revert "Revert "added link from listedArticles page to related offered article"" 1 week ago
  Hendrik Schutter 14bef592c4 Revert "Revert "UImodel for offeredArticle page, html cleanup"" 1 week ago
  Hendrik Schutter 0840eda369 Revert "UImodel for offeredArticle page, html cleanup" 1 week ago
  Hendrik Schutter 3c69f38367 Revert "added link from listedArticles page to related offered article" 1 week ago
  Hendrik Schutter 39fb735f21 added link from listedArticles page to related offered article 1 week ago
  Hendrik Schutter e0f638f0bd UImodel for offeredArticle page, html cleanup 1 week ago
  Hendrik Schutter 4f6388e4b9 fixed links to offered articles page 1 week ago
  Jannik Seiler 2bbf8260f4 Merge pull request 'WIP feature/listedArticles' (#15) from feature/listedArticles into master 1 week ago
  Hendrik Schutter b1840dd845 code cleanup 1 week ago
  Hendrik Schutter dc49bc2e8d code cleanuo 1 week ago
  Hendrik Schutter 8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories 1 week ago
  Jannik Seiler c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles 1 week ago
  Hendrik Schutter ea8aaa3931 removed PW bypass 1 week ago