Merge branch 'develop'

Conflicts:
	keybindings.js
	src/eXide.js

build.properties

@@ -1 +1 @@
-project.version=2.0.6
+project.version=2.1.0

build.xml

@@ -56,6 +56,7 @@
             <sources dir="${basedir}/src">
                 <file name="ace-modes.js"/>
                 <file name="util.js"/>
+                <file name="history.js"/>
                 <file name="popup.js"/>
                 <file name="events.js"/>
                 <file name="commands.js"/>
@@ -82,7 +83,8 @@
                 <file name="quickfix.js"/>
                 <file name="snippets.js"/>
                 <file name="snippet-helper.js"/>
-		<file name="layout.js"/>
+                <file name="layout.js"/>
+                <file name="dnd.js"/>
             </sources>
         </jscomp>
         <jscomp compilationLevel="simple" debug="false" output="${scripts}/jquery/jquery.plugins.min.js">
@@ -91,7 +93,7 @@
                 <!--file name="jquery.layout-1.3.0.rc30.79.js"/-->
                 <file name="jquery.fileupload.js"/>
                 <file name="jquery.fileupload-ui.js"/>
-		<file name="jquery.fileupload-process.js"/>
+                <file name="jquery.fileupload-process.js"/>
                 <file name="slick.core.js"/>
                 <file name="slick.rowselectionmodel.js"/>
                 <file name="slick.grid.js"/>
@@ -169,4 +171,4 @@
             <arg line="-T ${build}/${xar} -u admin:${server.pass} ${server.url}/${xar}"/>
         </exec>
     </target>
-</project>
+</project>

controller.xql

@@ -119,6 +119,16 @@ else if (starts-with($exist:path, "/store/")) then
             </forward>
         </dispatch>
 
+else if (starts-with($exist:path, "/check/")) then
+    let $resource := substring-after($exist:path, "/validate")
+    return
+        <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
+            <forward url="{$exist:controller}/modules/validate-xml.xql">
+                <add-parameter name="validate" value="no"/>
+                {$login("org.exist.login", (), false())}
+            </forward>
+        </dispatch>
+
 else if ($exist:resource = "index.html") then
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
         <view>

docs/doc.html

@@ -11,6 +11,51 @@ <h1>Introducing<br/>eXide 2.0</h1>
             </div>
         </div>
     </div>
+    <section id="news">
+        <h1>New in 2.0.8</h1>
+        <div class="feature">
+            <div class="row-fluid">
+                <div class="span3 thumb">
+                    <h2>Live Reload</h2>
+                    <p>Instant previews</p>
+                </div>
+                <div class="span9">
+                    <p>When developing an XQuery application, enable <em>Live Reload</em> and the browser
+                    tab or window containing the application's web page will automatically reload whenever
+                    you save a resource belonging to the app's package.</p>
+                    <p>Just start the app via the <code>Application/Run app</code> menu entry and check
+                        <em>activate live reload</em>.
+                    </p>
+                    <p>Note: due to browser security restrictions, live reload will only work if the app window has been
+                    opened from within eXide, not via the dashboard. A web page cannot control other windows unless it
+                    created them.</p>
+                </div>
+            </div>
+        </div>
+        <div class="feature">
+            <div class="row-fluid">
+                <div class="span3 thumb">
+                    <h2>Drop Files</h2>
+                    <p>Drag and drop files into the editor</p>
+                </div>
+                <div class="span9">
+                    <p>Drag a file on the editor to open its contents in a new tab.</p>
+                </div>
+            </div>
+        </div>
+        <div class="feature">
+            <div class="row-fluid">
+                <div class="span3 thumb">
+                    <h2>Directory Uploads</h2>
+                    <p>Preserves directory structure</p>
+                </div>
+                <div class="span9">
+                    <p>A long requested feature is now available - at least if you are on Chrome: you can now upload
+                    entire directories and preserve their structure. Even better: drag and drop of directories works as well.</p>
+                </div>
+            </div>
+        </div>
+    </section>
     <section id="features">
         <h1>XQuery Editor Features</h1>
         <div class="feature">

expath-pkg.xml.tmpl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/eXide" abbrev="eXide" version="@project.version@" spec="1.0">
     <title>eXide - XQuery IDE</title>
-    <dependency package="http://exist-db.org/apps/shared" semver-min="0.3.9"/>
+    <dependency package="http://exist-db.org/apps/shared" semver-min="0.4.0"/>
 </package>