Commit Graph

1622 Commits

Author SHA1 Message Date
Tobias Reich
a0abb1a460 Rebuild 2016-10-25 18:34:25 +02: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
cd471be2b0 Rebuild 2016-10-25 18:15:52 +02:00
Tobias Reich
d7bdddc4c5 Updated version 2016-10-25 18:15:45 +02:00
Tobias Reich
424ac3d5b5 Removed npm-shrinkwrap 2016-10-25 18:11:38 +02:00
Tobias Reich
623325691f Nobody needs a copyright in each file… 2016-10-25 18:11:27 +02:00
Tobias Reich
3a6c89ba87 Added v3.1.5 to changelog 2016-10-25 18:07:51 +02:00
Tobias Reich
2041758551 Updated deps 2016-10-25 18:07:16 +02:00
Tobias Reich
9c202f291b Rebuild 2016-09-25 13:04:35 +02:00
Tobias Reich
89b4f56160 Improve auto-fullscreen delay #625 2016-09-25 13:03:51 +02:00
Tobias Reich
5c1ee46a21 Updated deps 2016-09-25 13:01:02 +02:00
Tobias Reich
b360d23661 Smoothing rotation of album #626
Keep the composited layer created by the browser during the animation. Makes the border of the transformed thumb look better.
2016-09-25 12:58:31 +02:00
Tobias Reich
e1e3f31839 Hide mouse pointer in full screen mode #620 2016-09-20 10:02:16 +02:00
Tobias Reich
a2def81b52 Just a small code adjustment 2016-08-30 19:14:25 +02:00
Tobias Reich
ab3a5a4d63 Merge pull request #611 from hrniels/multiselect
Improvements to selection feature.
2016-08-30 19:06:18 +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
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