From fea211f32a59668eac7dd2071abc05d01894243c Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:37:31 +0200 Subject: [PATCH 1/3] edit for release --- CHANGELOG.md | 8 -------- includes/globalVars.py | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf8fdf2..6346714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,5 @@ # Changelog -### __[2.3]__ - unreleased -##### Added -##### Changed -##### Deprecated -##### Removed -##### Fixed -##### Security - ### __[v2.2.2]__ - 21.10.2017 ##### Added diff --git a/includes/globalVars.py b/includes/globalVars.py index be4305d..a6dcd60 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -10,8 +10,8 @@ Global variables # version info versionNr = "2.2.2" -branch = "dev" -buildDate = "unreleased" +branch = "master" +buildDate = "21.10.2017" # Global variables From eb10fdce4312df4b22de33e1e3eea2b6d79f1a53 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Fri, 15 Dec 2017 23:23:54 +0100 Subject: [PATCH 2/3] insert BW3 forum info --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index eb8e805..fa97e5e 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)| From decd4461d7ba93065c465bdb954b3b50ef60906e Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 21 Dec 2017 09:20:31 +0100 Subject: [PATCH 3/3] prepare new Version 2.3 --- CHANGELOG.md | 2 +- includes/globalVars.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea276d5..9a28116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # 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) 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