Commit Graph

265 Commits

Author SHA1 Message Date
Tobias Reich
7816892ffb Merge fix 2014-07-26 15:54:48 +02:00
Tobias Reich
aa07c985a0 Merge branch 'master' into uploader
Conflicts:
	assets/min/main.js
2014-07-26 15:54:12 +02:00
Tobias Reich
a778517795 Updated version 2014-07-25 21:47:04 +02:00
Tobias Reich
64a9d7ab5e Fixed incorrect info about password in infobox 2014-07-25 21:33:55 +02:00
Tobias Reich
31ed7cb0c0 Added warning that original files will be deleted 2014-07-23 22:04:07 +02:00
Tobias Reich
d991eef2c9 User can set the import-path #187 2014-07-23 21:58:41 +02:00
Tobias Reich
653511e6c6 Server returns location of lychee
Used for the new server-import dialog
2014-07-23 21:24:25 +02:00
Tobias Reich
b905d3c51f Added callback to upload.show function 2014-07-23 21:23:10 +02:00
Tobias Reich
6c983eb04d Merge fix 2014-07-23 20:31:20 +02:00
Tobias Reich
b8630538f3 Merge branch 'master' into uploader
Conflicts:
	assets/min/main.css
	assets/min/main.js
	assets/min/view.js
2014-07-23 20:30:53 +02:00
Tobias Reich
8974b7c2aa Fixed a bug with the back button and zero public listed albums 2014-07-21 22:46:37 +02:00
Tobias Reich
fde153d004 Removed "Set Password" menu after sharing without password 2014-07-21 22:38:56 +02:00
Tobias Reich
cf9ad486f0 New sharing dialog
Choose if album should be listed public or not #177
2014-07-21 22:16:30 +02:00
Tobias Reich
abc7c9233d Only first item of album preview should be a retina image 2014-07-21 00:44:22 +02:00
Tobias Reich
5d78479daa Show public badge on public albums 2014-07-21 00:14:46 +02:00
Tobias Reich
2e701a5bdc Removed redundant if 2014-07-21 00:14:29 +02:00
Tobias Reich
3e019af823 Merge branch 'master' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/css/upload.css
	assets/min/main.css
	assets/min/main.js
2014-07-20 19:06:50 +02:00
Tobias Reich
6c18e63731 Fixed broken style of upload bar 2014-07-20 16:49:43 +02:00
Tobias Reich
f88a95d489 Removed unnecessary parsing 2014-07-18 23:59:39 +02:00
Tobias Reich
dba3d05709 Use autoprefixer 2014-07-18 23:14:57 +02:00
Tobias Reich
c355d37533 Merge fix 2014-07-18 23:13:06 +02:00
Tobias Reich
1d8abd30ad Merge branch 'master' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.css
	assets/min/main.js
	assets/min/view.js
2014-07-18 23:11:35 +02:00
Tobias Reich
4d9bc5744c Added autoprefixer 2014-07-18 23:01:19 +02:00
Tobias Reich
d75c980e7a Fixed wrong path for public photos in view.php 2014-07-18 22:15:14 +02:00
Tobias Reich
d627a66a71 From Grunt to Gulp 2014-07-18 22:09:15 +02:00
Tobias Reich
9ce8f9b467 Pulse animation while processing photo 2014-07-18 17:39:13 +02:00
Tobias Reich
b7d68c84c7 Close modal after upload 2014-07-18 17:27:45 +02:00
Tobias Reich
26c3cc9104 Scroll to current uploading item 2014-07-18 17:26:24 +02:00
Tobias Reich
e4592190bc Merge branch 'master' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.css
	assets/min/main.js
	assets/min/view.js
