Commit Graph

104 Commits

Author SHA1 Message Date
f192cc7b52 Merge branch 'v1.2.9' into 'master'
[1.2.9] The PüMa Release

See merge request monica/lora-map/lora-map!2
2019-08-30 15:53:51 +02:00
10f9e32678 Prepare for next release 2019-08-30 15:34:16 +02:00
1f3d864249 #15 suche nach ständen einbauen 2019-08-30 15:04:51 +02:00
1d0d64d314 #16 filter nach kategorien/tracker einbauen 2019-08-29 21:12:08 +02:00
de28446c0d bf 2019-08-28 13:11:05 +02:00
968f6f411b Tiny Weather fixes 2019-08-28 12:51:16 +02:00
3fda36ecbc #16 Start of Frontend 2019-08-25 19:15:46 +02:00
98bd2cafe9 #16 Implement Backend for Settings 2019-08-25 14:19:48 +02:00
26bbf9c6c5 Start of #16 2019-08-23 14:09:52 +02:00
28bf1c585b #27 Draw Camera-Desity bock on map 2019-08-22 13:45:11 +02:00
438584f4b9 Begin of #27, Implement Settings 2019-08-21 19:12:26 +02:00
e388eb6626 #28 Fightdedection Plygon on Map 2019-08-21 13:19:02 +02:00
84162714fe #28 Settings now editable 2019-08-20 20:03:53 +02:00
680b4b5d82 Start working on #28 2019-08-20 15:24:34 +02:00
9f9c8e63ef #24 Add information about weather/warning 2019-08-20 13:08:56 +02:00
c4a23751c1 #24 Implement Backendstuff 2019-08-19 19:57:42 +02:00
f65b81b369 Add Correct Dispose Handling 2019-08-02 19:04:51 +02:00
36a6b86a5b Start of WeatherWarnings 2019-08-01 17:29:16 +02:00
b1832da477 #19 grid automatisch generieren 2019-07-30 21:17:56 +02:00
a2b3f2c5da Add setting model to code
#19 grid automatisch generieren
2019-07-30 15:34:45 +02:00
d0a4430d0e add settings.json 2019-07-29 14:42:42 +02:00
82d51c5dc1 Refactoring Adminpannel 2019-07-26 11:48:30 +02:00
123411eca6 Refactoring Js finished
Make only one request per second instead of four per AJAX
2019-07-25 11:14:04 +02:00
22c37456e9 Move querys together 2019-07-17 15:55:01 +02:00
f4efe2ab66 Refactoring of all JS finished. 2019-07-17 14:23:06 +02:00
b214aaecee Javascript Refactoring... 2019-07-16 15:42:49 +02:00
3542b87156 Merge branch 'v1.2.8' into 'master'
[1.2.8] Improving the UI

See merge request monica/lora-map/lora-map!1
2019-07-10 14:26:27 +02:00
4f628a5a01 [1.2.8] Improving the UI 2019-07-10 14:14:09 +02:00
137edb6011 #18 history an panikbutton pressed
also add some errorhandling with locks
fixing js minors
2019-07-09 20:41:51 +02:00
18f80904b3 #18 history an panikbutton pressed
c# Part
2019-07-09 15:34:54 +02:00
a1b669cd68 #25 Icons flickering when using ssl 2019-07-09 11:14:32 +02:00
51689abb64 #12 Make icon transparent if there is no data update 2019-07-03 15:53:19 +02:00
7924214b66 Changes to new Mqtt topic for camera density 2019-07-03 14:06:38 +02:00
fbefdd156f Move CoordinateSharp to own Library 2019-06-28 14:07:12 +02:00
c4dbea12b3 #14 show description on map in tooltip on area 2019-06-27 11:22:52 +02:00
7be6245ed3 #13 fixing issue with port when using proxy 2019-06-27 11:07:05 +02:00
1d74703504 Move the Dockerreadmepart also upwards
Start Version 1.2.8
2019-06-24 18:17:23 +02:00
8f412d1b94 [1.2.7] Reorganise a lot of things, add Support for Cameradata 2019-06-24 18:07:53 +02:00
6a871ba280 Move Dockerfile and docker-compose.yml into Project repository 2019-06-24 18:07:13 +02:00
de889459bb Display Crowd-Density Data on Map 2019-06-14 13:02:04 +02:00
a9dd168238 Add support for crowddensity data 2019-06-13 15:21:27 +02:00
9b98bd8660 Rename Adminmodel.cs to AdminModel.cs, cause it sould be Uppercase! 2019-06-11 18:22:46 +02:00
Jannis Warnat
6d28eb4b37 Merge branch 'master' of https://gitlab.fit.fraunhofer.de/monica/lora-map/lora-map 2019-06-11 09:53:36 +02:00
Jannis Warnat
ba5dc9e8f3 added maps and json folders - these may need to be persisted 2019-06-11 09:53:06 +02:00
56de95003e Update README.md 2019-06-10 23:10:55 +02:00
Jannis Warnat
131773d5cb clarifications 2019-06-07 17:52:39 +02:00
Jannis Warnat
c5e7b9e103 added Dockerfile and docker-compose.yml
Build:

docker-compose build

Run (Provide ./Lora-Map/config/requests.conf and ./Lora-Map/config/settings.conf):

docker-compose up -d
2019-06-07 17:37:12 +02:00
9f7e6b4b24 Add support to display camera values that counts people. needs to be on a mqtt toipc camera/counting 2019-06-07 15:06:55 +02:00
3a3b3618bd Add CHANGELOG, CONTRIBUTING.md, LICENSE and README.md 2019-05-30 13:32:19 +02:00
0bc3f6c1e7 [1.2.6] New Types of marker for person 2019-04-29 23:08:46 +02:00