Commit Graph

1246 Commits

Author SHA1 Message Date
Tobias Reich
8e06bc7e5c Merge branch 'master' into develop 2015-05-10 22:16:28 +02:00
Tobias Reich
ee672d6b4a Improved visibility of creation date 2015-05-10 20:28:36 +02:00
Tobias Reich
0b8ab8e15f Changed no content icon color #347 2015-05-10 18:21:21 +02:00
Tobias Reich
41a7ec8cb0 Syntax error, unexpected '[' in php/modules/Album.php on line 691 #348 2015-05-09 10:16:49 +02:00
Tobias Reich
f3dd0cee06 Added release date 2015-05-06 20:40:48 +02:00
Tobias Reich
95801ac334 Merge pull request #329 from electerious/release/v3.0.0
Lychee v3.0
2015-05-06 20:08:17 +02:00
Tobias Reich
4299ab5b89 Removed <br> 2015-05-06 20:00:10 +02:00
Tobias Reich
1bbe3bd3dc Added merge icon 2015-05-06 19:39:39 +02:00
Tobias Reich
3789cf698a Added merge feature to changelog 2015-05-06 11:16:57 +02:00
Tobias Reich
9f7d6278ab Add single merge action with list select #341 2015-05-05 22:53:35 +02:00
Tobias Reich
e67eca81ae Code simplifications #340 2015-05-05 22:06:54 +02:00
Tobias Reich
9cd52b99c7 Added merge to plugin list 2015-05-05 22:06:39 +02:00
Tobias Reich
c02ccb0d5b Rebuild 2015-05-05 21:39:21 +02:00
Tobias Reich
e2399a1794 Merge pull request #340 from rhurling/feature/166-merge-albums
Merge Albums feature
2015-05-05 21:32:33 +02:00
Rouven Hurling
2e71c71a28 add confirmation modal and reload of albums after merge 2015-05-05 19:40:55 +02:00
Rouven Hurling
00b08fd22d Fix PHP & SQL errors in Album::merge, run gulp 2015-05-05 19:29:10 +02:00
Rouven Hurling
c69fe33df3 add Album::merge via Multiselection ContextMenu 2015-05-05 12:18:27 +02:00
Tobias Reich
ec4842cad5 Fixed url drag and drop link import 2015-05-04 22:16:29 +02:00
Tobias Reich
3458b27105 Updated deps 2015-05-04 22:16:00 +02:00
Tobias Reich
897cca3aca Rebuild 2015-04-30 23:37:57 +02:00
Tobias Reich
24159c059e Hide sidebar when switching to album view 2015-04-30 23:37:52 +02:00
Tobias Reich
df8fad52c5 Fixed editing text with single quotes #335 2015-04-30 23:11:12 +02:00
Tobias Reich
a33542b0fe Added Deprecated-Warning 2015-04-29 23:23:07 +02:00
Tobias Reich
ed4ebe6882 Removed arrows from view.php 2015-04-18 00:08:56 +02:00
Tobias Reich
9f270e5f5e Added Lychee v3.0 to changelog 2015-04-17 23:58:12 +02:00
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
2821383243 Fixed incorrect var type from server 2015-04-17 22:50:56 +02:00
Tobias Reich
0945cddab4 Stop init from returning username 2015-04-17 22:50:35 +02:00
Tobias Reich
bddecf8823 Updated screenshots 2015-04-14 22:49:15 +02:00
Tobias Reich
99e276324f Added new version to the changelog 2015-04-13 21:18:48 +02:00
Tobias Reich
02a39b5e11 Rebuild 2015-04-13 21:18:23 +02:00
Tobias Reich
1fd68a3469 Updated version 2015-04-13 21:18:19 +02:00
Tobias Reich
2167b04d34 Block import of invalid photo types and extensions 2015-04-13 21:09:28 +02:00
Tobias Reich
585bbb72ea Stop view.php from returning data of private photos 2015-04-13 21:08:26 +02:00
Tobias Reich
aa9b4e6174 Updated basicModal 2015-04-11 17:26:50 +02:00
Tobias Reich
d2f2aaabf5 Removed old adjustments for mobile screens 2015-04-11 16:38:36 +02:00
Tobias Reich
e6d0d728d7 Updated deps 2015-04-11 16:38:14 +02:00
Tobias Reich
8d81ff7318 Rebuild 2015-04-06 21:10:39 +02:00
Tobias Reich
0f8bf0f8e1 Catch "photo not found" in view.php 2015-04-06 21:10:33 +02:00
Tobias Reich
6303adc679 Fixed an error when photo not found 2015-04-06 21:09:26 +02:00
Tobias Reich
5c40f43290 Fixed sorting of move and switch album context menu 2015-04-06 19:28:21 +02:00
Tobias Reich
4177219f67 Added code documentation 2015-04-06 19:08:58 +02:00
Tobias Reich
9a2982de29 Rebuild 2015-04-06 18:49:20 +02:00
Tobias Reich
dd78ceda1b Don't refresh albums when get password canceled by user 2015-04-06 18:49:16 +02:00
Tobias Reich
e89676d6ee Prevent download of deleted albums/photos, added code documentation, fixed error when logged out and opening a private photo 2015-04-06 18:48:52 +02:00
Tobias Reich
06fba792b2 Use flewbox for content 2015-04-06 16:23:23 +02:00
Tobias Reich
a5279fc42f Updated iOS icons and added icon for iPhone 6 2015-04-06 00:45:47 +02:00
Tobias Reich
227f0fa364 New album placeholder images 2015-04-06 00:45:17 +02:00
Tobias Reich
366904b9a8 New favicon 2015-04-06 00:44:59 +02:00
Tobias Reich
2497ed4be1 Added allow_url_fopen check #302 2015-04-05 00:55:15 +02:00