bump version to 19.1

addressbook/setup/setup.inc.php

@@ -4,13 +4,12 @@
  *
  * @package addressbook
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
  */
 
 /* Basic information about this app */
 $setup_info['addressbook']['name']      = 'addressbook';
 $setup_info['addressbook']['title']     = 'Addressbook';
-$setup_info['addressbook']['version']   = '17.1';
+$setup_info['addressbook']['version']   = '19.1';
 $setup_info['addressbook']['app_order'] = 4;
 $setup_info['addressbook']['enable']    = 1;
 $setup_info['addressbook']['index']    = 'addressbook.addressbook_ui.index&ajax=true';
@@ -52,7 +51,7 @@ $setup_info['addressbook']['hooks']['groupdav_root_props'] = 'addressbook_groupd
 /* Dependencies for this app to work */
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );
 
 // installation checks for addresbook

admin/setup/setup.inc.php

@@ -9,7 +9,7 @@
  */
 
 $setup_info['admin']['name']      = 'admin';
-$setup_info['admin']['version']   = '18.1.001';
+$setup_info['admin']['version']   = '19.1';
 $setup_info['admin']['app_order'] = 1;
 $setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
@@ -40,5 +40,5 @@ $setup_info['admin']['hooks']['addressbook_edit'] = 'admin.admin_account.address
 // Dependencies for this app to work
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );

admin/setup/tables_update.inc.php

@@ -269,3 +269,12 @@ function admin_upgrade18_1()
 	return $GLOBALS['setup_info']['admin']['currentver'] = '18.1.001';
 }
 
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function admin_upgrade18_1_001()
+{
+	return $GLOBALS['setup_info']['admin']['currentver'] = '19.1';
+}

api/setup/setup.inc.php

@@ -11,10 +11,10 @@
 /* Basic information about this app */
 $setup_info['api']['name']      = 'api';
 $setup_info['api']['title']     = 'EGroupware API';
-$setup_info['api']['version']   = '17.9.002';
+$setup_info['api']['version']   = '19.1';
 $setup_info['api']['versions']['current_header'] = '1.29';
 // maintenance release in sync with changelog in doc/rpm-build/debian.changes
-$setup_info['api']['versions']['maintenance_release'] = '17.1.20190529';
+$setup_info['api']['versions']['maintenance_release'] = '19.1.20190716';
 $setup_info['api']['enable']    = 3;
 $setup_info['api']['app_order'] = 1;
 $setup_info['api']['license'] = 'GPL';
@@ -118,7 +118,7 @@ $setup_info['api']['check_install'] = array(
 
 // CalDAV / CardDAV Sync
 $setup_info['groupdav']['name']      = 'groupdav';
-$setup_info['groupdav']['version']   = '17.1';
+$setup_info['groupdav']['version']   = '19.1';
 $setup_info['groupdav']['enable']    = 2;
 $setup_info['groupdav']['app_order'] = 1;
 $setup_info['groupdav']['icon']      = 'groupdav';

api/setup/tables_update.inc.php

@@ -612,3 +612,12 @@ function api_upgrade17_9_001()
 	return $GLOBALS['setup_info']['api']['currentver'] = '17.9.002';
 }
 
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function api_upgrade17_9_002()
+{
+	return $GLOBALS['setup_info']['api']['currentver'] = '19.1';
+}

calendar/setup/setup.inc.php

@@ -6,11 +6,10 @@
  * @package calendar
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '17.1.003';
+$setup_info['calendar']['version'] = '19.1';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index&ajax=true';
@@ -51,6 +50,6 @@ $setup_info['calendar']['hooks']['notifications_actions'] = 'calendar_hooks::not
 /* Dependencies for this app to work */
 $setup_info['calendar']['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => Array('19.1')
 );
 

calendar/setup/tables_update.inc.php

@@ -2745,6 +2745,7 @@ function calendar_upgrade16_1_002()
 		{
 			return $old_value ? $old_value.',month' : 'month';
 		}
