From 31b180298813b46e0324caa079168f1a656de901 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 3 Jul 2016 10:50:57 +0200 Subject: [PATCH 1/3] bump version --- build.xml | 2 +- composer.json | 2 +- includes/version.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index a1edc45ca..23d9a53dc 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/composer.json b/composer.json index 7719786c1..a4c682ed8 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": ["timetracking", "projectmanagement", "invoicing"], "homepage": "https://github.com/kimai/kimai", "license": "GPL-3.0", - "version": "0.9.3", + "version": "1.0.1", "authors": [ { "name": "Severin Leonhardt", "homepage": "https://github.com/ServiusHack" }, { "name": "Kevin Papst", "homepage": "https://github.com/kevinpapst" } diff --git a/includes/version.php b/includes/version.php index 5fe4b2bdf..61033e3bf 100644 --- a/includes/version.php +++ b/includes/version.php @@ -1,4 +1,4 @@ Date: Sun, 3 Jul 2016 10:51:16 +0200 Subject: [PATCH 2/3] variable documentation --- includes/vars.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/includes/vars.php b/includes/vars.php index 037b5d05d..847e09b78 100644 --- a/includes/vars.php +++ b/includes/vars.php @@ -25,19 +25,19 @@ require dirname(__FILE__) . '/version.php'; -//$kga['show_sensible_data'] = 1; // turn this on to display sensible data in the debug/developer extension - // CAUTION - THINK TWICE IF YOU REALLY WANNA DO THIS AND DON'T FORGET TO TURN IT OFF IN A PRODUCTION ENVIRONMENT!!! - // DON'T BLAME US - YOU HAVE BEEN WARNED! +$kga['show_sensible_data'] = 0; // set to 1 to display sensible data in the debug/developer extension + // CAUTION - DON'T FORGET TO TURN IT OFF IN A PRODUCTION ENVIRONMENT!!! -$kga['logfile_lines'] = 100; // number of lines shown from the logfile in debug extension. Set to "@" to display the entire file (might freeze your browser...) -$kga['delete_logfile'] = 1; // can the logfile be cleaned via debug_ext? +$kga['logfile_lines'] = 100; // number of lines shown from the logfile in debug extension. + // Set to "@" to display the entire file (might freeze your browser...) -$kga['utf8'] = 0; // set to 1 if utf-8 CONVERSION (!) is needed - this is not always the case, - // depends on server settings +$kga['delete_logfile'] = 1; // activate to be able to flush the logfile via debug extension -$kga['calender_start'] = "0"; // here you can set a custom start day for the date-picker. +$kga['utf8'] = 0; // set to 1 to activate UTF-8 CONVERSION + // this is not always needed, depends on server settings + +$kga['calender_start'] = "0"; // set a custom start day for the date-picker (Format: "DD/MM/YYYY") // if this is not set the day of the users first day in the system will be taken - // Format: ... = "DD/MM/YYYY"; // write vars from autoconf.php into kga $kga['server_prefix'] = $server_prefix; From 1f9650a135e05fcaff693948f78381af550ba7dd Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 3 Jul 2016 10:51:44 +0200 Subject: [PATCH 3/3] license header --- error.php | 2 +- forgotPassword.php | 2 +- index.php | 7 +++++-- processor.php | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/error.php b/error.php index c6a293780..5461c822a 100644 --- a/error.php +++ b/error.php @@ -2,7 +2,7 @@ /** * This file is part of * Kimai - Open Source Time Tracking // http://www.kimai.org - * (c) 2006-2009 Kimai-Development-Team + * (c) Kimai-Development-Team since 2006 * * Kimai is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/forgotPassword.php b/forgotPassword.php index 88922d280..ae0af92df 100644 --- a/forgotPassword.php +++ b/forgotPassword.php @@ -2,7 +2,7 @@ /** * This file is part of * Kimai - Open Source Time Tracking // http://www.kimai.org - * (c) 2006-2009 Kimai-Development-Team + * (c) Kimai-Development-Team since 2006 * * Kimai is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/index.php b/index.php index e4fef0988..02869cb26 100644 --- a/index.php +++ b/index.php @@ -2,20 +2,23 @@ /** * This file is part of * Kimai - Open Source Time Tracking // http://www.kimai.org - * (c) 2006-2009 Kimai-Development-Team + * (c) Kimai-Development-Team since 2006 + * * Kimai is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; Version 3, 29 June 2007 + * * Kimai is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License * along with Kimai; If not, see . */ /** - * Show an login window or process the login request. On succes the user + * Show an login window or process the login request. On success the user * will be redirected to core/kimai.php. */ diff --git a/processor.php b/processor.php index 71608fa72..837e19350 100644 --- a/processor.php +++ b/processor.php @@ -2,7 +2,7 @@ /** * This file is part of * Kimai - Open Source Time Tracking // http://www.kimai.org - * (c) 2006-2009 Kimai-Development-Team + * (c) Kimai-Development-Team since 2006 * * Kimai is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by