Commit Graph

845 Commits

Author SHA1 Message Date
Tobias Reich
271297e330 Merge fix 2014-08-07 20:26:02 +02:00
Tobias Reich
c482ebdd74 Merge branch 'master' into uploader
Conflicts:
	assets/min/main.js
	assets/min/view.js
2014-08-07 20:25:33 +02:00
Tobias Reich
28f8aab323 Fixed "No way to back out during database creation #195" 2014-08-07 20:23:39 +02:00
Tobias Reich
caa59c72c8 Fixed "If EXIF data is missing, don't show them in the info #194" 2014-08-06 17:07:12 +02:00
Tobias Reich
55295fe48d Updated deps 2014-08-06 17:06:31 +02:00
Tobias Reich
cece57977f Merge branch 'master' into uploader
Conflicts:
	php/modules/Session.php
2014-08-01 17:01:59 +02:00
Tobias Reich
c4798ce16f Do not return list of plugins when logged out 2014-07-27 14:17:01 +02:00
Tobias Reich
917b764946 Merge branch 'master' into uploader 2014-07-27 13:09:55 +02:00
Tobias Reich
3b8c3b75c0 Added Plugins documentation 2014-07-27 13:04:34 +02:00
Tobias Reich
554e7cba6b Execlute big/ and thumb/ from import 2014-07-26 22:14:22 +02:00
Tobias Reich
f579579b58 Fixed broken upload status style in Firefox 2014-07-26 16:57:21 +02:00
Tobias Reich
b45112f4a8 Added comments to upload and fixed a bug with unsupported files 2014-07-26 16:46:52 +02:00
Tobias Reich
2021f850c4 Skip upload of unsupported files 2014-07-26 16:31:38 +02:00
Tobias Reich
cf3eda60f8 Improved upload-title when filename/url too long 2014-07-26 16:17:48 +02:00
Tobias Reich
e3b56398b1 Merge fix 2014-07-26 15:59:32 +02:00
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
1ab80cd1c8 Added v2.5.6 to Changelog 2014-07-25 21:42:52 +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
6c142f8570 Check if given import-path is a dir 2014-07-23 21:45:18 +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
864b317e4c Changed message of warning 2014-07-23 21:23:33 +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
936c2d0344 Calculate checksum before adding it to the database 2014-07-20 16:45:30 +02:00
Tobias Reich
05637e42d8 sha1 instead of md5 #179 2014-07-20 15:32:54 +02:00
Tobias Reich
7b2414695c Fixed wrong version in error log 2014-07-20 15:24:46 +02:00
Tobias Reich
55b900686c Fixed wrong date in album view when takestamp is null 2014-07-19 00:06:45 +02:00
Tobias Reich
3e523c6e0f Fixed wrong link to thumb when searching 2014-07-19 00:00:15 +02:00
Tobias Reich
a7e01447d9 Fixed wrong indention 2014-07-19 00:00:00 +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
70fb6f0863 From Grunt to Gulp 2014-07-18 22:15:37 +02:00