2bf383b113
	 
				 
					 
					
						
						
							
							fix html warnings  
						
						 
						
						
						
						
					 
					
						2020-05-28 13:20:42 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7c467c8641 
					 
					
						
						
							
							bugfix register  
						
						 
						
						
						
						
					 
					
						2020-05-27 12:22:24 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						197a774fb2 
					 
					
						
						
							
							removed data folder  
						
						 
						
						
						
						
					 
					
						2020-05-14 23:14:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						af99e8107d 
					 
					
						
						
							
							added change for stock, price and autobuy values on article edit page  
						
						 
						
						
						
						
					 
					
						2020-05-14 22:16:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						922e21a454
	 
				 
					 
					
						
						
							
							update dependencies & gradle  
						
						 
						
						... 
						
						
						
						* gradle 5.6.2 -> 6.4
* spring boot 2.2.2 -> 2.2.7
* sqlite-jdbc 3.28.0 -> 3.31.1 
						
						
					 
					
						2020-05-13 18:28:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c69b20b914 
					 
					
						
						
							
							added POST that changes the article WIP  
						
						 
						
						
						
						
					 
					
						2020-05-12 22:52:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fd9dcf141e 
					 
					
						
						
							
							fixes in listed article page and converted form to POST  
						
						 
						
						
						
						
					 
					
						2020-05-11 15:32:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						09c85fe8cb 
					 
					
						
						
							
							fixed route for /intern/articles and /intern/suppliers/articles  
						
						 
						
						
						
						
					 
					
						2020-05-11 14:32:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						22d2744c8c 
					 
					
						
						
							
							GET article edit page  
						
						 
						
						
						
						
					 
					
						2020-05-11 11:58:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3a3b7abad0 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00