Tobias Reich
|
88ef1e49b7
|
Merge branch 'master' into release/v3.0.0
# Conflicts:
# dist/main.css
# dist/main.js
# dist/view.js
# src/package.json
# src/scripts/lychee.js
|
2015-04-17 22:55:46 +02:00 |
|
Tobias Reich
|
2167b04d34
|
Block import of invalid photo types and extensions
|
2015-04-13 21:09:28 +02:00 |
|
Tobias Reich
|
083e0962e2
|
Merge branch 'master' into v3.0.0
|
2015-02-25 20:55:10 +01:00 |
|
Michael Procter
|
6d25151c78
|
Add comment as to why conventional plugin triggers not used.
|
2015-02-24 22:15:58 +00:00 |
|
Michael Procter
|
6bb1859faf
|
Remove 'unlink' - potentially confusing.
|
2015-02-24 22:13:45 +00:00 |
|
Michael Procter
|
e17cfe79a3
|
Remove imported photos as promised by warning screen
|
2015-02-21 08:53:32 +00:00 |
|
Michael Procter
|
b34374fcdb
|
Add plugin trigger for before and after server import
|
2015-02-21 08:52:33 +00:00 |
|
Tobias Reich
|
0630554789
|
Updated copyright
|
2015-02-01 22:08:37 +01:00 |
|
Tobias Reich
|
2024ccaf39
|
Disallow import of the medium-folder
|
2015-01-23 21:52:19 +01:00 |
|
Tobias Reich
|
6b5e30c443
|
Removed unused code
|
2015-01-23 21:41:32 +01:00 |
|
Tobias Reich
|
1acb3c2cc6
|
Comment cleanup
|
2014-10-21 13:45:11 +02:00 |
|
Tobias Reich
|
554e7cba6b
|
Execlute big/ and thumb/ from import
|
2014-07-26 22:14:22 +02:00 |
|
Tobias Reich
|
6c142f8570
|
Check if given import-path is a dir
|
2014-07-23 21:45:18 +02:00 |
|
Tobias Reich
|
864b317e4c
|
Changed message of warning
|
2014-07-23 21:23:33 +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 |
|
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
|
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
|
0167507604
|
Code adjustments and improvemts for #151
|
2014-05-13 22:49:23 +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
|
5d7328613d
|
Continue url-import even when an error occurs
|
2014-04-26 21:02:50 +02:00 |
|
Tobias Reich
|
d0368ea651
|
Use exif_imagetype in Import
|
2014-04-26 19:40:34 +02:00 |
|
Tobias Reich
|
d382b62f57
|
Define dirs and files global (#122)
|
2014-04-13 14:08:18 +02:00 |
|
Tobias Reich
|
eccdcf5ead
|
Fixed Import (some links are still nit working)
|
2014-04-12 16:51:05 +02:00 |
|