Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
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
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
c5977e95ef Fixed a bug where EXIF data was displayed even when empty 2014-05-31 12:38:36 +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
47afc5c74b Removed support for old uploader and fixed URL import 2014-05-12 21:40:25 +02:00
Tobias Reich
808bf4ee1e Basic per file upload 2014-05-12 00:15:01 +02:00
Tobias Reich
032e972ece Renamed name to title and added shortcut for tags and description. 2014-03-30 00:12:38 +01:00
Tobias Reich
177d7dda95 Fixed a bug where the image stood in fullscreen 2014-03-27 00:25:54 +01:00
Tobias Reich
2d66c445da jsHint enhancements 2014-02-25 23:37:05 +01:00
Tobias Reich
ef22205252 Makefile 2014-02-23 16:02:01 +01:00