Commit Graph

15 Commits

Author SHA1 Message Date
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
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
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
8e07423796 Rebuild after merge 2014-07-05 00:42:01 +02:00
Tobias Reich
c064c1c0e4 Version push and add checksum for existing users #179 2014-07-05 00:39:31 +02:00
Tobias Reich
386a0c2b8e Show takedate in photo-overlay when available 2014-06-28 22:49:49 +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
c5977e95ef Fixed a bug where EXIF data was displayed even when empty 2014-05-31 12:38:36 +02:00
Tobias Reich
99f5248032 Visual enhancements for new uploader 2014-05-16 22:11:10 +02:00
Tobias Reich
157c0821e6 Fixed title to long for overlay 2014-04-30 10:54:45 +02:00
Tobias Reich
705a383bec Fix for #126 2014-04-19 19:55:07 +02:00
Tobias Reich
7dcf062602 Removed date from compressed files 2014-04-04 18:50:58 +02:00
Tobias Reich
c339116a7f Improved JS for view.php 2014-04-02 00:25:54 +02:00