aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/259-album-notify-users'plegall2016-01-114-43/+248
|\
| * feature #259, notify an album to a list of usersplegall2016-01-064-42/+247
| | | | | | | | ... and not just to a group
* | Merge branch 'feature/398-refresh-user-list' (which should also include ↵plegall2016-01-114-27/+48
|\ \ | | | | | | | | | branch 'feature/397-edit-user-popin')
| * | feature #397, l10nplegall2016-01-092-0/+2
| | |
| * | feature #397, close popin when user deletedplegall2016-01-091-1/+1
| | |
| * | feature #397, bigger padding inside popinplegall2016-01-091-1/+1
| | |
| * | move new CSS rules to theme.css instead of {html_style}plegall2016-01-092-14/+15
| | |
| * | feature #398, update user list when user is modifiedplegall2016-01-091-1/+4
| | |
| * | feature #397, edit user in a popinplegall2016-01-091-26/+41
| | |
* | | Typo in slideshow templateDamien Sorel2016-01-101-1/+1
|/ /
* | Merge branch 'feature/392-auth-keys'plegall2016-01-0614-54/+372
|\ \
| * | feature #392, bug fixed on footer linkplegall2016-01-061-0/+4
| | | | | | | | | | | | Use auth_key in mail cache key to avoid using the auth key of the first user.
| * | add auth_key in mail footer for pwg_mail_groupplegall2016-01-061-1/+7
| |/
| * feature #392, add authentication key in NBM mailsplegall2016-01-045-33/+91
| | | | | | | | | | | | There are many links in NBM (Notification By Mail, see screen [Administration > Users > Notification]). I had to change several functions to take this authentication key into account.
| * feature #392, authentication keys, history logplegall2016-01-043-1/+45
| | | | | | | | | | | | | | | | | | When a user successfully performs an authentication with an auth_key, Piwigo registers it in the history table. For now, it is not shown/searchable in the history screen, but we can add it in the future and we can provide a plugin with specific details about authentication keys usage.
| * forgotten to give user_status on recursive call in create_user_auth_key, bug ↵plegall2016-01-011-1/+1
| | | | | | | | detected by @mistic100
| * feature #392, authentication keys, album notificationplegall2015-12-317-21/+181
| | | | | | | | | | | | | | | | * On album notification (for a group), sends one distinct email for each user with a new authentication key. * When someone clicks the link with auth=<key> in URL, if the user is not already connected, Piwigo will automatically connect the user.
| * feature #392, authentication key, new tableplegall2015-12-311-0/+46
| |
* | Merge pull request #390 from thunderrabbit/readme-typoPierrick Le Gall2016-01-041-4/+4
|\ \ | | | | | | Fixed a few typos in README.md
| * | cleanup: fixed some spelling errors in READMERob Nugen2015-12-311-3/+3
| | |
| * | cleanup: fixed typo in README.mdRob Nugen2015-12-311-1/+1
| |/
* | Merge pull request #391 from thunderrabbit/httpsDamien Sorel2015-12-302-8/+8
|\ \ | |/ |/| Support HTTPS in ws.htm and triggers_list.php
| * removed http: from URLs wich support httpsMssr Tiger for Miss Tiger2015-12-301-4/+4
| |
| * removed http: from URLs wich support httpsMssr Tiger for Miss Tiger2015-12-301-4/+4
|/
* Merge branch 'bug/385-php7'plegall2015-12-30232-13461/+22649
|\
| * bug #385 __construct for PHP 7 compatibilityplegall2015-12-202-3/+3
| |
| * PHP7 compatibility, use PasswordHash from Wordpress 4.4 (PHP5+ constructor)plegall2015-12-201-17/+40
| |
| * changes on Smarty side breaks all prefilter in Piwigoplegall2015-12-201-1/+5
| | | | | | | | | | It would be better to modify the way template.class.php registers prefilters but I didn't find the appropriate data structure.
| * update Smarty to official version 3.1.28plegall2015-12-159-37/+46
| |
| * bug #385 PHP7 compatibilityplegall2015-12-101-2/+20
| | | | | | | | * array concatenation no longer seem to work
| * bug #385 compatibility with PHP7plegall2015-12-1011-23/+20
| | | | | | | | | | | | * replace old-style constructor with PHP5-style constructor (__construct) * do not call set_magic_quotes_runtime() any longer * avoid automatic conversion from array to string
| * bug #385 update to smarty-3.1.28-dev (from Github)plegall2015-12-10217-13416/+22553
| |
* | Merge branch 'feature/379-multiple-format'plegall2015-12-3015-17/+439
|\ \
| * | feature #379, multiple format, download original as formatplegall2015-12-301-25/+22
| | | | | | | | | | | | If multiple format feature is enabled, always put the original file in the formats list.
| * | feature #379, multiple format, bug fixed on syncplegall2015-12-231-1/+14
| | | | | | | | | | | | New formats were not detected if the photo had not already at least one format.
| * | feature #379, multiple format, consider the original as a formatplegall2015-12-222-3/+15
| | |
| * | feature #379, multiple format, add psd file extension by defaultplegall2015-12-201-1/+1
| | |
| * | use window.SwitchBox instead of duplicating codeplegall2015-12-201-13/+1
| | |
| * | feature #379, multiple format, no browser cacheplegall2015-12-202-2/+2
| | | | | | | | | | | | No need random string in URL to avoid browser cache, coding tip by @modus75
| * | feature #379, multiple format, labelsplegall2015-12-202-1/+8
| | | | | | | | | | | | Ability to customize, with $lang['format CR2'] = 'RAW Canon' (in LocalFiles Editor) for example
| * | feature #379, multiple format, hide formats when disabledplegall2015-12-172-12/+15
| | |
| * | feature #379, multiple format, hide url on download linkplegall2015-12-171-0/+2
| | |
| * | indentationplegall2015-12-171-40/+40
| | |
| * | feature #379 multiple format, step 3: add/removeplegall2015-12-163-44/+124
| | | | | | | | | | | | | | | * during sync, Piwigo will detect new/removed formats for an existing photo * multiple formats features is disabled by default
| * | feature #379 multiple format, step 2: download formatsplegall2015-12-077-3/+132
| | | | | | | | | | | | | | | * if formats are available, replace the download link on picture.php by a switchBox with all formats * register format in the history table for future statistics
| * | feature #379 multiple format, step 1: add formatsplegall2015-12-0310-0/+191
| | | | | | | | | | | | | | | | | | * new table piwigo_image_format (each photo can have 0 to many formats) * only compatible with synchronization for now. Formats must be in sub-directory pwg_format * formats are visible on edition page only for now
* | | feature #346, give chunk size in pwg.session.getStatus responseplegall2015-12-201-0/+2
| | |
* | | Merge pull request #371 from erAck/masterDamien Sorel2015-12-141-2/+2
|\ \ \ | |_|/ |/| | fix #367 - do not specialize numeric tag to 'id-tag' URL
| * | fix #367 - do not specialize numeric tag to 'id-tag' URLEike Rathke2015-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | Apparently there is no reason in make_section_in_url() to "escape" a numeric URL for a tags section if tag_url_style is 'tag'. In parse_section_url() tag_url_style is checked, and if 'tag' the URL token is used.
* | | fixes #384 use built-in functions to set charsetplegall2015-12-082-3/+5
| | |