Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader

Conflicts:
	assets/js/upload.js
	assets/min/main.js

assets/js/upload.js

@@ -138,7 +138,7 @@ upload = {
 				}
 
 			if (files.length<=0) return false;
-			if (albumID===false) albumID = 0;
+			if (albumID===false||visible.albums()===true) albumID = 0;
 
 			for (var i = 0; i < files.length; i++) {
 

build/package.json

@@ -10,12 +10,13 @@
   },
   "devDependencies": {
     "grunt": "~0.4.2",
-    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-coffee": "~0.10.1",
+    "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-cssmin": "~0.9.0",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.0",
+    "grunt-notify": "^0.3.0",
     "load-grunt-tasks": "~0.4.0"
   }
 }

docs/Changelog.md

@@ -1,3 +1,24 @@
+## v2.5
+
+Released -
+
+- `New` Swipe gestures on mobile devices
+- `New` Plugin-System
+- `New` Rewritten Back-End
+- `New` Support for ImageMagick (thanks @bb-Ricardo)
+- `New` Logging-System
+- `New` Blowfish hash instead of MD5 for all new passwords (thanks @bb-Ricardo)
+- `New` Compile Lychee using Grunt (with npm and bower)
+- `Improved` Shortcuts
+- `Improved` Album share dialog
+- `Improved` Database update mechanism
+- `Improved` Download photos with correct title (thanks @bb-Ricardo)
+- `Improved` EXIF parsing
+- `Improved` URL and Server import (thanks @djdallmann)
+- `Improved` Check permissions on upload
+- `Fixed` Wrong capture date in InfoBox
+- `Fixed` Sorting by takedate
+
 ## v2.1.1
 
 Released March 20, 2014

php/modules/Photo.php

@@ -14,17 +14,17 @@ class Photo extends Module {
 	private $settings	= null;
 	private $photoIDs	= null;
 
-	private $allowedTypes = [
+	private $allowedTypes = array(
 		IMAGETYPE_JPEG,
 		IMAGETYPE_GIF,
 		IMAGETYPE_PNG
-	];
+	);
-	private $validExtensions = [
+	private $validExtensions = array(
 		'.jpg',
 		'.jpeg',
 		'.png',
 		'.gif'
-	];
+	);
 
 	public function __construct($database, $plugins, $settings, $photoIDs) {
 

plugins/displaylog/index.php

@@ -28,25 +28,25 @@ $result = '';
 # Database
 $database = new mysqli($dbHost, $dbUser, $dbPassword, $dbName);
 
-if (mysqli_connect_errno()!=0) { 
+if (mysqli_connect_errno()!=0) {
 	echo 'Error 100: ' . mysqli_connect_errno() . ': ' . mysqli_connect_error() . '' . PHP_EOL;
 	exit();
 }
 
 # Result
-$result = $database->query('SELECT FROM_UNIXTIME(time), type, function, line, text FROM lychee_log;'); 
+$result = $database->query('SELECT FROM_UNIXTIME(time), type, function, line, text FROM lychee_log;');
 
 # Output
-if ($result === FALSE) { 
+if ($result === FALSE) {
 	echo('Everything looks fine, Lychee has not reported any problems!' . PHP_EOL . PHP_EOL);
 } else {
 	while ( $row = $result->fetch_row() ) {
 
 		# Encode result before printing
-		htmlentities($row);
+		$row = array_map("htmlentities", $row);
 
 		# Format: time TZ - type - function(line) - text
-		printf ("%s %s - %s - %s (%s) \t- %s\n", $row[0], date_default_timezone_get(), $row[1], $row[2], $row[3], $row[4]); 	
+		printf ("%s %s - %s - %s (%s) \t- %s\n", $row[0], date_default_timezone_get(), $row[1], $row[2], $row[3], $row[4]);
 	}
 
 }