Commit graph

42 commits

Author SHA1 Message Date
Bastian Schroll cc81c30848
Merge branch 'master' into new_version 2017-12-21 09:22:28 +01:00
Bastian Schroll decd4461d7 prepare new Version 2.3 2017-12-21 09:20:31 +01:00
Bastian Schroll 4f0caae300
Merge pull request #337 from Schrolli91/fix_http_req
fix http request plugin bug
2017-12-20 06:59:57 +01:00
Bastian Schroll 4811477656
Merge pull request #307 from f-kessler/dev-express-alarm
multicastAlarm added as function
2017-12-19 11:50:11 +01:00
Bastian Schroll 02d7ba2055
Merge branch 'develop' into fix_http_req 2017-12-19 11:40:01 +01:00
Bastian Schroll 2b90ebef8a edit CL 2017-12-19 11:38:47 +01:00
Bastian Schroll 1771c2ec6f edit CL 2017-12-19 08:36:58 +01:00
Bastian Schroll e9b7cf17ba
Merge branch 'develop' into dev-express-alarm 2017-12-18 13:22:08 +01:00
Bastian Schroll 9c0c5e9358 Merge branch 'develop' into dev_netHistory 2017-10-21 23:08:54 +02:00
Bastian Schroll 3b2275094d Merge branch 'develop' into dev-express-alarm 2017-10-21 23:08:10 +02:00
Bastian Schroll 9d06e38de9 edit CL 2017-10-21 22:57:52 +02:00
Bastian Schroll fb82b1868d edit CL 2017-10-21 22:57:10 +02:00
Bastian Schroll 50a2c70408 edit CL 2017-10-21 22:55:46 +02:00
Bastian Schroll 66d2b4a79a Merge branch 'develop' into remove_beta 2017-10-21 22:42:47 +02:00
Bastian Schroll fea211f32a edit for release 2017-10-21 22:37:31 +02:00
Bastian Schroll c15de920ac edit CL 2017-10-21 22:34:37 +02:00
Bastian Schroll 5ec51d56cf edit CL for release 2017-10-21 22:33:08 +02:00
Bastian Schroll 9cad78f71c edit CL 2017-10-21 22:23:19 +02:00
Bastian Schroll 2626a0418f edit CL 2017-10-21 22:20:34 +02:00
Bastian Schroll 886dcf63d0 edit CL 2017-10-21 22:14:06 +02:00
Bastian Schroll 7fa4a97ba4 edit CL 2017-10-03 20:23:48 +02:00
Bastian Schroll 03cd002cfe Merge branch 'develop' into dev-express-alarm 2017-10-03 19:18:37 +02:00
Bastian Schroll 0f13853cc8 edit CL 2017-10-03 18:28:27 +02:00
Bastian Schroll cfcc12b445 Merge pull request #316 from Schrolli91/flothi-patch-1
Adaptations for "new" service
2017-10-03 18:10:09 +02:00
Bastian Schroll e503130a03 edit CL 2017-10-03 16:03:27 +02:00
Bastian Schroll fa90ba10cc Merge branch 'develop' into dev-express-alarm 2017-10-03 15:08:57 +02:00
Bastian Schroll eacb72adea edit CL 2017-10-03 08:50:11 +02:00
Bastian Schroll acbef6591c edits for codacy (#310) 2017-10-02 07:25:22 +02:00
Bastian Schroll fed717a22d Merge branch 'develop' into dev-express-alarm 2017-10-01 17:34:24 +02:00
Bastian Schroll 47bdff4b28 edit CL 2017-09-30 18:27:11 +02:00
Bastian Schroll b2df53430d edit CL 2017-09-30 16:07:32 +02:00
Bastian Schroll 3aa0b382e9 edit changelog with link 2017-09-29 13:33:21 +02:00
Bastian Schroll 45f4887163 edit changelog with links 2017-09-29 13:26:06 +02:00
Bastian Schroll d45ff3b197 Merge branch 'develop' into dev-express-alarm 2017-09-24 12:13:26 +02:00
Bastian Schroll 736d0f95ce Update CHANGELOG.md 2017-09-24 12:11:50 +02:00
Bastian Schroll 2f3817c64f Update CHANGELOG.md 2017-09-21 13:16:42 +02:00
Bastian Schroll f73e6f215b edit changelog 2017-09-19 22:04:41 +02:00
Bastian Schroll c698a9eb15 edit CL 2017-09-19 18:16:41 +02:00
Bastian Schroll afa224a9aa edit changelog 2017-09-19 18:11:37 +02:00
Bastian Schroll e5391a2b75 edit vers nr 2017-09-19 18:05:26 +02:00
Bastian Schroll 53aa810df8 new release 2.2.1 2017-09-19 17:56:44 +02:00
Bastian Schroll ac5db0dc98 prepare for changelog 2017-09-18 20:46:43 +02:00