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

359 Commits

Author SHA1 Message Date
Tobias Reich
4a0750e34f Merge branch 'v2.6.2' of https://github.com/electerious/Lychee into v2.6.2 2014-08-30 15:23:26 +02:00
Tobias Reich
bcdc75b5dc Fixed _ table prefix when no table prefix set (#196) 2014-08-30 15:23:17 +02:00
cternes
13dea68c88 Replaced new array syntax with old one to support older php versions 2014-08-30 07:05:26 +02:00
Tobias Reich
0296b313ee Added option to disable imagick (#211) 2014-08-30 00:11:26 +02:00
Tobias Reich
a5722a79c6 Converted database updates to prepared statements (#38 #214 #196) 2014-08-29 23:49:52 +02:00
Tobias Reich
9f11875e39 Create tables with prefix (#38 #214 #196) 2014-08-29 23:08:18 +02:00
Tobias Reich
af37f5c138 Define prefix after config-file has been loaded (#38 #214 #196) 2014-08-29 23:07:54 +02:00
Tobias Reich
bef84572fb Converted Settings to prepared statements (#38 #214 #196) 2014-08-29 21:38:40 +02:00
Tobias Reich
e92635b44b Converted Log to prepared statements (#38 #214 #196) 2014-08-29 21:28:20 +02:00
Tobias Reich
1be2789023 Converted misc to prepared statements (#38 #214 #196) 2014-08-29 21:25:41 +02:00
Tobias Reich
606334fb62 Converted Photo.php to prepared statements (#38 #214 #196) 2014-08-29 21:16:10 +02:00
Tobias Reich
8b76fadf6d Escape data before writing to config.php (#38) 2014-08-29 20:10:50 +02:00
Tobias Reich
32af951c77 Added table prefix to create dialog (#214 #196) 2014-08-29 19:55:21 +02:00
Tobias Reich
52b530f85e Unified statements 2014-08-29 19:31:50 +02:00
Tobias Reich
01d367beb9 Prepare statments (#38 #214 #196) 2014-08-29 19:27:09 +02:00
Tobias Reich
75e63a9e3a Added database prepare (#38 #214 #196) 2014-08-29 19:12:35 +02:00
Tobias Reich
4697698b03 Define tables global (#214 #196) 2014-08-29 16:37:11 +02:00
Tobias Reich
fb4e1dc73c Code adjustments 2014-08-29 16:36:38 +02:00
Tobias Reich
cd7196ef4a Improved diagnostics 2014-08-28 17:02:27 +02:00
Tobias Reich
8b4ef96146 Added update for database for version 2.6.2 2014-08-27 21:17:05 +02:00
Tobias Reich
864e5b97d0 Changed some function to public 2014-08-26 20:26:14 +02:00
Tobias Reich
f302f65cd7 Use IPTC Title when Headline not available (#216) 2014-08-26 16:07:59 +02:00
Tobias Reich
0387581005 Fixed a problem with htmlentities and older PHP versions (#212) 2014-08-26 10:15:17 +02:00
Tobias Reich
61ae1b3dc3 Internal feature to add tags when uploading 2014-08-24 17:17:40 +02:00
Tobias Reich
e6d9261d18 Return prefix thumbUrl 2014-08-23 17:07:46 +02:00
Tobias Reich
d686a2b083 Duplicate photos by right-clicking them (#186) 2014-08-22 23:31:09 +02:00
Tobias Reich
45cbf0c238 Escape 2014-08-22 23:04:59 +02:00
Tobias Reich
988a9075f3 Don't delete photo when used elsewhere 2014-08-22 22:54:33 +02:00
Tobias Reich
47e3219966 Use fetch_object 2014-08-22 22:34:59 +02:00
Tobias Reich
11e8b8b2e6 Moved check for duplicates into its own function 2014-08-22 22:14:50 +02:00
Tobias Reich
e942c9c525 Don't reupload duplicates (#48) 2014-08-22 22:02:58 +02:00
Tobias Reich
a613ee58c7 Default ist downloadable 2014-08-22 20:52:23 +02:00
Tobias Reich
8d587a0ea0 Disable download php-side 2014-08-17 20:22:46 +02:00
Tobias Reich
b23360d6ce Added downloadable to database and backend 2014-08-09 17:57:31 +02:00
Tobias Reich
e332b0b167 Merge branch 'master' into uploader 2014-08-08 16:29:50 +02:00
Tobias Reich
1d57a13267 Fixed "Setup tries to create database lychee_dbcheck #202" 2014-08-08 16:28:34 +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
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
554e7cba6b Execlute big/ and thumb/ from import 2014-07-26 22:14:22 +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
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
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
911e168b6f Less parsing of photos/albums on client-side 2014-07-12 20:12:38 +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
pyro2927
ba852f8a03 Adding in photo checksum to detect dupes 2014-07-02 14:29:34 -05:00
Tobias Reich
ce373c26d5 Added new SmartAlbum which shows all recent uploads 2014-06-29 15:40:06 +02:00
Tobias Reich
8e8fd91497 Fixed a bug with smart albums 2014-06-29 15:03:19 +02:00
Tobias Reich
386a0c2b8e Show takedate in photo-overlay when available 2014-06-28 22:49:49 +02:00
Rene Luria
a5288f96b8 loosen perms for fpm 2014-06-26 14:25:23 +02:00
Tobias Reich
33446c30e8 Fixed a static warning (#172) 2014-06-25 14:50:49 +02:00
Tobias Reich
1ecc81c18f Fixed a bug with problematic chars in album names when trying to download them 2014-06-18 23:36:00 +02:00
Tobias Reich
a3828e72ae Fixed import of filename 2014-06-14 23:06:11 +02:00
Tobias Reich
65094ccad5 Fixed album download with double dot in filename 2014-06-14 23:05:45 +02:00
Tobias Reich
1dce04fa92 Fixed an error when trying to logout in two tabs 2014-06-14 21:44:08 +02:00
Tobias Reich
891d222a33 Added Log to update_020100 2014-05-31 12:06:26 +02:00
Tobias Reich
041c9e7a7a Added Log to update_020101 2014-05-31 12:04:16 +02:00
Tobias Reich
b82c83d612 Added Log to update_020200 2014-05-31 12:03:12 +02:00
Tobias Reich
308d373cbe Added Log to update_020500 2014-05-31 11:58:39 +02:00
Tobias Reich
a1b2d0a746 Don't stop upload when adjustFile returns false 2014-05-30 16:57:52 +02:00
Tobias Reich
a8d792dcf1 Improved if condition 2014-05-30 16:57:15 +02:00
Tobias Reich
1d7d852ddd Changed error to notice 2014-05-30 16:56:41 +02:00
Tobias Reich
b4226d7bdd Added Log to Session 2014-05-30 16:55:56 +02:00
Tobias Reich
4e52b1e545 Added Log to Settings 2014-05-30 16:55:30 +02:00
Tobias Reich
226296e3a8 Added Log to Database 2014-05-30 16:54:34 +02:00
Tobias Reich
ba778998dd Fixed a PHP syntax error with arrays (#160) 2014-05-23 15:47:48 +02:00
Tobias Reich
404b519747 getExtension() helper 2014-05-20 12:44:08 +02:00
Tobias Reich
69aa61cade Fixed photo download 2014-05-20 12:31:48 +02:00
Tobias Reich
8cf7ad5480 Hide password-protected albums 2014-05-17 23:53:55 +02:00
Tobias Reich
02740d840a Prevent unsupported files from being moved (#151) 2014-05-17 22:59:28 +02:00
Tobias Reich
1cef3c29c4 Merge pull request #156 from djdallmann/v2.5 
Added support for filenames with spaces by using escapeshellarg() to eva...
 2014-05-17 22:50:00 +02:00
Tobias Reich
830e2362d3 Catch error when calling Import::move 2014-05-17 22:48:06 +02:00
Tobias Reich
7e6fd3ccc7 Improved plugin loading 2014-05-17 16:51:56 +02:00
djdallmann
b2658d7e01 Added support for filenames with spaces by using escapeshellarg() to evaluate and treat string as literal. 2014-05-17 05:41:18 +00:00
Tobias Reich
9db3d31cc0 Added permission check to upload 2014-05-16 23:24:11 +02:00
Tobias Reich
edca6c088a Added function to check permissions 2014-05-16 23:23:49 +02:00
Tobias Reich
5689278908 Added logging for subfolders 2014-05-16 23:22:41 +02:00
Tobias Reich
0dc54c44e0 Added logging for folder deletion 2014-05-16 23:22:20 +02:00
Tobias Reich
08fe04c241 Added Import:move from Import:server and disabled moveToTemp by default (#151) 2014-05-16 22:47:45 +02:00
Tobias Reich
0167507604 Code adjustments and improvemts for #151 2014-05-13 22:49:23 +02:00
Tobias Reich
83a7aa196c Fixed logging 2014-05-13 22:10:04 +02:00
Tobias Reich
d31f0831d4 Merge pull request #151 from djdallmann/v2.5 
Added feature to move files before processing in Import.php for server
 2014-05-13 21:55:18 +02:00
djdallmann
b321e2d970 Updated to include better error handling and to use the new error class. 2014-05-10 23:23:33 +00:00
Tobias Reich
326238d46a Fixed TEXT column can't have a default value (#154) 2014-05-10 18:46:48 +02:00
Tobias Reich
775673cf18 Added loggint to Photo 2014-05-08 20:50:18 +02:00
Tobias Reich
39131033db Added notice and warning function to Log (#143) 2014-05-06 22:11:37 +02:00
Tobias Reich
d9b48f4080 Added more error logging to Album class (#143) 2014-05-06 21:37:21 +02:00
Tobias Reich
83188ae9d9 Added error logging to Album class (#143) 2014-05-06 21:24:58 +02:00
Tobias Reich
f479511454 Added basic Log class (#143) 2014-05-06 21:22:56 +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
fc97167e1b Fixed sorting by takedate (#152) 2014-05-06 14:30:18 +02:00
Tobias Reich
3cd37cba2d Changed a comment 2014-05-01 15:42:11 +02:00
Tobias Reich
b7764dcd7f Renamed to Installation 2014-04-30 11:11:49 +02:00
Tobias Reich
aaca8b42c0 Rewritten Installation Access 2014-04-30 11:10:31 +02:00
Tobias Reich
091381a2a3 Added return false 2014-04-30 11:09:28 +02:00
Tobias Reich
32368d4ba4 Renamed to Guest 2014-04-30 10:56:52 +02:00
Tobias Reich
fbe7be18c1 Rewritten Guest Access 2014-04-30 10:56:04 +02:00
Tobias Reich
b246a9d1c2 Added return 2014-04-30 10:54:53 +02:00
Tobias Reich
d87029c2d3 Added uploads/medium/ for later versions 2014-04-28 12:00:48 +02:00
Tobias Reich
33c8eb6780 Moved Access 2014-04-28 11:59:37 +02:00
Tobias Reich
119d674002 Added fastimagecopyresampled 2014-04-28 11:47:30 +02:00
Tobias Reich
b55589eea3 Autoloader improvements 2014-04-28 11:34:36 +02:00
Tobias Reich
8f77bce210 Rename to Admin 2014-04-28 11:24:22 +02:00
Tobias Reich
6fe97135a1 Use new Admin Access 2014-04-28 11:24:00 +02:00
Tobias Reich
43ff1d06f4 Rewritten Access for Admin 2014-04-28 11:23:18 +02:00
Tobias Reich
d2bfaa29a0 Improved file ending 2014-04-28 10:17:26 +02:00
Tobias Reich
d5e94627e2 Comment adjustments 2014-04-27 15:24:51 +02:00
Tobias Reich
0b87e8fe93 Syntax adjustments 2014-04-27 14:40:54 +02:00
Tobias Reich
5d7328613d Continue url-import even when an error occurs 2014-04-26 21:02:50 +02:00
Tobias Reich
d0368ea651 Use exif_imagetype in Import 2014-04-26 19:40:34 +02:00
Tobias Reich
e3b1a6f477 Added spaces 2014-04-26 19:37:02 +02:00
Tobias Reich
24de0b994d Fix url/filenames names include extra period for filename extension (#141) 2014-04-26 17:05:42 +02:00
Tobias Reich
bb1699402c Return error when called function misses parameters 2014-04-26 17:00:31 +02:00
Tobias Reich
60d298db6d Fixed incorrect integer value (#140) 2014-04-26 16:48:40 +02:00
Tobias Reich
b307e8b7ca Fixed data too long for column make (#137) 2014-04-25 16:41:35 +02:00
Tobias Reich
8e711cde87 Trim on exif model and make (#136) 2014-04-25 16:36:31 +02:00
Tobias Reich
543381a24d Verify image with exif_imagetype (#133) 2014-04-25 10:13:43 +02:00
Tobias Reich
6a3c0c72eb Added LYCHEE_UPLOADS 2014-04-22 11:47:39 +02:00
Tobias Reich
e600f3b774 Merge pull request #129 from bb-Ricardo/v2.5 
Add fallback options when generating salt #114
 2014-04-22 09:39:20 +02:00
Ricardo Bartels
e8bf0c95e8 Add fallback options when generating salt #114 
when generating salt we try openssl first, then mcrypt
and as last resort mt_rand

Refs: #114
 2014-04-22 00:36:02 +02:00
Tobias Reich
ed79ddce47 Small code cleanup 2014-04-21 14:18:13 +02:00
Ricardo Bartels
c110f3fb28 [Feature] don't hash passwords with MD5 in DB #114 
All newly set and resetted passwords will now be stored as
blowfish hashed string generated via crypt().

Refs: #114
 2014-04-21 02:19:23 +02:00
Tobias Reich
1e18094f8f Improved error handling by checking the dependencies (e.g. vars and parameters) 2014-04-19 21:07:36 +02:00
Tobias Reich
368f6b59d0 Removed global vars from search 2014-04-19 20:27:53 +02:00
Tobias Reich
db64df8820 Memory optimization 2014-04-19 17:32:33 +02:00
Tobias Reich
fbf8309e44 Improved error handling for table creation 2014-04-19 16:57:36 +02:00
Tobias Reich
7e2936325f Added $settings var for plugins 2014-04-19 16:55:17 +02:00
Tobias Reich
92d894783e Improved parsing of tags 2014-04-18 21:27:52 +02:00
Tobias Reich
25eb998c12 Added global LYCHEE_PLUGINS 2014-04-18 12:59:14 +02:00
Tobias Reich
009d08f090 Added define check to Plugins 2014-04-16 10:13:30 +02:00
Tobias Reich
d382b62f57 Define dirs and files global (#122) 2014-04-13 14:08:18 +02:00
Tobias Reich
4761f178d4 Fixed broken installation 2014-04-13 14:03:33 +02:00
Tobias Reich
6c3d16e9b1 Fixed wrong capture date in InfoBox 2014-04-13 12:35:59 +02:00
Tobias Reich
5d7ff21c50 Set original date with 'touch' 2014-04-13 12:10:49 +02:00
Tobias Reich
6530902d13 Improved getArchive with file names (#111) 2014-04-12 19:55:05 +02:00
Tobias Reich
17b6475b6c Small code improvements to getArchive 2014-04-12 18:00:11 +02:00
Tobias Reich
1fdc495f91 Set original date for uploaded file 2014-04-12 17:30:50 +02:00
Tobias Reich
eccdcf5ead Fixed Import (some links are still nit working) 2014-04-12 16:51:05 +02:00
Tobias Reich
c9e7954446 Improved deleting of photos 2014-04-12 14:19:52 +02:00