Merge branch 'release-0.24'

Author: longsleep

.javascript_ignore

@@ -1 +1 @@
-static/js/libs/**.js
+static/js/libs/

.travis.yml

@@ -7,6 +7,7 @@ go:
   - 1.2
   - 1.3
   - 1.4
+  - 1.5
   - tip
 
 env:

Makefile.am

@@ -124,32 +124,32 @@ release: OUTPUT = $(DIST_BIN)
 release: $(DIST_BIN) binary releaseassets
 
 install:
-	@echo "Installing binaries to: $(BIN)"
-	@echo "Installing static resources to: $(SHARE)"
-	$(INSTALL) -d $(BIN)
-	$(INSTALL) -d $(SHARE)/www/html
-	$(INSTALL) -d $(SHARE)/www/html/sandboxes
-	$(INSTALL) -d $(SHARE)/www/static
-	$(INSTALL) -d $(SHARE)/www/static/img
-	$(INSTALL) -d $(SHARE)/www/static/sounds
-	$(INSTALL) -d $(SHARE)/www/static/fonts
-	$(INSTALL) -d $(SHARE)/www/static/translation
-	$(INSTALL) -d $(SHARE)/www/static/css
-	$(INSTALL) -d $(SHARE)/www/static/js/libs/pdf
-	$(INSTALL) -d $(SHARE)/www/static/js/sandboxes
-	$(INSTALL) bin/$(EXENAME) $(BIN)
-	$(INSTALL) html/*.html $(SHARE)/www/html
-	$(INSTALL) html/sandboxes/*.html $(SHARE)/www/html/sandboxes
-	$(INSTALL) static/img/* $(SHARE)/www/static/img
-	$(INSTALL) static/sounds/* $(SHARE)/www/static/sounds
-	$(INSTALL) static/fonts/* $(SHARE)/www/static/fonts
-	$(INSTALL) static/translation/* $(SHARE)/www/static/translation
-	$(INSTALL) static/css/* $(SHARE)/www/static/css
-	$(INSTALL) -D static/js/libs/require/require.js $(SHARE)/www/static/js/libs/require/require.js
-	$(INSTALL) $(OUTPUT_JS)/*.js $(SHARE)/www/static/js
-	$(INSTALL) $(OUTPUT_JS)/libs/pdf/*.js $(SHARE)/www/static/js/libs/pdf
-	$(INSTALL) -D static/js/libs/webodf.js $(SHARE)/www/static/js/libs/webodf.js
-	$(INSTALL) $(OUTPUT_JS)/sandboxes/*.js $(SHARE)/www/static/js/sandboxes
+	@echo "Installing binaries to: $(DESTDIR)$(BIN)"
+	@echo "Installing static resources to: $(DESTDIR)$(SHARE)"
+	$(INSTALL) -d $(DESTDIR)$(BIN)
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/html
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/html/sandboxes
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/img
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/sounds
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/fonts
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/translation
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/css
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/libs/pdf
+	$(INSTALL) -d $(DESTDIR)$(SHARE)/www/static/js/sandboxes
+	$(INSTALL) bin/$(EXENAME) $(DESTDIR)$(BIN)
+	$(INSTALL) html/*.html $(DESTDIR)$(SHARE)/www/html
+	$(INSTALL) html/sandboxes/*.html $(DESTDIR)$(SHARE)/www/html/sandboxes
+	$(INSTALL) static/img/* $(DESTDIR)$(SHARE)/www/static/img
+	$(INSTALL) static/sounds/* $(DESTDIR)$(SHARE)/www/static/sounds
+	$(INSTALL) static/fonts/* $(DESTDIR)$(SHARE)/www/static/fonts
+	$(INSTALL) static/translation/* $(DESTDIR)$(SHARE)/www/static/translation
+	$(INSTALL) static/css/* $(DESTDIR)$(SHARE)/www/static/css
+	$(INSTALL) -D static/js/libs/require/require.js $(DESTDIR)$(SHARE)/www/static/js/libs/require/require.js
+	$(INSTALL) $(OUTPUT_JS)/*.js $(DESTDIR)$(SHARE)/www/static/js
+	$(INSTALL) $(OUTPUT_JS)/libs/pdf/*.js $(DESTDIR)$(SHARE)/www/static/js/libs/pdf
+	$(INSTALL) -D static/js/libs/webodf.js $(DESTDIR)$(SHARE)/www/static/js/libs/webodf.js
+	$(INSTALL) $(OUTPUT_JS)/sandboxes/*.js $(DESTDIR)$(SHARE)/www/static/js/sandboxes
 
 clean:
 	$(GO) clean -i -r app/... 2>/dev/null || true

README.md

@@ -102,6 +102,9 @@ Styles can be found in src/styles. Translations are found in src/i18n.
 Each folder has its own Makefile to build the corresponding files. Check the
 Makefile.am templates for available make targets.
 
+Javascript console logging is automatically _disabled_ and can be enabled by
+adding the query parameter `debug` to your url `https://my_url?debug`.
+
 
 ## Running server for development
 

html/head.html

@@ -4,6 +4,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="referrer" content="no-referrer">
 <base href="<%.Cfg.B%>">
 <%if.Csp%><link rel="stylesheet" type="text/css" href="<%.Cfg.S%>/css/csp.min.css"><%end%>
 <link rel="stylesheet" type="text/css" href="<%.Cfg.S%>/css/bootstrap.min.css">

html/sandboxes/odfcanvas_sandbox.html

@@ -28,6 +28,7 @@
 			user-select:none;
 			-webkit-user-select:none;
 			-moz-user-select:none;
+			background:white;
 		}
 		</style>
 	</head>

html/sandboxes/pdfcanvas_sandbox.html

@@ -22,6 +22,7 @@
 			margin:0 auto;
 			position:relative;
 			display:none;
+			background:white;
 		}
 		</style>
 	</head>

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "autoprefixer": ">= 3.1.0",
+    "autoprefixer": ">= 3.1.0 <= 5.2.1",
     "po2json": ">= 0.4.1",
     "jshint": ">= 2.5.5"
   }

src/hooks/pre-commit.hook

@@ -27,7 +27,6 @@ echo "==========================================================================
     fi
 done
 
-
 for file in `git diff-index --cached --name-only HEAD --diff-filter=ACMR| grep "\.js$"` ; do
     case "$file" in
         */libs/*)
@@ -39,7 +38,7 @@ for file in `git diff-index --cached --name-only HEAD --diff-filter=ACMR| grep "
         *)
             echo "Checking ${file}"
             nf=`git checkout-index --temp ${file} | cut -f 1`
-            jshint --config .jshint "${nf}"
+            PATH="node_modules/.bin:${PATH}" jshint --config .jshint "${nf}"
             r=$?
             rm "${nf}"
             if [ $r != 0 ] ; then

static/js/base.js

@@ -19,6 +19,7 @@
  *
  */
 
+"use strict";
 define([ // Helper module to put non dependency base libraries together.
 	'modernizr',
 	'moment',