+		unset($attr);
 	};
 	Api\Preferences::change_preference('calendar', 'use_time_grid', $change);
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '16.1.003';
@@ -2760,6 +2761,7 @@ function calendar_upgrade17_1()
 	// Update birthdays as events preference from boolean
 	$change = function($attr, $old_value, $owner) {
 		if (!isset($old_value)) return null;	// do not set anything, if nothing was set before
+		unset($attr, $owner);
 		return $old_value ? 'birthday' : 'none';
 	};
 	Api\Preferences::change_preference('calendar', 'birthdays_as_events', $change);
@@ -2790,3 +2792,12 @@ function calendar_upgrade17_1_002()
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '17.1.003';
 }
 
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function calendar_upgrade17_1_003()
+{
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '19.1';
+}

doc/rpm-build/checkout-build-archives.php

@@ -17,15 +17,15 @@ date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
 
 $verbose = 0;
 $config = array(
-	'packagename' => 'egroupware-epl',
+	'packagename' => 'egroupware',
-	'version' => '17.1',        // '17.1'
+	'version' => '19.1',        // '19.1'
 	'packaging' => date('Ymd'), // '20160520'
 	'branch'  => 'master',        // checked out branch
 	'tag' => '$version.$packaging',	// name of tag
-	'checkoutdir' => realpath(__DIR__.'/../..'),
+	'checkoutdir' => '~/epl-19.1-checkout',	//realpath(__DIR__.'/../..'),
-	'egw_buildroot' => '/tmp/build_root/epl_17.1_buildroot',
+	'egw_buildroot' => '/tmp/build_root/epl_19.1_buildroot',
-	'sourcedir' => '/home/download/stylite-epl/egroupware-epl-17.1',
+	'sourcedir' => '~/download/archives/egroupware-epl-19.1',
-	/* svn-config currently not used, as we use .mrconfig to define modules and urls
+	/* svn-config no longer used
 	'svntag' => 'tags/$version.$packaging',
 	'svnbase' => 'svn+ssh://svn@dev.egroupware.org/egroupware',
 	'stylitebase' => 'svn+ssh://stylite@svn.stylite.de/stylite',
@@ -33,13 +33,14 @@ $config = array(
 	'svnalias' => 'aliases/default-ssh',    // default alias
 	'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro', '$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'),
 	*/
-	'extra' => array('functions' => array('stylite'), 'esyncpro', 'archive',	// create an extra archive for given apps
+	'extra' => array('functions' => array('stylite'), 'esyncpro', 'policy', 'archive',	// create an extra archive for given apps
 		// these apps are placed in egroupware-epl-contrib archive
-		'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sambaadmin', 'sitemgr', 'phpfreechat')),
+		//'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sitemgr')
+	),
 	'aliasdir' => 'egroupware',             // directory created by the alias
 	'types' => array('tar.bz2','tar.gz','zip','all.tar.bz2'),
 	// add given extra-apps or (uncompressed!) archives to above all.tar.bz2 archive
-	'all-add' => array('contrib', '/home/stylite/epl-trunk/phpfreechat_data_public.tar'),
+	'all-add' => array('contrib'),
 	// diverse binaries we need
 	'svn' => trim(`which svn`),
 	'tar' => trim(`which tar`),
@@ -56,7 +57,7 @@ $config = array(
 	'composer' => trim(`which composer.phar`),
 	'after-checkout' => 'rm -rf */source */templates/*/source',
 	'packager' => 'build@egroupware.org',
-	'obs' => '/home/stylite/obs/stylite-epl-trunk',
+	'obs' => '~/build.opensuse.org/server:eGroupWare:trunk/egroupware-docker',
 	'obs_package_alias' => '',	// name used in obs package, if different from packagename
 	'changelog' => false,   // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
 	'changelog_packager' => 'Ralf Becker <rb@egroupware.org>',
@@ -64,7 +65,7 @@ $config = array(
 	//'sfuser' => 'ralfbecker',
 	//'release' => '$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/eGroupware-$version/eGroupware-$version.$packaging/',
 	// what gets uploaded with upload
-	'upload' => '$sourcedir/*egroupware-epl{,-contrib}-$version.$packaging*',
+	'upload' => '$sourcedir/*egroupware-$version.$packaging*',
 	'copychangelog' => '$sourcedir/README', //'$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README',
 	'skip' => array(),
 	'run' => array('checkout','editchangelog','tag','copy','virusscan','create','sign','obs','copychangelog'),
@@ -167,6 +168,11 @@ if ($verbose > 1)
 {
 	echo "Using following config:\n".json_encode($config, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)."\n\n";
 }
+// translate everything, so we dont have in each and every place
+foreach(array_keys($config) as $name)
+{
+	$config[$name] = config_translate($name);
+}
 $svn = $config['svn'];
 
 $run = array_diff($config['run'],$config['skip']);
@@ -227,7 +233,7 @@ function get_changelog_from_git($_path, $log_pattern=null, &$last_tag=null, $pre
 }
 
 /**
- * Get module path (starting with $config['aliasdir']) per repo from .mrconfig for svn and git
+ * Get module path (starting with $config['aliasdir']) per repo
  *
  * @return array with $repro_url => $path => $url, eg. array(
  *		"git@github.com:EGroupware/egroupware.git" => array(
@@ -241,21 +247,22 @@ function get_modules_per_repo()
 {
 	global $config, $verbose;
 
-	if ($verbose) echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	if ($verbose) echo "Get modules from checkoutdir $config[checkoutdir]\n";
 
-	if (!is_dir($config['checkoutdir']))
+	$checkoutdir = config_translate('checkoutdir');
+	if (!is_dir($checkoutdir))
 	{
-		throw new Exception("checkout directory '{$config['checkoutdir']} does NOT exists or is NO directory!");
+		throw new Exception("checkout directory '$checkoutdir does NOT exists or is NO directory!");
 	}
 	$modules = array();
 	foreach(scandir($config['checkoutdir']) as $module)
 	{
-		if ($module === '..' || !file_exists($config['checkoutdir'].'/'.$module.'/.git'))
+		if ($module === '..' || !file_exists($checkoutdir.'/'.$module.'/.git'))
 		{
 			continue;
 		}
 		$output = $matches = null;
-		run_cmd($cmd='cd '.$config['checkoutdir'].'/'.$module.'; '.$config['git'].' remote -v', $output);
+		run_cmd($cmd='cd '.$checkoutdir.'/'.$module.'; '.$config['git'].' remote -v', $output);
 		if (!preg_match('/^origin\s+(.*)\s+\(push\)$/m', implode("\n", $output), $matches))
 		{
 			throw new Exception("Could not parse output of ".implode("\n", $output));
@@ -423,6 +430,8 @@ function do_release()
 		'name' => $tag,
 		'target_commitish' => $config['branch'],
 		'body' => $config['changelog'],
+		'draft' => false,
+		'prerelease' => true,	// create as prerelease first, as we need it for testing
 	);
 	$response = github_api("/repos/EGroupware/egroupware/releases", $data);
 	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']);	// remove {?name,label} template
@@ -562,9 +571,9 @@ function config_translate($name, $value=null)
 	global $config;
 
 	if (!isset($value)) $value = $config[$name];
-	if (is_string($value) && strpos($value, '$') !== false)
+	if (is_string($value) && (strpos($value, '$') !== false || substr($value, 0, 2) === '~/'))
 	{
-		$translate = array();
+		$translate = ['~/' => getenv('HOME').'/'];
 		foreach($config as $n => $val)
 		{
 			if (is_string($val)) $translate['$'.$n] = $val;
@@ -1107,7 +1116,7 @@ function do_virusscan()
 /**
  * Copy non .svn/.git parts to egw_buildroot and fix permissions and ownership
  *
- * We need to stash local modifications (currently only in egroupware main module) to revert eg. .mrconfig modifications
+ * We need to stash local modifications (currently only in egroupware main module) to revert modifications
  */
 function do_copy()
 {
@@ -1121,11 +1130,11 @@ function do_copy()
 		run_cmd("mkdir -p $config[egw_buildroot]");
 	}
 
-	// we need to stash uncommited changes like .mrconfig, before copying
+	// we need to stash uncommited changes, before copying
 	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("cd $config[checkoutdir]; git stash");
 
 	try {
-		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude .mrconfig --exclude node_modules/ --exclude tests '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
+		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude node_modules/ --exclude tests '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
 		run_cmd($cmd);
 	}
 	catch (Exception $e) {

filemanager/setup/setup.inc.php

@@ -9,7 +9,7 @@
 
 $setup_info['filemanager']['name']    = 'filemanager';
 $setup_info['filemanager']['title']   = 'Filemanager';
-$setup_info['filemanager']['version'] = '17.1';
+$setup_info['filemanager']['version'] = '19.1';
 $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
 $setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index&ajax=true';
@@ -32,5 +32,5 @@ $setup_info['filemanager']['hooks']['search_link'] = 'filemanager_hooks::search_
 /* Dependencies for this app to work */
 $setup_info['filemanager']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => array('17.1')
+	'versions' => array('19.1')
 );

home/setup/setup.inc.php

@@ -10,7 +10,7 @@
 /* Basic information about this app */
 $setup_info['home']['name']      = 'home';
 $setup_info['home']['title']     = 'Home';
-$setup_info['home']['version']   = '17.1';
+$setup_info['home']['version']   = '19.1';
 $setup_info['home']['app_order'] = 1;
 $setup_info['home']['enable']    = 1;
 $setup_info['home']['index']    = 'home.home_ui.index&ajax=true';
@@ -26,5 +26,5 @@ $setup_info['home']['maintainer'] = array(
 /* Dependencies for this app to work */
 $setup_info['home']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );

home/setup/tables_update.inc.php

@@ -114,3 +114,13 @@ function home_upgrade16_1()
 {
 	return $GLOBALS['setup_info']['home']['currentver'] = '17.1';
 }
+
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function home_upgrade17_1()
+{
+	return $GLOBALS['setup_info']['home']['currentver'] = '19.1';
+}

importexport/setup/setup.inc.php

@@ -9,7 +9,7 @@
  */
 
 $setup_info['importexport']['name']      = 'importexport';
-$setup_info['importexport']['version']   = '17.1';
+$setup_info['importexport']['version']   = '19.1';
 $setup_info['importexport']['app_order'] = 2;
 $setup_info['importexport']['enable']    = 2;
 $setup_info['importexport']['tables']    = array('egw_importexport_definitions');
@@ -38,7 +38,7 @@ $setup_info['importexport']['hooks']['config_after_save'] = 'importexport_admin_
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => Array('19.1')
 );
 
 // installation checks for importexport

importexport/setup/tables_update.inc.php

@@ -135,3 +135,13 @@ function importexport_upgrade16_1()
 {
 	return $GLOBALS['setup_info']['importexport']['currentver'] = '17.1';
 }
+
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function importexport_upgrade17_1()
+{
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '19.1';
+}

infolog/setup/setup.inc.php

@@ -6,12 +6,12 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package infolog
  * @subpackage setup
- * @copyright (c) 2003-17 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
 $setup_info['infolog']['name']      = 'infolog';
-$setup_info['infolog']['version']   = '17.1.001';
+$setup_info['infolog']['version']   = '19.1';
 $setup_info['infolog']['app_order'] = 5;
 $setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra','egw_infolog_users');
 $setup_info['infolog']['enable']    = 1;
@@ -62,6 +62,6 @@ $setup_info['infolog']['hooks']['change_account_ids'] = 'infolog_customfields::c
 // Dependencies for this app to work
 $setup_info['infolog']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );
 

infolog/setup/tables_update.inc.php

@@ -6,9 +6,8 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package infolog
  * @subpackage setup
- * @copyright (c) 2003-17 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2003-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- * @version $Id$
  */
 
 use EGroupware\Api;
@@ -485,7 +484,7 @@ function infolog_upgrade1_2_001()
 	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_datecompleted=info_datemodified,info_percent=100 WHERE info_status IN ('done','billed','100%')",__LINE__,__FILE__);
 
 	// remove the percentages from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = new Api\Config('infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['task']))
 	{
@@ -504,7 +503,7 @@ function infolog_upgrade1_2_002()
 	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'",__LINE__,__FILE__);
 
 	// remove the call and will-call from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = new Api\Config('infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['phone']))
 	{
@@ -1100,3 +1099,12 @@ function infolog_upgrade17_1()
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '17.1.001';
 }
 
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function infolog_upgrade17_1_001()
+{
+	return $GLOBALS['setup_info']['infolog']['currentver'] = '19.1';
+}

mail/setup/setup.inc.php

@@ -6,13 +6,13 @@
  * @package mail
  * @subpackage setup
  * @author EGroupware GmbH [info@egroupware.org]
- * @copyright (c) 2013-17 by EGroupware GmbH <info-AT-egroupware.org>
+ * @copyright (c) 2013-19 by EGroupware GmbH <info-AT-egroupware.org>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
 $setup_info['mail']['name']      	= 'mail';
 $setup_info['mail']['title']     	= 'mail';
-$setup_info['mail']['version']     	= '17.1';
+$setup_info['mail']['version']     	= '19.1';
 $setup_info['mail']['app_order'] 	= 2;
 $setup_info['mail']['enable']    	= 1;
 $setup_info['mail']['index']    	= 'mail.mail_ui.index&ajax=true';
@@ -41,7 +41,7 @@ $setup_info['mail']['hooks']['status-get_actions'] = 'mail_hooks::get_status_act
 /* Dependencies for this app to work */
 $setup_info['mail']['depends'][] = array(
 	'appname'  => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );
 // installation checks for mail
 $setup_info['mail']['check_install'] = array(

notifications/setup/setup.inc.php

@@ -14,7 +14,7 @@ if (!defined('NOTIFICATION_APP'))
 }
 
 $setup_info[NOTIFICATION_APP]['name']      = NOTIFICATION_APP;
-$setup_info[NOTIFICATION_APP]['version']   = '17.1.002';
+$setup_info[NOTIFICATION_APP]['version']   = '19.1';
 $setup_info[NOTIFICATION_APP]['app_order'] = 1;
 $setup_info[NOTIFICATION_APP]['tables']    = array('egw_notificationpopup');
 $setup_info[NOTIFICATION_APP]['enable']    = 2;
@@ -37,5 +37,5 @@ $setup_info[NOTIFICATION_APP]['hooks']['deleteaccount'] = 'notifications.notific
 /* Dependencies for this app to work */
 $setup_info[NOTIFICATION_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => Array('19.1')
 );

notifications/setup/tables_update.inc.php

@@ -162,3 +162,13 @@ function notifications_upgrade17_1_001()
 	));
 	return $GLOBALS['setup_info']['notifications']['currentver'] = '17.1.002';
 }
+
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function notifications_upgrade17_1_002()
+{
+	return $GLOBALS['setup_info']['notifications']['currentver'] = '19.1';
+}

pixelegg/setup/setup.inc.php

@@ -10,7 +10,7 @@
 
 $GLOBALS['egw_info']['template']['pixelegg']['name']      = 'pixelegg';
 $GLOBALS['egw_info']['template']['pixelegg']['title']     = 'Standard ';
-$GLOBALS['egw_info']['template']['pixelegg']['version']   = '17.1';
+$GLOBALS['egw_info']['template']['pixelegg']['version']   = '19.1';
 
 $GLOBALS['egw_info']['template']['pixelegg']['author'] = array(
    array('name' => 'EGroupware GmbH', 'url' => 'http://www.egroupware.org/'),
@@ -21,7 +21,7 @@ $GLOBALS['egw_info']['template']['pixelegg']['icon'] = "pixelegg/images/logo.png
 $GLOBALS['egw_info']['template']['pixelegg']['maintainer'] = array(
    array('name' => 'EGroupware GmbH', 'url' => 'http://www.egroupware.org/')
 );
-$GLOBALS['egw_info']['template']['pixelegg']['description'] = "Standard template set of EGroupware 14.1+.";
+$GLOBALS['egw_info']['template']['pixelegg']['description'] = "Standard template set of EGroupware.";
 $GLOBALS['egw_info']['template']['pixelegg']['windowed'] = true;
 
 // specify (different) labels for default themes
@@ -34,5 +34,5 @@ $GLOBALS['egw_info']['template']['pixelegg']['themes'] = array(
 // Dependencies for this template to work
 $GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );

preferences/setup/setup.inc.php

@@ -10,7 +10,7 @@
 
 $setup_info['preferences']['name']      = 'preferences';
 $setup_info['preferences']['title']     = 'Preferences';
-$setup_info['preferences']['version']   = '17.1';
+$setup_info['preferences']['version']   = '19.1';
 $setup_info['preferences']['app_order'] = 1;
 $setup_info['preferences']['tables']    = '';
 $setup_info['preferences']['enable']    = 2;
@@ -33,5 +33,5 @@ $setup_info['preferences']['hooks']['deny_cats']     = 'preferences_hooks::deny_
 /* Dependencies for this app to work */
 $setup_info['preferences']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('17.1')
+	'versions' => Array('19.1')
 );