2014-07-18 16:33:51 +02:00
Tobias Reich
402259e334 Animate only the first 50 photos and albums 2014-07-12 20:30:46 +02:00
Tobias Reich
8eccd7bad2 Testing iOS crash 2014-07-12 20:23:45 +02:00
Tobias Reich
911e168b6f Less parsing of photos/albums on client-side 2014-07-12 20:12:38 +02:00
Tobias Reich
a244f2ed51 Animate only the first 100 photos and albums 2014-07-12 19:05:56 +02:00
Tobias Reich
8b39f6fffa - Fixed a bug where it was possible to right-click on SmartAlbums after searching
- Fixed a bug where it wasn't possible to rename albums while searching
2014-07-12 18:41:58 +02:00
Tobias Reich
8e07423796 Rebuild after merge 2014-07-05 00:42:01 +02:00
Tobias Reich
4f272c4ba4 Merge branch 'recent'
Conflicts:
	assets/min/main.js
2014-07-05 00:41:36 +02:00
Tobias Reich
c064c1c0e4 Version push and add checksum for existing users #179 2014-07-05 00:39:31 +02:00
Tobias Reich
ce373c26d5 Added new SmartAlbum which shows all recent uploads 2014-06-29 15:40:06 +02:00
Tobias Reich
386a0c2b8e Show takedate in photo-overlay when available 2014-06-28 22:49:49 +02:00
Tobias Reich
f590f72b0d Rebuild 2014-06-26 12:44:20 +02:00
Tobias Reich
6b415ad7e1 Improved Infobox scrolling for iOS 2014-06-26 12:42:37 +02:00
Tobias Reich
60c1948abd Version to v2.5 2014-06-24 11:52:21 +02:00
Tobias Reich
9d49b7ec58 Merge fix 2014-06-21 12:23:45 +02:00
Tobias Reich
13dca6cb48 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.css
	assets/min/main.js
	assets/min/view.js
2014-06-21 12:23:19 +02:00
Tobias Reich
91a2a78ee4 Subtle design changes 2014-06-20 23:22:36 +02:00
Tobias Reich
bdc8ccb3cf Version push to 2.5 release candidate (rc1) 2014-06-18 23:51:44 +02:00
Tobias Reich
5b5e511cd1 Fixed a bug with special chars in descriptions, disabled debug and pushed version 2014-06-15 19:11:54 +02:00
Tobias Reich
4bd77f8dbf Remove html from Tags, Description and Title input 2014-06-14 21:38:37 +02:00
Tobias Reich
0f8a409cec Prevent tabs from open in the same tab all the time 2014-06-01 12:21:34 +02:00
Tobias Reich
c19c3f48b3 Removed text from Email sharing 2014-05-31 12:55:18 +02:00
Tobias Reich
c5977e95ef Fixed a bug where EXIF data was displayed even when empty 2014-05-31 12:38:36 +02:00
Tobias Reich
d8e4b2fe8f Pushed version to v2.5 beta 3 2014-05-31 12:08:13 +02:00
Tobias Reich
c64698c26f Fixed a bug where "No public albums" won't disappear 2014-05-30 21:07:15 +02:00
Tobias Reich
b4ba1fffe9 Merge fix 2014-05-27 10:21:06 +02:00
Tobias Reich
03e2081756 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/js/upload.js
	assets/min/main.js
2014-05-27 10:20:45 +02:00
Tobias Reich
bf7210de2a Fixed a bug where photos were uploaded to the wrong album 2014-05-27 10:17:46 +02:00
Tobias Reich
82d62971de Recompiled js 2014-05-20 17:14:36 +02:00
Tobias Reich
f90bfe0086 Merge branch 'v2.5' of https://github.com/electerious/Lychee into uploader
Conflicts:
	assets/min/main.js
