Commit Graph

591 Commits

Author SHA1 Message Date
Tobias Reich
a8d792dcf1 Improved if condition 2014-05-30 16:57:15 +02:00
Tobias Reich
1d7d852ddd Changed error to notice 2014-05-30 16:56:41 +02:00
Tobias Reich
b4226d7bdd Added Log to Session 2014-05-30 16:55:56 +02:00
Tobias Reich
4e52b1e545 Added Log to Settings 2014-05-30 16:55:30 +02:00
Tobias Reich
226296e3a8 Added Log to Database 2014-05-30 16:54:34 +02:00
Tobias Reich
b4ba1fffe9 Merge fix 2014-05-27 10:21:06 +02:00
Tobias Reich
03e2081756 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/js/upload.js
	assets/min/main.js
2014-05-27 10:20:45 +02:00
Tobias Reich
ce2e44a921 Added notifications to Grunt 2014-05-27 10:18:46 +02:00
Tobias Reich
bf7210de2a Fixed a bug where photos were uploaded to the wrong album 2014-05-27 10:17:46 +02:00
Tobias Reich
ba778998dd Fixed a PHP syntax error with arrays (#160) 2014-05-23 15:47:48 +02:00
Tobias Reich
cafd3dd84e Added v2.5 changelog (WIP, #155) 2014-05-21 16:53:31 +02:00
Tobias Reich
c76d781766 Fixed Warning: htmlentities() expects parameter 1 (#159) 2014-05-21 11:39:36 +02:00
Tobias Reich
82d62971de Recompiled js 2014-05-20 17:14:36 +02:00
Tobias Reich
f90bfe0086 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.js
2014-05-20 17:13:45 +02:00
Tobias Reich
404b519747 getExtension() helper 2014-05-20 12:44:08 +02:00
Tobias Reich
69aa61cade Fixed photo download 2014-05-20 12:31:48 +02:00
Tobias Reich
c84572fedf Merge pull request #159 from djdallmann/v2.5
Added plugin to list errors from database
2014-05-20 09:56:14 +02:00
djdallmann
90e1dacfc3 Added plugins to list errors from database 2014-05-19 16:40:33 +00:00
Tobias Reich
8cf7ad5480 Hide password-protected albums 2014-05-17 23:53:55 +02:00
Tobias Reich
1e80564fbe Shorter text for sharing-dialog 2014-05-17 23:53:30 +02:00
Tobias Reich
63061e0d9e Shorter text for sharing-dialog 2014-05-17 23:53:13 +02:00
Tobias Reich
f08e838a38 Disable infobox shortcut in SmartAlbums 2014-05-17 23:30:02 +02:00
Tobias Reich
3707677356 Use hasPermissions() in plugins/check/ 2014-05-17 23:19:48 +02:00
Tobias Reich
647367a62d Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-05-17 23:04:49 +02:00
Tobias Reich
02740d840a Prevent unsupported files from being moved (#151) 2014-05-17 22:59:28 +02:00
Tobias Reich
1cef3c29c4 Merge pull request #156 from djdallmann/v2.5
Added support for filenames with spaces by using escapeshellarg() to eva...
2014-05-17 22:50:00 +02:00
Tobias Reich
830e2362d3 Catch error when calling Import::move 2014-05-17 22:48:06 +02:00
Tobias Reich
7e6fd3ccc7 Improved plugin loading 2014-05-17 16:51:56 +02:00
djdallmann
b2658d7e01 Added support for filenames with spaces by using escapeshellarg() to evaluate and treat string as literal. 2014-05-17 05:41:18 +00:00
Tobias Reich
0a7dce8b09 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-05-16 23:24:28 +02:00
Tobias Reich
9db3d31cc0 Added permission check to upload 2014-05-16 23:24:11 +02:00
Tobias Reich
edca6c088a Added function to check permissions 2014-05-16 23:23:49 +02:00
Tobias Reich
5689278908 Added logging for subfolders 2014-05-16 23:22:41 +02:00
Tobias Reich
0dc54c44e0 Added logging for folder deletion 2014-05-16 23:22:20 +02:00
Tobias Reich
08fe04c241 Added Import:move from Import:server and disabled moveToTemp by default (#151) 2014-05-16 22:47:45 +02:00
Tobias Reich
99f5248032 Visual enhancements for new uploader 2014-05-16 22:11:10 +02:00
Tobias Reich
50ded2697b Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader 2014-05-16 22:00:41 +02:00
Tobias Reich
0167507604 Code adjustments and improvemts for #151 2014-05-13 22:49:23 +02:00
Tobias Reich
83a7aa196c Fixed logging 2014-05-13 22:10:04 +02:00
Tobias Reich
d31f0831d4 Merge pull request #151 from djdallmann/v2.5
Added feature to move files before processing in Import.php for server
2014-05-13 21:55:18 +02:00
Tobias Reich
ce5f8b9d0f Improved handling of long file names and fixed Dropbox and URL import 2014-05-12 22:13:47 +02:00
Tobias Reich
5acc5760da Faster back when album empty 2014-05-12 21:41:32 +02:00
Tobias Reich
47afc5c74b Removed support for old uploader and fixed URL import 2014-05-12 21:40:25 +02:00
Tobias Reich
21d8b22a3a Improved upload on mobile devices 2014-05-12 21:37:51 +02:00
Tobias Reich
808bf4ee1e Basic per file upload 2014-05-12 00:15:01 +02:00
Tobias Reich
1261a2ff35 Version push to v2.5 b2 2014-05-11 20:48:53 +02:00
Tobias Reich
dceb348d42 Store username in lychee_username 2014-05-11 20:11:39 +02:00
djdallmann
b321e2d970 Updated to include better error handling and to use the new error class. 2014-05-10 23:23:33 +00:00
Tobias Reich
326238d46a Fixed TEXT column can't have a default value (#154) 2014-05-10 18:46:48 +02:00
Tobias Reich
b9147d4d62 Merge branch 'v2.5' of https://github.com/electerious/Lychee into v2.5 2014-05-08 20:50:41 +02:00