arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,607 Commits 4 Branches 43 Tags 8.6 MiB
3f7f2ffcd1
Commit Graph

1607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nils Asmussen
a765b5ee06 Support metaKey and ctrlKey for selection. 
MetaKey is the windows key on Windows/Linux. Using only that for
selecting items is really confusing, because AFAIK no existing
application does that. With this commit, ctrl can be used for selecting
items as well.
 2016-08-28 16:25:57 +02:00
Nils Asmussen
425749eb85 Fixed condition in {album,photo}ContextMenu. 
This has been introduced in d2c7cab3.
 2016-08-28 16:25:57 +02:00
Tobias Reich
7002e039b3 Merge branch 'develop' into feature/subalbums 2016-08-28 13:17:42 +02:00
Tobias Reich
3e3dfb0d63 Updated date for v3.1.4 in changelog 2016-08-28 13:14:06 +02:00
Tobias Reich
346a123e3e Rebuild 2016-08-28 13:13:04 +02:00
Tobias Reich
0cb50e5090 Updated keyboard shortcuts doc as we are now using the meta key to trigger selection 2016-08-28 13:06:00 +02:00
Tobias Reich
1fc3ca05cc Merge branch 'develop' into feature/subalbums 
# Conflicts:
#	src/package.json
#	src/scripts/lychee.js
 2016-08-28 13:01:37 +02:00
Tobias Reich
bdd2aca6f2 Custom function to check if id is already selected 
Replaces all hard-to-read $.inArray and -1 checks
 2016-08-28 12:59:16 +02:00
Tobias Reich
d2c7cab3e3 Prevent smart albums to be part of a selection #603 
This bug has been introduced by #603
 2016-08-28 12:51:24 +02:00
Tobias Reich
ff5637a7da Use cmd on macOS and ctrl on Windows to trigger multi select of individual items 
Using https://api.jquery.com/event.metakey/
 2016-08-28 12:29:21 +02:00
Tobias Reich
4b08f7e6f0 Trim whitespace on save 2016-08-28 12:21:34 +02:00
Tobias Reich
1bf8f8d2f8 Merge pull request #603 from hrniels/multiselect-contextmenu 
Don't show context menu on finished multiselect.
 2016-08-27 18:20:50 +02:00
Tobias Reich
b098cab264 Updated version to 3.1.4 2016-08-27 18:12:35 +02:00
Tobias Reich
1cda75adea Updated changelog 2016-08-27 18:11:22 +02:00
Tobias Reich
033e0d2f2e Rebuild 2016-08-27 18:07:32 +02:00
Tobias Reich
cea42f126a Improved nextPhoto and previousPhoto check 2016-08-27 18:06:47 +02:00
Tobias Reich
3a458939c9 Fixed missing medium when searching #605 2016-08-27 18:04:34 +02:00
Nils Asmussen
774fda3a7c Don't show context menu on finished multiselect. 
Previously, we showed the context menu if a multiselect was finished
right away. Since we can select items individually now, it makes more
sense to just select the items as well and show the context menu later
via right mouse button or similar.

A multiselect can only add items to the selection, because that seems to
be easier to use. As before, shift+click can be used to deselect items.

The selection is cleared if the multiselect rectangle is empty and shift
is not pressed. This allows the user to click somewhere on the free area
to clear the selection again. If the shift key is pressed, it is not
cleared to prevent that a user triggers that by accident if he misses a
photo/album.
 2016-08-22 22:18:19 +02:00
Tobias Reich
18f2397830 Fixed link to demo #602 2016-08-22 15:54:10 +02:00
Tobias Reich
e64e8ae621 Removed select all 
Makes no sense anymore as albums can contain albums and photos and you can only select one type => Error when using select all
 2016-08-22 14:53:34 +02:00
Tobias Reich
9d5e9a4137 Code style adjustment 2016-08-22 14:20:24 +02:00
Tobias Reich
5c18fbeed8 Use shiftkey for multiselect 
The only key that works on every OS (hopefully)
 2016-08-22 14:19:20 +02:00
Tobias Reich
4c58ae0733 Code style adjustment 2016-08-22 14:17:35 +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
Tobias Reich
7ba384e70a Updated to minor version 2016-08-22 14:08:03 +02:00
Tobias Reich
9548f43b06 Use new album.isSmartID to check if it's a smart album 2016-08-22 14:06:54 +02:00
Tobias Reich
5bbac75481 Merge branch 'develop' into feature/subalbums 2016-08-22 14:01:10 +02:00
Tobias Reich
b26cbc0a22 Merge pull request #601 from electerious/develop 
Lychee 3.1.3
 2016-08-22 13:53:01 +02:00
Tobias Reich
bf0ef33a98 Updated changelog 2016-08-22 13:52:14 +02:00
Tobias Reich
e4d0e9a3e5 Rebuild 2016-08-22 13:47:26 +02:00
Tobias Reich
8a267c05c5 Hide sidebar when navigating to smart album 2016-08-22 13:45:48 +02:00
Tobias Reich
a0c33bb4a0 Updated version 2016-08-22 13:16:49 +02:00
Tobias Reich
13f193381d Added v3.1.3 changelog 2016-08-22 13:08:22 +02:00
Tobias Reich
58d378da1a Rebuild 2016-08-22 12:55:21 +02:00
Tobias Reich
c527534ee5 Prefetch big when medium not available 2016-08-22 12:54:12 +02:00
Tobias Reich
83389467ce Removed Docker docs as Dockerfile has been outsourced already 
Dockerfile not part of the project anymore. Check the readme for more details.
 2016-08-20 20:54:56 +02:00
Tobias Reich
274f782f3c Merge pull request #600 from qligier/pr-rotate 
Rotate and flip the image with GD
 2016-08-20 15:14:54 +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
Quentin Ligier
c7d0e5215d Merge pull request #9 from electerious/develop 
Develop merge
 2016-08-20 12:31:37 +02:00
Nils Asmussen
7ebe2a1aa0 Clear selected items when multiselect starts. 2016-08-15 22:03:03 +02:00
Nils Asmussen
ea073b4324 Use outline for selected items, not border. 2016-08-15 22:02:03 +02:00
Tobias Reich
55ae8a4be2 Merge pull request #591 from hrniels/subalbums 
Some cleanup, fixes and a new feature for subalbums.
 2016-08-15 14:45:41 +02:00
Nils Asmussen
0746acda79 Allow to select photos/albums individually (fixes #339). 
This commit adds support for selecting photos and albums individually
via ctrl+click. For that, the event handlers in init.js call to
multiselect now, which collects the photo/album ids and calls the
appropriate method of contextMenu in the end.
 2016-08-14 20:15:20 +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
5ee34c50a4 Properly redirect after album {delete,move,merge}. 
That is, we don't redirect to the albums view, but to the current album
or the parent album if the current one has been deleted.
 2016-08-13 16:03:37 +02:00
Nils Asmussen
7126354d7a Hide "Photos" divider if photos are deleted. 
If we have deleted all photos from an album, we need to remove the
divider between albums and photos.
 2016-08-13 16:01:41 +02:00
Tobias Reich
6a1d38d0e9 Rebuild 2016-08-09 09:53:29 +02:00
Tobias Reich
d458feb55d Updated deps 2016-08-09 09:53:24 +02:00