[Fmsystem-commits] [14830] Merge 14826:14829 from trunk

fmsystem-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14830] Merge 14826:14829 from trunk

From:	Sigurd Nes
Subject:	[Fmsystem-commits] [14830] Merge 14826:14829 from trunk
Date:	Fri, 11 Mar 2016 11:21:55 +0000
Revision: 14830
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14830
Author:   sigurdne
Date:     2016-03-11 11:21:55 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
Merge 14826:14829 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/setup/tables_update.inc.php
    branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/desktop/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/idots/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/linux-at-work.de/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/simple/head.tpl
    branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.tpl

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829

Modified: branches/Version-2_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/setup/tables_update.inc.php     
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/booking/setup/tables_update.inc.php     
2016-03-11 11:21:55 UTC (rev 14830)
@@ -2926,6 +2926,13 @@
         */
        function booking_upgrade0_2_14()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_building');
+               if(isset($metadata['calendar_text']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.15';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_building ADD COLUMN calendar_text varchar(50)");
                if ($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
@@ -2943,6 +2950,13 @@
         */
        function booking_upgrade0_2_15()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_building');
+               if(isset($metadata['tilsyn_name2']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.16';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_building ADD COLUMN tilsyn_name2 varchar(50)");
@@ -2964,6 +2978,13 @@
         */
        function booking_upgrade0_2_16()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_building');
+               if(isset($metadata['extra_kalendar']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.17';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_building ADD COLUMN  extra_kalendar int NOT NULL DEFAULT 0");
@@ -2984,6 +3005,13 @@
         */
        function booking_upgrade0_2_17()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_application');
+               if(isset($metadata['equipment']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.18';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_application ADD COLUMN equipment text DEFAULT NULL");
@@ -3004,6 +3032,13 @@
         */
        function booking_upgrade0_2_18()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_event');
+               if(isset($metadata['building_id']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.19';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_event ADD COLUMN building_id int DEFAULT NULL");
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE bb_event 
SET building_id = br2.building_id FROM bb_resource br2 WHERE EXISTS (SELECT 1 
FROM bb_event be, bb_event_resource ber, bb_resource br WHERE be.id = 
ber.event_id AND ber.resource_id = br.id AND br2.id = br.id AND 
bb_event.id=be.id )");
@@ -3021,6 +3056,13 @@
         */
        function booking_upgrade0_2_19()
        {
+               $metadata = 
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata('bb_resource');
+               if(isset($metadata['organizations_ids']))
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.20';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
                $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_resource ADD COLUMN organizations_ids varchar(50) DEFAULT NULL");
                if ($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())

Modified: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl   
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.tpl   
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta charset="utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                {metainfo_author}
                {metainfo_description}
                {metainfo_keywords}

Modified: branches/Version-2_0-branch/phpgwapi/templates/desktop/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/desktop/head.tpl     
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/desktop/head.tpl     
2016-03-11 11:21:55 UTC (rev 14830)
@@ -4,6 +4,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8" />
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org"; />
                <meta name="description" content="phpGroupWare" />
                <meta name="keywords" content="phpGroupWare" />

Modified: branches/Version-2_0-branch/phpgwapi/templates/idots/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/idots/head.tpl       
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/idots/head.tpl       
2016-03-11 11:21:55 UTC (rev 14830)
@@ -4,6 +4,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">
                <meta name="keywords" content="phpGroupWare">

Modified: branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.tpl   
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/idsociety/head.tpl   
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="author" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">
                <meta name="keywords" content="phpGroupWare">

Modified: 
branches/Version-2_0-branch/phpgwapi/templates/linux-at-work.de/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/linux-at-work.de/head.tpl    
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/linux-at-work.de/head.tpl    
2016-03-11 11:21:55 UTC (rev 14830)
@@ -4,6 +4,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8" />
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org"; />
                <meta name="description" content="phpGroupWare" />
                <meta name="keywords" content="phpGroupWare" />

Modified: branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl      
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl      
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta charset="utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="author" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">
                <meta name="keywords" content="phpGroupWare">

Modified: branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl     
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.tpl     
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta charset="utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="author" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">
                <meta name="keywords" content="phpGroupWare">

Modified: branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.tpl 
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/probusiness/head.tpl 
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml";>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8" />
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org"; />
                <meta name="description" content="phpGroupWare" />
                <meta name="keywords" content="phpGroupWare" />

Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl        
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl        
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta charset="utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="viewport" content="width=device-width 
initial-scale=1.0 maximum-scale=1.0 user-scalable=yes" />
                <meta name="author" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">

Modified: branches/Version-2_0-branch/phpgwapi/templates/simple/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/simple/head.tpl      
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/simple/head.tpl      
2016-03-11 11:21:55 UTC (rev 14830)
@@ -3,6 +3,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8">
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org";>
                <meta name="description" content="phpGroupWare">
                <meta name="keywords" content="phpGroupWare">

Modified: branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.tpl    
2016-03-11 11:20:36 UTC (rev 14829)
+++ branches/Version-2_0-branch/phpgwapi/templates/verdilak/head.tpl    
2016-03-11 11:21:55 UTC (rev 14830)
@@ -4,6 +4,7 @@
 <html>
        <head>
                <meta http-equiv="Content-Type" content="text/html; 
charset=utf-8" />
+               <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
                <meta name="AUTHOR" content="phpGroupWare 
http://www.phpgroupware.org"; />
                <meta NAME="description" CONTENT="phpGroupWare" />
                <meta NAME="keywords" CONTENT="phpGroupWare" />
[Prev in Thread]
Current Thread
[Next in Thread]
[Fmsystem-commits] [14830] Merge 14826:14829 from trunk, Sigurd Nes <=
Prev by Date: [Fmsystem-commits] [14829] metatag in header
Next by Date: [Fmsystem-commits] [14831] debug missing value
Previous by thread: [Fmsystem-commits] [14829] metatag in header
Next by thread: [Fmsystem-commits] [14831] debug missing value
Index(es):
- Date
- Thread