resources/setup/setup.inc.php

@@ -12,7 +12,7 @@
 
 $setup_info['resources']['name']	= 'resources';
 $setup_info['resources']['title']	= 'Resources';
-$setup_info['resources']['version']	= '17.1';
+$setup_info['resources']['version']	= '19.1';
 $setup_info['resources']['app_order']	= 5;
 $setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
@@ -37,5 +37,5 @@ $setup_info['resources']['hooks']['settings'] = 'resources_hooks::settings';
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => Array('19.1')
 );

resources/setup/tables_update.inc.php

@@ -395,3 +395,13 @@ function resources_upgrade16_1()
 {
 	return $GLOBALS['setup_info']['resources']['currentver'] = '17.1';
 }
+
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function resources_upgrade17_1()
+{
+	return $GLOBALS['setup_info']['resources']['currentver'] = '19.1';
+}

timesheet/setup/setup.inc.php

@@ -6,7 +6,7 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
  * @subpackage setup
- * @copyright (c) 2005-17 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
@@ -16,7 +16,7 @@ if (!defined('TIMESHEET_APP'))
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
-$setup_info[TIMESHEET_APP]['version']   = '17.1.001';
+$setup_info[TIMESHEET_APP]['version']   = '19.1';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
 $setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
@@ -49,5 +49,5 @@ $setup_info[TIMESHEET_APP]['hooks']['acl_rights'] = 'timesheet_hooks::acl_rights
 /* Dependencies for this app to work */
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('17.1')
+	 'versions' => Array('19.1')
 );

timesheet/setup/tables_update.inc.php

@@ -170,3 +170,13 @@ function timesheet_upgrade17_1()
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '17.1.001';
 }
+
+/**
+ * Bump version to 19.1
+ *
+ * @return string
+ */
+function timesheet_upgrade17_1_001()
+{
+	return $GLOBALS['setup_info']['timesheet']['currentver'] = '19.1';
+}