2014-05-20 17:13:45 +02:00
Tobias Reich
1e80564fbe Shorter text for sharing-dialog 2014-05-17 23:53:30 +02:00
Tobias Reich
63061e0d9e Shorter text for sharing-dialog 2014-05-17 23:53:13 +02:00
Tobias Reich
f08e838a38 Disable infobox shortcut in SmartAlbums 2014-05-17 23:30:02 +02:00
Tobias Reich
99f5248032 Visual enhancements for new uploader 2014-05-16 22:11:10 +02:00
Tobias Reich
ce5f8b9d0f Improved handling of long file names and fixed Dropbox and URL import 2014-05-12 22:13:47 +02:00
Tobias Reich
5acc5760da Faster back when album empty 2014-05-12 21:41:32 +02:00
Tobias Reich
47afc5c74b Removed support for old uploader and fixed URL import 2014-05-12 21:40:25 +02:00
Tobias Reich
21d8b22a3a Improved upload on mobile devices 2014-05-12 21:37:51 +02:00
Tobias Reich
808bf4ee1e Basic per file upload 2014-05-12 00:15:01 +02:00
Tobias Reich
1261a2ff35 Version push to v2.5 b2 2014-05-11 20:48:53 +02:00
Tobias Reich
dceb348d42 Store username in lychee_username 2014-05-11 20:11:39 +02:00
Tobias Reich
61a868980e Improved sorting by takestamp and reset for older version (#152) 2014-05-06 19:57:59 +02:00
Tobias Reich
157c0821e6 Fixed title to long for overlay 2014-04-30 10:54:45 +02:00
Tobias Reich
c248b755f8 Updated link to check.php 2014-04-22 12:05:58 +02:00
Tobias Reich
bc9189433c Updated link to check.php 2014-04-22 12:05:43 +02:00
Tobias Reich
0362ca8f57 Show or hide password field, depending on the radio-input (#105) 2014-04-21 14:55:13 +02:00
Tobias Reich
705a383bec Fix for #126 2014-04-19 19:55:07 +02:00
Tobias Reich
6f8e877fce Pushed version to 2.5 in package.json 2014-04-18 21:30:06 +02:00
Tobias Reich
92d894783e Improved parsing of tags 2014-04-18 21:27:52 +02:00
Tobias Reich
a3970ce69a Less shadow for the contextMenu 2014-04-18 21:15:21 +02:00
Tobias Reich
3a67cd4728 Fixed global vars 2014-04-15 14:17:32 +02:00
Tobias Reich
76d04922f2 Improved share album dialog (#105) 2014-04-14 17:19:56 +02:00
Tobias Reich
0cbf57dbfa Added shortcut to focus search 2014-04-14 11:06:13 +02:00
Tobias Reich
73e14c7a3a Close upload on error 2014-04-12 16:42:06 +02:00
Tobias Reich
9b1e4bcd5e Check if response is numeric 2014-04-11 22:47:09 +02:00
Tobias Reich
fe6d05425b Added update script to v2.5 + version push (#115) 2014-04-10 22:42:14 +02:00
Tobias Reich
44d44e04fd Improved update mechanism (#115) 2014-04-05 18:30:24 +02:00
Tobias Reich
26d7242ed2 Removed unused param and enabled debug mode 2014-04-05 16:03:14 +02:00
Tobias Reich
7dcf062602 Removed date from compressed files 2014-04-04 18:50:58 +02:00
Tobias Reich
ce3914e801 Added setPublic and setPassword to Album 2014-04-04 17:56:08 +02:00
Tobias Reich
37994b5228 Fixed setTitle for albums and photos 2014-04-02 22:40:31 +02:00
Tobias Reich
c339116a7f Improved JS for view.php 2014-04-02 00:25:54 +02:00
Tobias Reich
27bdc7dbe6 Fixed view.php 2014-04-02 00:18:25 +02:00
Tobias Reich
e5f0e8138c Change version 2014-04-01 23:43:03 +02:00
Tobias Reich
cdb7d4c197 Fixed wrong if 2014-04-01 22:57:01 +02:00
Tobias Reich
93210ecb64 Fix undefined error 2014-04-01 22:55:45 +02:00
Tobias Reich
edb7471b10 Trying to fix undefined error on mobile devices while swiping 2014-04-01 22:49:51 +02:00
Tobias Reich
cdd5abcdd8 Removed logging 2014-04-01 22:45:22 +02:00
Tobias Reich
02e77b8aea Fixed a swipe error 2014-04-01 22:42:12 +02:00
Tobias Reich
605ef84c0b Fixed an error when swiping and removed unnecessary detection 2014-04-01 22:39:59 +02:00
Tobias Reich
a92a8e5e42 Removed manifest (not working with dynamic files) 2014-04-01 22:35:37 +02:00
Tobias Reich
b2c45087b2 Fixed manifest links 2014-04-01 22:29:11 +02:00