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

454 Commits

Author SHA1 Message Date
Peter Hoffmann
115188c2d0 You don't need to set config options each time, better set them once 2015-09-25 15:46:57 +02:00
Tobias Reich
2e96f089a7 Fixed tons of XSS issues and escaping problems 2015-09-05 23:02:58 +02:00
Tobias Reich
eef971e3eb Catch upload errors #393 2015-08-29 21:55:32 +02:00
Tobias Reich
f1ff8bf2b0 Import module now without static functions 2015-06-29 09:45:03 +02:00
Tobias Reich
035ca23c97 Added returnOnError functionality to Photo::add 2015-06-28 23:09:41 +02:00
Tobias Reich
1dece87434 Fixed: Only import urls passend to the function, not existing photos from the temp folder 2015-06-28 18:58:17 +02:00
Tobias Reich
f925e118c2 Generate identifier when creating the database, not on update 
This fixes the broken 'setLogin' when using Lychee for the first time.
 2015-06-28 17:47:19 +02:00
Tobias Reich
e36fd87f5a Added skipDuplicates to default settings table 2015-06-28 17:29:03 +02:00
Tobias Reich
feefa9c5a0 Updated version, updated deps and added skip duplicates #367 2015-06-27 21:03:27 +02:00
Tobias Reich
ffba49cc49 Escape before sending user input 2015-06-03 22:10:38 +02:00
Tobias Reich
275e653b1a Generate identifier even when db entry exists #344 2015-05-14 21:34:25 +02:00
Tobias Reich
ed3418058e Use identifier to prevent login of multiple instances of lychee #344 2015-05-14 21:07:42 +02:00
Tobias Reich
aedd378f98 Added identifier #344 2015-05-14 20:43:51 +02:00
Tobias Reich
6b4f3546f9 Updated default tables and changed sorting var/entry to sortingPhotos #98 2015-05-14 17:47:17 +02:00
Tobias Reich
90ac81acf1 Added album sorting #98 2015-05-14 17:20:33 +02:00
Tobias Reich
e64e29f81f Several album and photo handling changes 
- Stopped view.js from cutting album and photo titles (#332)
- Fixed album sorting (getByID, deleteByID)
- Fixed jQuery each bug when opening empty album
- Stop showing deleted photos in photo switcher
 2015-05-14 15:42:28 +02:00
Tobias Reich
7e885425dc Allow an album and photo title length of 50 chars #332 2015-05-10 23:01:07 +02:00
Tobias Reich
41a7ec8cb0 Syntax error, unexpected '[' in php/modules/Album.php on line 691 #348 2015-05-09 10:16:49 +02:00
Tobias Reich
e67eca81ae Code simplifications #340 2015-05-05 22:06:54 +02:00
Rouven Hurling
00b08fd22d Fix PHP & SQL errors in Album::merge, run gulp 2015-05-05 19:29:10 +02:00
Rouven Hurling
c69fe33df3 add Album::merge via Multiselection ContextMenu 2015-05-05 12:18:27 +02:00
Tobias Reich
88ef1e49b7 Merge branch 'master' into release/v3.0.0 
# Conflicts:
#	dist/main.css
#	dist/main.js
#	dist/view.js
#	src/package.json
#	src/scripts/lychee.js
 2015-04-17 22:55:46 +02:00
Tobias Reich
2821383243 Fixed incorrect var type from server 2015-04-17 22:50:56 +02:00
Tobias Reich
0945cddab4 Stop init from returning username 2015-04-17 22:50:35 +02:00
Tobias Reich
2167b04d34 Block import of invalid photo types and extensions 2015-04-13 21:09:28 +02:00
Tobias Reich
585bbb72ea Stop view.php from returning data of private photos 2015-04-13 21:08:26 +02:00
Tobias Reich
6303adc679 Fixed an error when photo not found 2015-04-06 21:09:26 +02:00
Tobias Reich
4177219f67 Added code documentation 2015-04-06 19:08:58 +02:00
Tobias Reich
e89676d6ee Prevent download of deleted albums/photos, added code documentation, fixed error when logged out and opening a private photo 2015-04-06 18:48:52 +02:00
Tobias Reich
9278182b10 Updated copyright year 2015-03-29 18:58:15 +02:00
Tobias Reich
c9f5d112d4 Use Album::prepareData in search 2015-03-13 21:32:39 +01:00
Tobias Reich
ea149b68af Added Album::prepareData and improved thumbs response from API 2015-03-12 12:57:48 +01:00
Tobias Reich
e8cc2e9192 Streamlined prepare process of photo data 2015-03-12 00:11:16 +01:00
Tobias Reich
d01e894220 Simplified response of session init 2015-03-06 23:29:55 +01:00
Tobias Reich
cfe99df0da Adjusted indention 2015-02-28 23:42:28 +01:00
Tobias Reich
87537eba2d Feature: Edit sharing properties of album 2015-02-28 23:42:13 +01:00
Tobias Reich
4d16696c52 Don't show thumbs of protected albums when logged out 2015-02-28 21:36:04 +01:00
Tobias Reich
1490dcbe9e Removed md5 from search, renamed code var to hash 2015-02-27 22:39:07 +01:00
Tobias Reich
b226f879b0 Streamlines type of password 2015-02-27 21:16:22 +01:00
Tobias Reich
67dce773e6 Updated Album::getAll 2015-02-27 20:37:24 +01:00
Tobias Reich
083e0962e2 Merge branch 'master' into v3.0.0 2015-02-25 20:55:10 +01:00
Michael Procter
6d25151c78 Add comment as to why conventional plugin triggers not used. 2015-02-24 22:15:58 +00:00
Michael Procter
6bb1859faf Remove 'unlink' - potentially confusing. 2015-02-24 22:13:45 +00:00
Michael Procter
e17cfe79a3 Remove imported photos as promised by warning screen 2015-02-21 08:53:32 +00:00
Michael Procter
b34374fcdb Add plugin trigger for before and after server import 2015-02-21 08:52:33 +00:00
Tobias Reich
810338f13a Syntax adjustments 2015-02-16 20:27:27 +01:00
Tobias Reich
cca2b09d08 Fixed incorrect version in comment 2015-02-08 15:36:29 +01:00
Tobias Reich
3f4bfe253d Removed useless md5 hashing in front-end and added username hashing in back-end 2015-02-08 15:36:13 +01:00
Tobias Reich
0c97151f4f Added direct access protection to database updates 2015-02-08 15:29:06 +01:00
Tobias Reich
5678de1000 New naming for all API calls 2015-02-02 23:36:33 +01:00
Tobias Reich
6cd79ee169 New api object 2015-02-02 21:55:33 +01:00
Tobias Reich
0630554789 Updated copyright 2015-02-01 22:08:37 +01:00
Tobias Reich
8c4f4e925f Added additional Open Graph Metadata #299 2015-01-31 22:28:25 +01:00
Tobias Reich
5d5f86307e Removed redundant mysqli_real_escape_string #290 2015-01-23 22:02:22 +01:00
Tobias Reich
2024ccaf39 Disallow import of the medium-folder 2015-01-23 21:52:19 +01:00
Tobias Reich
6b5e30c443 Removed unused code 2015-01-23 21:41:32 +01:00
Tobias Reich
0da75a6bca Adjusted indention 2015-01-23 21:20:48 +01:00
Tobias Reich
967c66b40a Auto login after installation 2015-01-23 21:00:27 +01:00
Tobias Reich
8a17fa9709 Adjusted indention 2015-01-23 20:50:52 +01:00
Tobias Reich
7a3695e192 Fixed creation of test db #295 2015-01-23 20:50:21 +01:00
Tobias Reich
38a8e9840b Prevent warning of set_charset #291 2015-01-22 21:24:20 +01:00
Tobias Reich
b8caf48d7d $medium should be a tinyint like defined in the database structure 2015-01-22 21:19:55 +01:00
Tobias Reich
9d12f2ce54 Better focal length calculation #278 2014-12-21 22:50:56 +01:00
Tobias Reich
c349b9fe09 Fixed incorrect focal length #277 2014-12-19 21:39:43 +01:00
Tobias Reich
39084c5a5a Improved handling of permission errors with the medium-folder 2014-12-06 14:29:17 +01:00
Tobias Reich
1a463bc04b Use medium photo as open graph image when available #69 2014-11-28 23:22:30 +01:00
Tobias Reich
aad919c96f Fixed version in check-plugin 2014-11-19 23:31:35 +01:00
Tobias Reich
b6123c8257 Add medium folder when missing #67 2014-11-06 23:21:33 +01:00
Tobias Reich
9bdb9174fd Better permission errors #258 2014-11-06 22:25:27 +01:00
Tobias Reich
f6875fc9cc Added comments to clarify the function #258 2014-11-06 21:31:21 +01:00
Tobias Reich
3f2a73181a Added is_readable to permission check #258 2014-11-05 19:50:02 +01:00
Tobias Reich
ba42169397 From " to ' 2014-11-05 15:57:31 +01:00
Tobias Reich
348af5ca3d Updated permission check #260 2014-11-04 10:08:04 +01:00
Tobias Reich
1acb3c2cc6 Comment cleanup 2014-10-21 13:45:11 +02:00
Tobias Reich
09553f2262 Comment cleanup 2014-10-21 13:40:33 +02:00
Tobias Reich
9698629c31 Improved thumb creation and fixed wrong sizes after EXIF rotation 2014-10-18 16:57:09 +02:00
Tobias Reich
9e42e74b3a ntermediate sized images for small screen devices #67 
- Updated version
- Update database
- Write medium to database
- Delete medium on photo delete
- Show medium depending on screen
 2014-10-11 16:09:10 +02:00
Tobias Reich
b458ff2a85 Fixed wrong version in database update error 2014-10-11 16:04:43 +02:00
Tobias Reich
7387187c5c WIP Intermediate sized images for small screen devices #67 2014-10-11 00:52:15 +02:00
Tobias Reich
fc4aebae98 Check filename before including for security reasons 2014-10-09 18:37:03 +02:00
Tobias Reich
47c60a4943 Fixed wrong modified date of the photo files 2014-10-08 22:55:36 +02:00
Tobias Reich
a00928f9de Merge branch 'master' into v2.6.3 2014-10-06 19:52:49 +02:00
Powen Tan
c17cb25960 Fix the issue that search function will return all photos 2014-10-07 01:26:03 +08:00
Tobias Reich
5b865de5a6 Updated version 2014-09-19 23:32:35 +02:00
Tobias Reich
582a8a3f93 Small code adjustments #232 2014-09-17 23:11:02 +02:00
Roman
4ce4048584 Minor tweaks and corrections based on Tobias's comments 2014-09-17 16:42:10 +03:00
Roman
7026ea8603 Merged with the latest pull from the origin 2014-09-16 23:51:54 +03:00
Roman
fa8cad02bb Changed spaces to tabs for indentation 2014-09-16 15:20:35 +03:00
Roman
f886793742 Added proper unicode support for values read from mysql 2014-09-15 22:56:46 +03:00
Roman
e9544e8f8f * Improved performance by caching: 
- The albums view is stored in memory when changing from the albums to the individual album/photo view.
- When viewing photos, the next picture in the current album is preloaded.

* Default sort order of albums is changed from new to old.

* Fixed scroll position when changing from albums to album and vice versa
 2014-09-14 14:48:12 +03:00
Tobias Reich
85c18290e6 Fixed a bug with Database::prepare and ? in user input (#38 #214 #196) 2014-08-31 23:49:25 +02:00
Tobias Reich
b0a4089dc0 Fixed photo download 2014-08-30 20:03:38 +02:00
Tobias Reich
b1607a0ed3 Fixed a notice error for old Lychee users 2014-08-30 19:53:41 +02:00
Tobias Reich
e20ba354da Database::setVersion to update the database version 2014-08-30 19:25:01 +02:00
Tobias Reich
5d9e41d2ae Escape photo download title 2014-08-30 19:18:09 +02:00
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