Commit Graph

108 Commits

Author SHA1 Message Date
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
b1e7de952a * total cities label
* color and icon improvements
2019-12-13 14:57:59 +01:00
Gregor_Dutzler
89426cfcee readymqtt 2019-12-13 13:55:32 +01:00
Gregor_Dutzler
e4f9d88cda asdf 2019-12-13 11:36:26 +01:00
ab1ce79900 * optimized Sout calls to Logs 2019-12-13 11:25:41 +01:00
f32dbd802b * finished date table
* proper selection when creating new date
2019-12-13 11:12:21 +01:00
23bffc4c6e * save start time
* memory utilisation
2019-12-12 12:39:28 +01:00
97214d786e * generate build time property in gradle file 2019-12-11 13:17:55 +01:00
73d6c86fe3 * right versioning and buildtime variables
* new INFO object to store buildtime and version
2019-12-10 16:43:42 +01:00
0f33a475a4 * improved page reqest handling 2019-12-09 15:10:27 +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
f132ca9602 Merge remote-tracking branch 'origin/master' 2019-12-06 12:24:58 +01:00
59d18679ea new admin panel
new date creation in dashboard.html
2019-12-06 12:24:44 +01:00
Gregor_Dutzler
1689a6f6c1 6.12.2019 2019-12-06 10:41:36 +01:00
Gregor_Dutzler
ad62228a29 6.12.2019 2019-12-06 09:24:45 +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
lukas-heiligenbrunner
96e000fccf * updated Log class to set Log level 2019-12-03 21:57:13 +01:00
4563b8d407 updated artifacts and readme 2019-12-03 09:02:30 +01:00
dcff0cdb25 updated project to maven project. 2019-12-02 08:37:30 +01:00
lukas-heiligenbrunner
c9e3414b29 * JDBC class is singleton and login to db only on startup
* db error alert on login
2019-12-01 10:58:43 +01:00
07a4035195 * add city animation
* delete city button
* reload table data
2019-11-29 16:55:57 +01:00
e292df8bb8 insert data in table of cities 2019-11-15 13:30:44 +01:00
36caaa214b improved ui, added panel to add new city and zone
parts of displaying cities fromdb
2019-11-15 11:23:51 +01:00
Gregor_Dutzler
cfddff4d8d 1051 2019-11-15 10:51:50 +01:00
lukas-heiligenbrunner
954eb8d61c added 404 page and redirect if logged out 2019-11-11 18:51:16 +01:00
6afaad0d33 new ui with AdminLTE 2019-11-11 14:28:21 +01:00
Lukas-Heiligenbrunner
98e14b92ab
improved logging in windows 2019-11-11 13:07:56 +01:00
Gregor_Dutzler
797d29281b 8.11.2019 MQTT finished 2019-11-08 15:07:29 +01:00
Gregor_Dutzler
a4563def38 8.11.2019 MQTT finished 2019-11-08 14:13:32 +01:00
6a3edc2269 new ticket page update 2019-11-08 10:42:22 +01:00
Gregor_Dutzler
d9088aba7a mqttfertig 2019-10-25 15:58:19 +02:00
Gregor_Dutzler
44aa9a8afd mqttfertig 2019-10-25 09:36:51 +02:00
08fd25124c replaced souts with log.debug 2019-10-11 16:16:28 +02:00
Gregor_Dutzler
660207485a mqttfertig 2019-10-11 16:14:05 +02:00
Gregor_Dutzler
8810b1dcae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/.gitignore
#	src/com/wasteinformationserver/main.java
2019-10-11 15:06:00 +02:00
Gregor_Dutzler
bd89db2c29 hi 2019-10-11 15:02:55 +02:00
dfd3cff5a2 moved website folder 2019-10-11 11:17:06 +02:00
Gregor_Dutzler
26fa5aacbb hi 2019-10-11 10:48:04 +02:00
Gregor_Dutzler
fb2b191a73 hi 2019-10-11 09:03:14 +02:00
Gregor_Dutzler
6b8cb9cc10 hfhgf 2019-10-04 16:52:14 +02:00
54aa35563b settings page window 2019-10-03 09:40:13 +02:00
4e4ecb5dc6 changed folder structure 2019-10-03 08:42:09 +02:00
889cdef86b created log class 2019-10-02 21:42:04 +02:00
4d7792c469 new startup message 2019-10-02 19:16:58 +02:00
6c3e4cece2 remember login state, and check if user is logged in on page 2019-09-27 16:37:59 +02:00
06c24185d2 * register logic 2019-09-27 12:25:41 +02:00
b78f31670f * login process
* register page
* post query
* get query
2019-09-27 10:58:13 +02:00
a495798aee login page 2019-09-20 16:46:13 +02:00
079726fee6 added website updates 2019-09-20 15:02:17 +02:00
gdutler
74fb1b504c added date getting 2019-09-13 16:48:53 +02:00
326d1decae added jquery and js to project 2019-09-13 15:57:33 +02:00
3b69bc3cc9 created http server and new thread 2019-09-13 15:41:40 +02:00