Skip to content

Commit

Permalink
Merge pull request kimai#728 from kevinpapst/1.0.1
Browse files Browse the repository at this point in the history
Release changes 1.0.1
  • Loading branch information
kevinpapst authored Jul 3, 2016
2 parents 71c0ae7 + 1f9650a commit c1ff8ef
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project name="Kimai" default="help">

<!-- values depending on the Kimai version and your development environment -->
<property name="release.version" value="1.0.0"/>
<property name="release.version" value="1.0.1"/>
<property name="release.directory" location="/tmp/kimai/"/>

<!-- default target just dumps a copyright notice -->
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion error.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forgotPassword.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions includes/vars.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions includes/version.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
$kga['version'] = '1.0.0';
$kga['revision'] = 1387; // database revision number (incremented whenever the database changes)
$kga['status'] = 'dev'; // leave blank if stable
$kga['version'] = '1.0.1';
$kga['revision'] = 1388; // database revision number (incremented whenever the database changes)
$kga['status'] = ''; // leave blank if stable
7 changes: 5 additions & 2 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/>.
*/

/**
* 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.
*/

Expand Down
2 changes: 1 addition & 1 deletion processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c1ff8ef

Please sign in to comment.