Commit Graph

64 Commits

Author SHA1 Message Date
Nils Asmussen
95c99948d7 Allow guests to download multiple items, too.
For this, the album/photo contextmenus and multiselect is now
enabled for guests, but limited to the download items.
Additionally, Photo::getPublic has been extended to support
multiple photos and also optimized to use just one DB query.
2016-11-13 13:54:15 +01:00
Nils Asmussen
47ed1775c9 Support downloading of multiple photos.
This commit adds a contextmenu entry to download a single and multiple
photos via selection. So far, not for guests.
2016-11-13 13:54:15 +01:00
Nils Asmussen
9088c1ed2c Renamed Photo::getArchive to Photo::getPhoto. 2016-11-13 13:54:15 +01:00
Nils Asmussen
7fd74462e2 Allow to download multiple albums.
This commit adds a download item to the album and albumMulti
contextMenu functions. Since the Archive class is already general
enough, we can easily support to download multiple albums. This
is especially nice, because we can now select individual albums.
2016-11-13 13:54:15 +01:00
Tobias Reich
f460569bdc Merge branch 'develop' into feature/subalbums
# Conflicts:
#	src/package.json
#	src/scripts/lychee.js
2016-10-25 18:32:14 +02:00
Tobias Reich
623325691f Nobody needs a copyright in each file… 2016-10-25 18:11:27 +02:00
Nils Asmussen
3f7f2ffcd1 Disallow to select a mixture of albums and photos.
This commit uses a different approach than before. Now we prevent the
selection and display an error to the user to explain him whats going
on. Thus, we do no longer need to check in contextMenu whether a mixture
of photos and albums has been selected.

This fixes the open bug in #603.
2016-08-28 16:51:39 +02:00
Tobias Reich
993738af49 Merge branch 'multiselect' of https://github.com/hrniels/Lychee into hrniels-multiselect 2016-08-22 14:10:18 +02:00
Nils Asmussen
3040ab1d62 Improved display of root album in move operation.
Root is now shown as the parent of all albums with parent=0.
2016-08-13 16:50:05 +02:00
Nils Asmussen
20c194f00c Always show merge&move operations in context menu.
Previously, we calculated whether there are at least two albums so that
we can actually perform the operation. Due to subalbums this simple
check is not sufficient anymore. Since the rules are more complicated
and we don't have all albums loaded at that point to calculate it
properly, this commit removes the check entirely and always displays
the operations.

The only disadvantage is that if an installation really has just one
album (should rarely happen), the user still sees the merge operation
(not merge all), which results in an album-list with one disabled album.
I think this is okay.
2016-08-04 07:35:49 +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
adaa23d39f Syntax adjustments in album.js. 2016-08-03 21:59:02 +02:00
Nils Asmussen
96bd6b240b Better highlighting of selected items.
Especially for albums, it is difficult to which ones are
chosen for an operation, because in contrast to photos, the
only change is the thin blue border.

This commit adds a new CSS class, that is set when items
have been selected. Currently, it sets a 2px border instead
of 1px.
2016-08-01 15:33:21 +02:00
Tobias Reich
066fc90056 Syntax adjustment for contextMenu.js 2016-07-31 16:12:14 +02:00
Tobias Reich
2da195f925 Use disabled functionality of basicContext 2016-07-31 16:03:08 +02:00
Tobias Reich
0c7d95fb15 Syntax adjustments 2016-07-31 15:53:34 +02:00
Nils Asmussen
8b37d122b9 Fixed bug in countSubAlbums. 2016-07-30 15:11:49 +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
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
Nils Asmussen
6d4df5f6b7 Introduced album.isSmartID. 2016-07-29 22:36:41 +02:00
Tobias Reich
916ec66140 Fixed separator not showing up when logged in 2016-04-30 15:30:48 +02:00
Tobias Reich
cba5a39602 Don't show dropbox in public share menu #473 2016-04-08 22:46:37 +02:00
Tobias Reich
592c7598a2 Show share button when logged out #473 2016-04-08 22:07:17 +02:00
Tobias Reich
48931fde5b Unnamed albums/photos now named "Untitled" in move album, merge album and switch album/photo menus 2016-03-06 17:48:40 +01:00
Tobias Reich
bad7819ff6 Moved Album::getAll into a separated file 2016-02-14 14:49:51 +01:00
Tobias Reich
145c3f5147 Namespaces, Plugins via Namespaces, API entry file renamned, Settings::set() 2016-01-26 15:31:53 +01:00
Tobias Reich
606968f349 Updated code style 2016-01-24 15:20:33 +01:00
Tobias Reich
9a0d13b878 Code adjustments 2015-09-28 19:11:30 +02:00
Tobias Reich
453c587129 HTML and CSS changes 2015-09-28 18:47:50 +02:00
Tobias Reich
2e96f089a7 Fixed tons of XSS issues and escaping problems 2015-09-05 23:02:58 +02:00
Tobias Reich
47c3139b02 Sahre photo now shares view.php link #392 2015-08-21 21:58:31 +02:00
Tobias Reich
f3c4662d2c Updated photo.js (ES2015) 2015-07-11 17:35:20 +02:00
Tobias Reich
63b2a2412d Updated loadingBar.js (ES2015) 2015-07-11 14:52:38 +02:00
Tobias Reich
0d583ea341 Updated contextMenu.js (ES2015) 2015-07-11 14:39:09 +02:00
Tobias Reich
93db87a1f8 Updated album.js (ES2015) 2015-07-11 13:33:37 +02:00
Tobias Reich
96d931bb9b Use the visible-property of basicContext to show and hide individual items 2015-07-07 10:38:08 +02:00
Tobias Reich
d32115333e Fixed error when using "Merge All" with one selected album 2015-06-28 14:07:03 +02:00
Tobias Reich
1a53978108 Fixed basicContext on mobile 2015-06-27 23:45:07 +02:00
Tobias Reich
90ac81acf1 Added album sorting #98 2015-05-14 17:20:33 +02:00
Tobias Reich
e64e29f81f Several album and photo handling changes
- Stopped view.js from cutting album and photo titles (#332)
- Fixed album sorting (getByID, deleteByID)
- Fixed jQuery each bug when opening empty album
- Stop showing deleted photos in photo switcher
2015-05-14 15:42:28 +02:00
Tobias Reich
1bbe3bd3dc Added merge icon 2015-05-06 19:39:39 +02:00
Tobias Reich
9f7d6278ab Add single merge action with list select #341 2015-05-05 22:53:35 +02:00
Rouven Hurling
c69fe33df3 add Album::merge via Multiselection ContextMenu 2015-05-05 12:18:27 +02:00
Tobias Reich
5c40f43290 Fixed sorting of move and switch album context menu 2015-04-06 19:28:21 +02:00
Tobias Reich
8baeb1f33a Removed path from svg icons 2015-04-02 22:09:33 +02:00
Tobias Reich
ea149b68af Added Album::prepareData and improved thumbs response from API 2015-03-12 12:57:48 +01:00
Tobias Reich
87537eba2d Feature: Edit sharing properties of album 2015-02-28 23:42:13 +01:00
Tobias Reich
67dce773e6 Updated Album::getAll 2015-02-27 20:37:24 +01:00
Tobias Reich
452a19254c Fixed move photo 2015-02-27 20:33:03 +01:00
Tobias Reich
d0616d678b Quickly switch between photos 2015-02-07 00:04:20 +01:00