Lukas-Heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						f2219a33a3
					 | 
					
						
						
							
							Merge branch 'master' into configurationpage
						
						
						
						
						
						
					 | 
					
						2020-04-15 16:59:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						cf9069e489
					 | 
					
						
						
							
							add configuration error popups
						
						
						
						
						
						
					 | 
					
						2020-04-15 15:49:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						1a481db4dd
					 | 
					
						
						
							
							reedited sweetalert version changes
						
						
						
						
						
						
					 | 
					
						2020-04-14 16:55:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						54e2cd7856
					 | 
					
						
						
							
							updated bootstrap libs
						
						
						
						
						
						
						
						added sandwich symbol 
						
						
					 | 
					
						2020-04-14 15:24:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						c7999ed6ec
					 | 
					
						
						
							
							updated adminlte libraries and made dashboard tiles moveable again
						
						
						
						
						
						
					 | 
					
						2020-04-14 13:24:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						86660a8d64
					 | 
					
						
						
							
							removed sheduled taskpage for now
						
						
						
						
						
						
						
						removed settings index entry 
						
						
					 | 
					
						2020-03-27 19:55:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						72b13cb335
					 | 
					
						
						
							
							readded main datatables lib
						
						
						
						
						
						
					 | 
					
						2020-03-27 19:27:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						c78e5614d7
					 | 
					
						
						
							
							removed demo dependencies in pages
						
						
						
						
						
						
					 | 
					
						2020-03-27 17:56:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						0498e61616
					 | 
					
						
						
							
							delete unused profile and demo files
						
						
						
						
						
						
					 | 
					
						2020-03-27 17:53:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						8b43afb2c9
					 | 
					
						
						
							
							deleted unused profile page
						
						
						
						
						
						
						
						cleanup shedulepickup devices page and user page 
						
						
					 | 
					
						2020-03-27 17:49:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						ab348417b4
					 | 
					
						
						
							
							removed libs at Admin page
						
						
						
						
						
						
					 | 
					
						2020-03-27 17:41:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						62a43cf695
					 | 
					
						
						
							
							delete unused libs
						
						
						
						
						
						
					 | 
					
						2020-03-27 17:36:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas-Heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						b4d7e2e691
					 | 
					
						
						
							
							Merge pull request #4 from IngProjDutzlerHeiligenbrunnerMeindl/sheduledtaskpage
						
						
						
						
						
						
						
						added new page to shedule tasks 
						
						
					 | 
					
						2020-03-13 13:38:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c018d567a
					 | 
					
						
						
							
							fix this calls of dashboard.js class
						
						
						
						
						
						
						
						and autoreload of tables 
						
						
					 | 
					
						2020-02-28 16:53:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e28cfd4a20
					 | 
					
						
						
							
							added new page to shedule tasks
						
						
						
						
						
						
					 | 
					
						2020-02-28 11:55:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c839c8506c
					 | 
					
						
						
							
							sidebar values improvement
						
						
						
						
						
						
						
						load header data on devicepage 
						
						
					 | 
					
						2020-02-28 11:48:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas-Heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						3a1cff0895
					 | 
					
						
						
							
							Merge pull request #2 from IngProjDutzlerHeiligenbrunnerMeindl/DutziTest
						
						
						
						
						
						
						
						new Text icons 
						
						
					 | 
					
						2020-02-28 09:27:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb5db3dddd
					 | 
					
						
						
							
							ids as Value and not String
						
						
						
						
						
						
					 | 
					
						2020-02-28 09:13:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gdutzler
							
						 
					 | 
					
						
						
							
						
						2c82d5fb43
					 | 
					
						
						
							
							deleted useless files
						
						
						
						
						
						
						
						reformatting 
						
						
					 | 
					
						2020-02-28 08:53:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gdutzler
							
						 
					 | 
					
						
						
							
						
						c5ff6cd2aa
					 | 
					
						
						
							
							eine Zeile
						
						
						
						
						
						
					 | 
					
						2020-02-28 08:43:17 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gdutzler
							
						 
					 | 
					
						
						
							
						
						aaa0600af4
					 | 
					
						
						
							
							Stand 7.2.2020 ICON
						
						
						
						
						
						
					 | 
					
						2020-02-07 16:48:05 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						d34b43f61a
					 | 
					
						
						
							
							enable multiple cities per device
						
						
						
						
						
						
						
						applied db entries on add btn click 
						
						
					 | 
					
						2020-01-23 17:10:22 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						86dc38a8da
					 | 
					
						
						
							
							* Waste logo on every page
						
						
						
						
						
						
						
						* username displayed right on every page 
						
						
					 | 
					
						2020-01-12 11:23:47 +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 
						
						
					 | 
					
						2020-01-10 16:38:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1b3998890
					 | 
					
						
						
							
							favicon
						
						
						
						
						
						
						
						port error 
						
						
					 | 
					
						2019-12-13 16:26:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1e7de952a
					 | 
					
						
						
							
							* total cities label
						
						
						
						
						
						
						
						* color and icon improvements 
						
						
					 | 
					
						2019-12-13 14:57:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f32dbd802b
					 | 
					
						
						
							
							* finished date table
						
						
						
						
						
						
						
						* proper selection when creating new date 
						
						
					 | 
					
						2019-12-13 11:12:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73d6c86fe3
					 | 
					
						
						
							
							* right versioning and buildtime variables
						
						
						
						
						
						
						
						* new INFO object to store buildtime and version 
						
						
					 | 
					
						2019-12-10 16:43:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67694ba6e0
					 | 
					
						
						
							
							* reset Login object
						
						
						
						
						
						
						
						* call /index.html instead of / in pwa manifest 
						
						
					 | 
					
						2019-12-09 14:32:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16270da70f
					 | 
					
						
						
							
							* code format cleanup
						
						
						
						
						
						
						
						* load total collections and future/finished ones 
						
						
					 | 
					
						2019-12-09 14:18:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lukas-heiligenbrunner
							
						 
					 | 
					
						
						
							
						
						34ab59c9a3
					 | 
					
						
						
							
							* created pwa
						
						
						
						
						
						
						
						* fixed jdbc warning
* new gradle run task
* new gradle jar-build task 
						
						
					 | 
					
						2019-12-08 19:20:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7748aa58bd
					 | 
					
						
						
							
							create new Date entry
						
						
						
						
						
						
						
						correct pop ups on create.
added some city delete warnings 
						
						
					 | 
					
						2019-12-06 16:45:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59d18679ea
					 | 
					
						
						
							
							new admin panel
						
						
						
						
						
						
						
						new date creation in dashboard.html 
						
						
					 | 
					
						2019-12-06 12:24:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87bf1d7291
					 | 
					
						
						
							
							changed page title
						
						
						
						
						
						
						
						added user page 
						
						
					 | 
					
						2019-12-05 09:14:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a3801f3ad
					 | 
					
						
						
							
							cleaned project structure
						
						
						
						
						
						
					 | 
					
						2019-12-04 13:09:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |