Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

.htaccess

@@ -0,0 +1,21 @@
+RewriteEngine On
+# Store the current location in an environment variable CWD to use
+# mod_rewrite in .htaccess files without knowing the RewriteBase
+RewriteCond $0#%{REQUEST_URI} ([^#]*)#(.*)\1$
+RewriteRule ^.*$ - [E=CWD:%2]
+
+# Anything below the following dirs will never be rewritten
+RewriteRule "^pdfviewer/.*$" "-" [L]
+RewriteRule "^views/bootstrap/images.*$" "-" [L]
+RewriteRule "^out/images.*$" "-" [L]
+RewriteRule "^styles/.*$" "-" [L]
+
+# Accessing a file in an extension is always possible
+# Added for old extensions which do not use routes
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteRule "^ext/.*$" "-" [L]
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
+RewriteRule ^.*$ %{ENV:CWD}index.php [QSA,L]

CHANGELOG

@@ -131,6 +131,7 @@
 - added Slim-Framework for a simple router
 - move most of the login code into a controller, added more hooks in login process
 - failed login is reported in log file
+- update of cytoscape library, fix output of workflow on TriggerWorkflowGraph
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.9

views/bootstrap/class.TriggerWorkflow.php

@@ -120,7 +120,7 @@ $(document).ready(function() {
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
-	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
+	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?>&transitions[]=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	</div>
 	</div>
 <?php