diff --git a/CHANGELOG.md b/CHANGELOG.md index ea276d5..447246f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,15 @@ # Changelog -### __[2.x]__ - unreleased +### __[2.3]__ - 22.12.2017 ##### Added - zuschaltbare POCSAG Multicast-Alarm Funktionalität [#307](https://github.com/Schrolli91/BOSWatch/pull/307) - Flag in Config um nur letzte Net Ident oder gesamte Historie zu speichern [#317](https://github.com/Schrolli91/BOSWatch/pull/317) -##### Changed -##### Deprecated ##### Removed - Beta Branch aus Readme, Installer und Travis-CI entfernt [#324](https://github.com/Schrolli91/BOSWatch/pull/324) ##### Fixed - Bug in httpRequest Plugin (data Field wurde überschrieben) [#337](https://github.com/Schrolli91/BOSWatch/pull/337) - Kommentar für FirEmergency Einstellung angepasst [#338](https://github.com/Schrolli91/BOSWatch/pull/338) -##### Security ### __[v2.2.2]__ - 21.10.2017 diff --git a/README.md b/README.md index e2247f8..c9b570b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +### Arbeiten an BOSWatch 3 gestartet +#### Work on BOSWatch 3 has started +## see: https://boswatch.de/index.php?thread/29-boswatch-3/ + + |Branch|Code Qualität|CI-Build| |---|---|---| |master|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/master.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763821)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=master)](https://travis-ci.org/Schrolli91/BOSWatch)| diff --git a/includes/globalVars.py b/includes/globalVars.py index f5d416a..23f9377 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -10,8 +10,8 @@ Global variables # version info versionNr = "2.3" -branch = "dev" -buildDate = "unreleased" +branch = "master" +buildDate = "22/12/2017" # Global variables