Tobias Reich c482ebdd74 Merge branch 'master' into uploader ... Conflicts: assets/min/main.js assets/min/view.js		2014-08-07 20:25:33 +02:00
..
Album.php	Removed "Set Password" menu after sharing without password	2014-07-21 22:38:56 +02:00
Database.php	Fixed "No way to back out during database creation #195"	2014-08-07 20:23:39 +02:00
Import.php	Execlute big/ and thumb/ from import	2014-07-26 22:14:22 +02:00
Log.php	Fixed logging	2014-05-13 22:10:04 +02:00
misc.php	Fixed wrong link to thumb when searching	2014-07-19 00:00:15 +02:00
Module.php	Fixed a static warning (#172)	2014-06-25 14:50:49 +02:00
Photo.php	Calculate checksum before adding it to the database	2014-07-20 16:45:30 +02:00
Plugins.php	Improved plugin loading	2014-05-17 16:51:56 +02:00
Session.php	Merge branch 'master' into uploader	2014-08-01 17:01:59 +02:00
Settings.php	Fixed a static warning (#172)	2014-06-25 14:50:49 +02:00