Merge branch 'master' into dw

.htaccess

@@ -10,6 +10,13 @@ Options -Indexes
 #	php_value upload_max_filesize 20M
 #	php_value max_file_uploads 100
 #</IfModule>
+#<IfModule mod_php7.c>
+#	php_value max_execution_time 200
+#	php_value post_max_size 200M
+#	php_value upload_max_size 200M
+#	php_value upload_max_filesize 20M
+#	php_value max_file_uploads 100
+#</IfModule>
 
 # ---
 # Uncomment these lines when you want to allow access to the Lychee API from different origins

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Tobias Reich (http://electerious.com/)
+Copyright (c) 2017 Tobias Reich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -29,7 +29,7 @@ Lychee is ready to use, right out of the box. If you want to contribute and edit
 
 ### Keyboard Shortcuts
 
-These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts »](docs/Keyboard Shortcuts.md)
+These shortcuts will help you to use Lychee even faster. [Keyboard Shortcuts »](docs/Keyboard%20Shortcuts.md)
 
 ### Dropbox import
 

php/Modules/Album.php

@@ -255,8 +255,6 @@ final class Album {
 		// Execute query
 		$photos = Database::execute(Database::get(), $photos, __METHOD__, __LINE__);
 
-		if ($album===null) return false;
-
 		// Check if album empty
 		if ($photos->num_rows==0) {
 			Log::error(Database::get(), __METHOD__, __LINE__, 'Could not create ZipArchive without images');

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Lychee",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "Self-hosted photo-management done right.",
   "authors": "Tobias Reich <tobias@electerious.com>",
   "license": "MIT",
@@ -14,20 +14,20 @@
     "compile": "gulp"
   },
   "dependencies": {
-    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-es2015": "^6.24.0",
     "basiccontext": "^3.5.1",
-    "basicmodal": "^3.3.7",
+    "basicmodal": "^3.3.8",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "3.1.1",
     "gulp-babel": "^6.1.2",
-    "gulp-concat": "^2.6.0",
-    "gulp-inject": "^4.1.0",
-    "gulp-load-plugins": "^1.3.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-inject": "^4.2.0",
+    "gulp-load-plugins": "^1.5.0",
     "gulp-minify-css": "^1.2.4",
-    "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^2.3.2",
-    "gulp-uglify": "^2.0.0",
-    "jquery": "^3.1.1",
+    "gulp-rimraf": "^0.2.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-uglify": "^2.1.1",
+    "jquery": "^3.2.0",
     "mousetrap": "^1.6.0"
   }
 }

src/scripts/lychee.js

@@ -5,8 +5,8 @@
 lychee = {
 
 	title           : document.title,
-	version         : '3.1.5',
-	versionCode     : '030105',
+	version         : '3.1.6',
+	versionCode     : '030106',
 
 	updatePath      : '//update.electerious.com/index.json',
 	updateURL       : 'https://github.com/electerious/Lychee',