| 
						
					 | 
					
						
						
							
						
						cb5db3dddd
					 | 
					
						
						
							
							ids as Value and not String
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-28 09:13:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbc53b97f5
					 | 
					
						
						
							
							added travis to build
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-14 16:52:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						99961e18c5
					 | 
					
						
						
							
							delete idea files
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-14 08:38:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26d4284169
					 | 
					
						
						
							
							removed dead code
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-11 08:31:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						026cf1a51a
					 | 
					
						
						
							
							added this to reload table
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-10 11:32:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e8a857caf
					 | 
					
						
						
							
							define class for AdminPanel
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-10 11:16:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1238a121f4
					 | 
					
						
						
							
							define class for device
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-10 11:10:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						98b3c69c15
					 | 
					
						
						
							
							define class for dashboard
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-10 10:52:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas-Heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						9cf713ab4a
					 | 
					
						
						
							
							Merge pull request #1 from IngProjDutzlerHeiligenbrunnerMeindl/kotlin
						
						
						
						
						
						
						
						Kotlin 
						
						
							
						
					 | 
					
						2020-02-10 10:18:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						04ecbd1375
					 | 
					
						
						
							
							updated Datarequest to kotlin
						
						
						
						
						
						
							
						
					 | 
					
						2020-02-10 10:17:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0bf021ab5a
					 | 
					
						
						
							
							userinforeqest
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 16:37:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4fe1b0c6ae
					 | 
					
						
						
							
							userinforeqest
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 16:34:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1dc2aa1022
					 | 
					
						
						
							
							userinforeqest
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 11:32:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						daf440e36b
					 | 
					
						
						
							
							login request setup all fields provided by db
						
						
						
						
						
						
						
						updated loginrequest to kotlin 
						
						
							
						
					 | 
					
						2020-01-31 10:28:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22a9a5b612
					 | 
					
						
						
							
							alter parts to kotlin
						
						
						
						
						
						
						
						better error handling on register request 
						
						
							
						
					 | 
					
						2020-01-31 10:01:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02dff914ca
					 | 
					
						
						
							
							alter mqttservice to gradle
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 09:37:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5e42eeb2ae
					 | 
					
						
						
							
							alter language to kotlin
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 09:17:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02e6f96a3a
					 | 
					
						
						
							
							reformat dashboard js code to subfunctions
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-31 08:31:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						e5d579e9d0
					 | 
					
						
						
							
							javadoc
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-30 15:04:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						339ba9861b
					 | 
					
						
						
							
							class javadoc
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-23 19:03:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						10058b24a7
					 | 
					
						
						
							
							javadoc
						
						
						
						
						
						
						
						improved data encapsulation 
						
						
							
						
					 | 
					
						2020-01-23 18:32:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						cdb03ada81
					 | 
					
						
						
							
							jar generation filename fix
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-23 18:15:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						7207f39892
					 | 
					
						
						
							
							Version 0.3.1-Beta
						
						
						
						
						
						
							
 v0.3.1-Beta
						
					 | 
					
						2020-01-23 18:06:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						a9cf947670
					 | 
					
						
						
							
							log improvements
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-23 17:33:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						664ba5e28b
					 | 
					
						
						
							
							multiple replies on device request with more than one city provided
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-23 17:33:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						d34b43f61a
					 | 
					
						
						
							
							enable multiple cities per device
						
						
						
						
						
						
						
						applied db entries on add btn click 
						
						
							
						
					 | 
					
						2020-01-23 17:10:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						c590b612b5
					 | 
					
						
						
							
							some name and warning fixings
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-20 18:20:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						81e79c1e67
					 | 
					
						
						
							
							adding info to db
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-18 11:02:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						7f62fc9bec
					 | 
					
						
						
							
							add button for adding new zone infos to device
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-18 10:17:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						fa16d1206b
					 | 
					
						
						
							
							waste zone/type/city info on device page
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-18 08:42:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						ce44ee5d17
					 | 
					
						
						
							
							version 0.3.0-Beta
						
						
						
						
						
						
							
 v0.3.0-Beta
						
					 | 
					
						2020-01-16 21:24:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						23f75cae4f
					 | 
					
						
						
							
							correctly configure new devices
						
						
						
						
						
						
						
						edit data in db correctly
response correctly to requests 
						
						
							
						
					 | 
					
						2020-01-16 21:12:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						b9ba0dbcef
					 | 
					
						
						
							
							load devices in table
						
						
						
						
						
						
						
						configure popup for devices 
						
						
							
						
					 | 
					
						2020-01-16 17:27:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						92ef4cc0c6
					 | 
					
						
						
							
							* added table to device page
						
						
						
						
						
						
						
						* request devices from js from db 
						
						
							
						
					 | 
					
						2020-01-13 21:00:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						ac02e4bd62
					 | 
					
						
						
							
							* added some todos
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-12 14:05:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						c3fb92d6eb
					 | 
					
						
						
							
							* changed city zone handling to server instead of pcb
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-12 13:22:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						05b15a1ea2
					 | 
					
						
						
							
							* style improvements in mqtt
						
						
						
						
						
						
							
						
					 | 
					
						2020-01-12 11:32:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						86dc38a8da
					 | 
					
						
						
							
							* Waste logo on every page
						
						
						
						
						
						
						
						* username displayed right on every page 
						
						
							
						
					 | 
					
						2020-01-12 11:23:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						7c8a0d3018
					 | 
					
						
						
							
							* mqtt service cleanup
						
						
						
						
						
						
						
						* removed unused methods 
						
						
							
						
					 | 
					
						2020-01-12 11:23:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						4b96ad576d
					 | 
					
						
						
							
							cleanup in mqtt methods
						
						
						
						
						
						
						
						deleted unneccessary classes 
						
						
							
						
					 | 
					
						2020-01-10 18:45:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						f7383474ac
					 | 
					
						
						
							
							* fixed multiple username bug
						
						
						
						
						
						
						
						* added table to devices page 
						
						
							
						
					 | 
					
						2020-01-10 18:18:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						0518c1c809
					 | 
					
						
						
							
							mqtt improvements
						
						
						
						
						
						
						
						new device page 
						
						
							
 v0.2.1-Beta
						
					 | 
					
						2020-01-10 16:38:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gregor_Dutzler
							
						 
					 | 
					
						
						
							
						
						c44a0dd9ec
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 16:30:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gregor_Dutzler
							
						 
					 | 
					
						
						
							
						
						28d5ba0b03
					 | 
					
						
						
							
							readymqtt.3
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 16:29:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ca16400d4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 16:27:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1b3998890
					 | 
					
						
						
							
							favicon
						
						
						
						
						
						
						
						port error 
						
						
							
						
					 | 
					
						2019-12-13 16:26:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gregor_Dutzler
							
						 
					 | 
					
						
						
							
						
						27c2b9ceb4
					 | 
					
						
						
							
							readymqtt.3
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 15:45:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gregor_Dutzler
							
						 
					 | 
					
						
						
							
						
						3a82f81c1a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 15:05:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gregor_Dutzler
							
						 
					 | 
					
						
						
							
						
						1ef61f13ab
					 | 
					
						
						
							
							readymqtt.2
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 15:04:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e26258c3cf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2019-12-13 14:58:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |