Commit Graph

162 Commits

Author SHA1 Message Date
Lukas-Heiligenbrunner
51f6ca8958
Merge branch 'master' into dbschemacheck 2020-04-17 18:32:23 +02:00
Lukas-Heiligenbrunner
f8fd7d1b5e
Merge pull request #13 from IngProjDutzlerHeiligenbrunnerMeindl/dbReconnect
Db reconnect
2020-04-17 18:29:24 +02:00
EmilMeindl
23df933504 finished statement db reconnect 2020-04-17 18:28:10 +02:00
Lukas Heiligenbrunner
3a51b08de8 added some message outputs, edited libs in register html 2020-04-17 18:11:23 +02:00
Lukas Heiligenbrunner
f4fbce7977 improved autocreate of table structure 2020-04-17 18:00:47 +02:00
EmilMeindl
605a2ca33d finished initial db reconnect 2020-04-17 16:52:19 +02:00
Lukas Heiligenbrunner
a633ba42e9 added auto generation of sql structure on db 2020-04-17 16:20:44 +02:00
EmilMeindl
f0e654399a test reconnect logic 2020-04-17 16:10:18 +02:00
Lukas Heiligenbrunner
a98c3eae71 updated sql structure 2020-04-17 15:12:22 +02:00
lukas-heiligenbrunner
3fba0f9933 version 1.1.0
method name convention
2020-04-15 17:03:45 +02:00
Lukas-Heiligenbrunner
d680046768
Merge pull request #6 from IngProjDutzlerHeiligenbrunnerMeindl/configurationpage
Configurationpage
2020-04-15 16:59:23 +02:00
Lukas-Heiligenbrunner
f2219a33a3
Merge branch 'master' into configurationpage 2020-04-15 16:59:11 +02:00
lukas-heiligenbrunner
14eea02dcf correct error handling of no db and mqtt connection. 2020-04-15 16:53:58 +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
f4a00620a3 code cleanup
deleted deadcode
2020-04-03 13:26:44 +02:00
lukas-heiligenbrunner
b3fcd26964 release version 1.0.1 2020-03-27 19:56:09 +01:00
lukas-heiligenbrunner
86660a8d64 removed sheduled taskpage for now
removed settings index entry
2020-03-27 19:55:42 +01:00
Lukas-Heiligenbrunner
dbc7505cc4
Merge pull request #5 from IngProjDutzlerHeiligenbrunnerMeindl/cleanup
Cleanup
2020-03-27 19:29:56 +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
b9058dcdba storage class
added config check in main page
2020-03-27 17:06:48 +01:00
lukas-heiligenbrunner
3818b6d1c7 getter setter
all parameters in storage class
2020-03-27 10:33:14 +01:00
lukas-heiligenbrunner
cded7c7d27 new class representing a storage 2020-03-27 10:06:24 +01:00
lukas-heiligenbrunner
ac3fce2913 new webserver executor to allow multiple instances 2020-03-20 13:36:43 +01:00
05b338ec85 add timezone to mysql init 2020-03-13 15:41:55 +01:00
5605a813d9 Merge branch 'javadoc'
# Conflicts:
#	src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.java
2020-03-13 14:50:47 +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
9f39b4f9c8 added javadoc 2020-03-13 11:04:09 +01:00
5fde74eb15 update gradle version to 1.3.70 2020-03-06 08:39:33 +01:00
4c018d567a fix this calls of dashboard.js class
and autoreload of tables
2020-02-28 16:53:43 +01:00
76f5c36ba1 removed unused initializer
converted Daterequest to kotlin
2020-02-28 16:35:55 +01:00
022ae044ab removed checked calls for JDBC and added connection check in JDBC class itself 2020-02-28 16:06:04 +01:00
aa023aeb95 compile also kotlin plugin into jar 2020-02-28 12:16:29 +01:00
8b1d2bd583 release version 1.0.0 2020-02-28 11:59:16 +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
root
8e4aad4691 removed useless gradle instance 2020-02-28 09:33:03 +01:00
Lukas-Heiligenbrunner
3a1cff0895
Merge pull request #2 from IngProjDutzlerHeiligenbrunnerMeindl/DutziTest
new Text icons
2020-02-28 09:27:39 +01:00
32633221f1 removed useless idea files 2020-02-28 09:24:33 +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
fbc53b97f5 added travis to build 2020-02-14 16:52:24 +01:00