Commit Graph

84 Commits

Author SHA1 Message Date
Tobias Reich
7ba384e70a Updated to minor version 2016-08-22 14:08:03 +02:00
Tobias Reich
5bbac75481 Merge branch 'develop' into feature/subalbums 2016-08-22 14:01:10 +02:00
Quentin Ligier
eff2b34c7d Coding style 2016-08-20 12:36:27 +02:00
Quentin Ligier
e5a88c918f Rotate and flip the image with GD 2016-08-20 12:34:31 +02:00
Nils Asmussen
b91759e6c1 Added a move album operation.
Since albums can have subalbums now, it makes sense to not only merge
albums, but also move them.
2016-08-03 23:04:47 +02:00
Nils Asmussen
9b5328d888 Don't validate merge request on server.
Since we don't show the user invalid merge requests to send to the
server, the user would have to handcraft such requests. Only admins can
merge albums, which we trust anyway. So, let's remove this check.
2016-08-03 22:58:17 +02:00
Tobias Reich
0c7d95fb15 Syntax adjustments 2016-07-31 15:53:34 +02:00
Tobias Reich
1020b0d1dc Merge branch 'subalbums' of https://github.com/hrniels/Lychee into feature/subalbums 2016-07-31 15:26:34 +02:00
Nils Asmussen
daf7d37c84 Prevent album merge errors on client-side.
Previously, we allowed that and reported an error in this case. Now,
the user can no longer select a parent album for merging it into a
subalbum. It is still checked on the server, though.
2016-07-30 12:04:07 +02:00
Nils Asmussen
6feae99bf1 Include subalbums in setPublic.
That means, when making an album public or private, all subalbums
are made public/private as well. This can be changed afterwards
by performing the opposite operation for a subalbum.

I think this is the better default, since most people probably
won't have public albums with private subalbums.
2016-07-29 22:36:41 +02:00
Nils Asmussen
1b6c74bcb6 Merge albums including subalbums. 2016-07-29 22:36:41 +02:00
Nils Asmussen
eddb666b5a Delete albums including subalbums. 2016-07-29 22:36:41 +02:00
Nils Asmussen
212b241d0e Include subalbums in album archives. 2016-07-29 22:36:41 +02:00
Nils Asmussen
ef9040870a Added basic subalbum support.
That is, albums can now contain other albums, which are shown at
the top of the album view. This required some changes to album.js
and the contextMenu.js, because this view contains now both
photos and albums.

The contextMenu on this view has been kept simple by requiring
the user to select either only albums or only photos, but not
a mixture of both.

This feature required a database change, so that the version
has been updated to 3.1.3.

At the moment, album and photo operations (make public, download,
delete, merge) are still "flat", i.e. don't respect the album
hierarchy.
2016-07-29 22:36:41 +02:00
Tobias Reich
1b8dd24fe1 Prefetch the medium photo instead of the big one #446 2016-07-02 14:53:25 +02:00
Tobias Reich
1adc2dec00 Fixed GD thumb quality using wrong variable 2016-06-12 17:06:25 +02:00
Tobias Reich
9bfa149d29 EXIF orientation rotation code adjustments #556 2016-06-11 15:55:05 +02:00
Tobias Reich
55628f1f56 Remove metadata from medium-photos and thumbs + Reduce quality of medium-photos #556 2016-06-11 15:54:41 +02:00
Tobias Reich
57acac71da Renamed thumb quality variable 2016-06-11 15:53:13 +02:00
Tobias Reich
c6cb750363 Removed comment that somehow destroyed the whole syntax highlighting in Atom 2016-06-05 15:53:00 +02:00
Tobias Reich
a9cfa87fd2 Improved orientation-handling with Imagick #556 2016-06-05 15:47:41 +02:00
Tobias Reich
895825ada0 Added #533 to the list of update scripts 2016-05-02 19:51:21 +02:00
Tobias Reich
d94960d996 Made connect_error a private function #530 2016-04-24 16:24:48 +02:00
Felix Eckhofer
aa0209afef Fix error 500 on database connect error
If `$connection===false` it obviously has no properties.
2016-04-24 16:19:09 +02:00
Quentin Ligier
84985f73a3 Fix for bad EXIF data read errors 2016-04-18 10:49:31 +02:00
Tobias Reich
9e59062384 Syntax adjustments #518 2016-04-18 09:40:52 +02:00
Tobias Reich
b9a7bd1056 Merge pull request #518 from qligier/pr-exif2
Better EXIF extraction
2016-04-18 09:32:31 +02:00
Quentin Ligier
8b25259ed4 Correction of Focal data extraction 2016-04-17 22:32:57 +02:00
Quentin Ligier
7841cad8f2 Small corrections
IPTC data are in the first element of array.
GPS coordinate helper added to required files.
2016-04-17 22:23:05 +02:00
Quentin Ligier
ea7bfa606e Small corrections in EXIF 2016-04-17 22:11:08 +02:00
Quentin Ligier
e2509b1657 Import GPS coordinates from EXIF 2016-04-17 21:59:50 +02:00
Quentin Ligier
20e22d2777 Correction of photo tag formatting 2016-04-17 21:45:51 +02:00
Quentin Ligier
9d8f9356f2 Import photo tags 2016-04-17 21:36:58 +02:00
Quentin Ligier
69fc864471 Correction of comment 2016-04-17 21:09:20 +02:00
Quentin Ligier
00ca1e02d3 Modification of EXIF extraction 2016-04-17 21:06:25 +02:00
Tobias Reich
502f01ae6c Suppress error messages of failed database connects and config save attempts 2016-03-24 22:09:21 +01:00
Tobias Reich
bff454ffc9 Removed unnecessary empty string 2016-03-24 21:51:34 +01:00
Tobias Reich
7a54476ff1 Always respond with JSON 2016-03-24 21:41:41 +01:00
Tobias Reich
152a887bc4 Updated comments due to id type changes #487 2016-03-24 18:41:33 +01:00
Tobias Reich
d212363ebf Return photo ID when upload successful #487 2016-03-24 18:40:58 +01:00
Tobias Reich
c6d8b5f312 Fixed long albums/photos ids for 32bit PHP versions #487 2016-03-24 18:23:19 +01:00
Tobias Reich
082d306927 Small adjustments to #491 2016-03-19 16:16:41 +01:00
Tobias Reich
44a7d3046c Merge pull request #491 from qligier/pr-log-login
Log connection attempts
2016-03-19 16:06:38 +01:00
Quentin Ligier
399619c6e8 Corrections of Import::url 2016-03-19 10:21:29 +01:00
Quentin Ligier
44c54c48f6 Modifications arround getExtension 2016-03-17 19:21:59 +01:00
Tobias Reich
ea3921b5d9 Code adjustment #488 2016-03-17 09:35:12 +01:00
Tobias Reich
144c9b7274 Merge pull request #488 from qligier/pr-extension
Rewrite of getExtension
2016-03-17 09:17:37 +01:00
Quentin Ligier
2be1fd2131 Add login logs 2016-03-16 20:20:21 +01:00
Quentin Ligier
e93564c3e0 Rewrite of getExtension 2016-03-16 17:07:22 +01:00
Bocquet Aldric
dffce28eb4 Fixed a bug preventing photos form being rotated 2016-03-16 15:22:18 +01:00