# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1481031646 -3600
# Node ID 307365d0991ac5297c85ae0ae19b433574a3d0d9
# Parent  af60b784d2b8c5143d9e96acae48975a1f32bcf3# Parent  feabd88c88e4fa32474da6e3dcbdb5d42f1d6500
merge

diff -r af60b784d2b8 -r 307365d0991a OrthancExplorer/file-upload.js
--- a/OrthancExplorer/file-upload.js	Tue Dec 06 14:40:34 2016 +0100
+++ b/OrthancExplorer/file-upload.js	Tue Dec 06 14:40:46 2016 +0100
@@ -48,6 +48,11 @@
 
 
 $('#upload').live('pageshow', function() {
+  alert('WARNING - This page is currently affected by Orthanc issue #21: ' +
+        '"DICOM files might be missing after uploading with Mozilla Firefox." ' +
+        'Do not use this upload feature for clinical uses, or carefully ' +
+        'check that all instances have been properly received by Orthanc. ' +
+        'Please use the command-line "ImportDicomFiles.py" script to circumvent this issue.');
   $('#fileupload').fileupload('enable');
 });
 
diff -r af60b784d2b8 -r 307365d0991a Resources/Samples/WebApplications/DrawingDicomizer.js
--- a/Resources/Samples/WebApplications/DrawingDicomizer.js	Tue Dec 06 14:40:34 2016 +0100
+++ b/Resources/Samples/WebApplications/DrawingDicomizer.js	Tue Dec 06 14:40:46 2016 +0100
@@ -58,7 +58,7 @@
         toolbox.ServeFile('DrawingDicomizer/orthanc.js', response);
       }
       else if (req.url == '/jquery.js') {
-        toolbox.ServeFile('../../../OrthancExplorer/libs/jquery-1.7.2.min.js', response);
+        toolbox.ServeFile('../../../OrthancExplorer/libs/jquery.min.js', response);
       }
       else if (req.url.startsWith('/orthanc')) {
         toolbox.ForwardGetRequest(orthanc, req.url.substr(8), response);
@@ -96,4 +96,6 @@
   }
 });
 
+
+console.log('The demo is running at http://localhost:' + port + '/');
 server.listen(port);
diff -r af60b784d2b8 -r 307365d0991a TODO
--- a/TODO	Tue Dec 06 14:40:34 2016 +0100
+++ b/TODO	Tue Dec 06 14:40:46 2016 +0100
@@ -82,6 +82,8 @@
 * Converter to/from NIfTI
 * MySQL database plugin
 * Decode JPEG2k with grok: https://github.com/GrokImageCompression/grok
+* Generate dynamic content using Lua:
+  https://groups.google.com/d/msg/orthanc-users/KompazkxRSs/5Rh03mzgDAAJ
 
 
 ===