[Fmsystem-commits] [14609] fixes

[Sigurd Nes]

Revision: 14609
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14609
Author:   sigurdne
Date:     2015-12-17 15:20:42 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
fixes

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.js.inc.php

Added Paths:
-----------
    branches/dev-syncromind/mobilefrontend/property/class.notify.inc.php

Added: branches/dev-syncromind/mobilefrontend/property/class.notify.inc.php
===================================================================
--- branches/dev-syncromind/mobilefrontend/property/class.notify.inc.php        
                        (rev 0)
+++ branches/dev-syncromind/mobilefrontend/property/class.notify.inc.php        
2015-12-17 15:20:42 UTC (rev 14609)
@@ -0,0 +1,40 @@
+<?php
+
+       /**
+        * phpGroupWare - property: a part of a Facilities Management System.
+        *
+        * @author Sigurd Nes <address@hidden>
+        * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc. 
http://www.fsf.org/
+        * This file is part of phpGroupWare.
+        *
+        * phpGroupWare 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; either version 2 of the License, or
+        * (at your option) any later version.
+        *
+        * phpGroupWare 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 phpGroupWare; if not, write to the Free Software
+        * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
+        *
+        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
+        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/
+        * @package property
+        * @subpackage project
+        * @version $Id: class.uirequest.inc.php 11843 2014-03-19 10:02:57Z 
sigurdne $
+        */
+
+       phpgw::import_class('property.notify');
+
+       class mobilefrontend_notify extends property_notify
+       {
+               public function __construct()
+               {
+                       parent::__construct();
+                       $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
+               }
+       }

Modified: branches/dev-syncromind/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.js.inc.php       2015-12-17 
13:49:57 UTC (rev 14608)
+++ branches/dev-syncromind/phpgwapi/inc/class.js.inc.php       2015-12-17 
15:20:42 UTC (rev 14609)
@@ -128,6 +128,7 @@
                public function get_script_links()
                {
                        $combine = true;
+                       $combine = false; // Temporary
                        
                        if 
(isset($GLOBALS['phpgw_info']['server']['no_jscombine']) && 
$GLOBALS['phpgw_info']['server']['no_jscombine'])
                        {