[Fmsystem-commits] [17657] Trunk: Merge 17502:17525 from dev-bkbygg

[sigurdne]

Revision: 17657
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17657
Author:   sigurdne
Date:     2018-01-20 08:00:22 -0500 (Sat, 20 Jan 2018)
Log Message:
-----------
Trunk: Merge 17502:17525 from dev-bkbygg

Modified Paths:
--------------
    trunk/phpgwapi/templates/portico/js/jqtree_jsmenu.js

Added Paths:
-----------
    trunk/phpgwapi/doc/htaccess.txt

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk       2018-01-20 12:51:21 UTC (rev 17656)
+++ trunk       2018-01-20 13:00:22 UTC (rev 17657)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
+/branches/dev-bkbygg:17503-17504,17525
 /branches/dev-syncromind:13653,17484-17654
 /branches/dev-syncromind-2:14933-16846
 /branches/stavangerkommune:12743-12875,12986
\ No newline at end of property
Copied: trunk/phpgwapi/doc/htaccess.txt (from rev 17525, 
branches/dev-bkbygg/phpgwapi/doc/htaccess.txt)
===================================================================
--- trunk/phpgwapi/doc/htaccess.txt                             (rev 0)
+++ trunk/phpgwapi/doc/htaccess.txt     2018-01-20 13:00:22 UTC (rev 17657)
@@ -0,0 +1,10 @@
+# Require apache2.conf to set to  AllowOverride All for directory default set 
to AllowOverride None
+# and mod rewrite to be ON
+# sudo a2enmod rewrite
+# Redirect all to /portico/ folder
+DirectoryIndex index.php
+RewriteEngine on
+RewriteRule ^(index\.php)?$ portico/index.php$1 [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.+)$ portico/$1 [L]

Modified: trunk/phpgwapi/templates/portico/js/jqtree_jsmenu.js
===================================================================
--- trunk/phpgwapi/templates/portico/js/jqtree_jsmenu.js        2018-01-20 
12:51:21 UTC (rev 17656)
+++ trunk/phpgwapi/templates/portico/js/jqtree_jsmenu.js        2018-01-20 
13:00:22 UTC (rev 17657)
@@ -6,7 +6,7 @@
                tree.tree({
                        data: treemenu_data,
                        autoEscape: false,
-                       dragAndDrop: true,
+                       dragAndDrop: false,
                        autoOpen: false,
                        saveState: true,
                        useContextMenu: false,