Merge branch 'master' into github-extension

app/app/routes/application.js

@@ -20,11 +20,13 @@ const {
 export default Ember.Route.extend(ApplicationRouteMixin, {
 	appMeta: service(),
 	session: service(),
+
 	beforeModel() {
 		return this.get('appMeta').boot().then(data => {
-			if (data.allowAnonymousAccess) {
+			if (this.get('session.session.authenticator') !== "authenticator:documize" && data.allowAnonymousAccess) {
 				return this.get('session').authenticate('authenticator:anonymous', data);
 			}
+
 			return;
 		});
 	},

documize/database/scripts/autobuild/db_00000.sql

@@ -276,7 +276,5 @@ CREATE TABLE IF NOT EXISTS  `userconfig` (
 	`key` CHAR(225) NOT NULL,
 	`config` JSON,
 	UNIQUE INDEX `idx_userconfig_orguserkey` (`orgid`, `userid`, `key` ASC) )
-	DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-
--- TODO insert userid into pagemeta table
--- ALTER TABLE `pagemeta` ADD `userid` CHAR(16) NOT NULL COLLATE utf8_bin AFTER `orgid`;
+DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
+ENGINE = InnoDB;

jsconfig.json

@@ -0,0 +1,7 @@
+{
+	"compilerOptions": {
+		"target": "es6",
+		"experimentalDecorators": true
+	},
+	"exclude": ["node_modules", "bower_components", "tmp", "vendor", ".git", "dist"]
+}