arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
530 Commits 4 Branches 43 Tags 8.6 MiB
7299637397
Commit Graph

217 Commits

Author SHA1 Message Date
Tobias Reich
7299637397 Merge branch 'master' into uploader 
Conflicts:
	assets/min/main.css
 2014-07-26 15:59:19 +02:00
Tobias Reich
a60e327245 Fixed missing background of error message 2014-07-26 15:58:49 +02:00
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