aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixes #488 make user input watermark filename safe (#492)jeremydurand2016-06-021-3/+32
|
* fixes #487 replace "Invalid password" by "Invalid username or password" (#489)jeremydurand2016-05-303-5/+7
| | | | | | * fixes #487 replace "Invalid password" by "Invalid username or password" * missing space before exclamation mark
* Merge branch '2.8'plegall2016-05-134-5/+167
|\
| * fixes #479, fallback on srand.php to generate random bytesplegall2016-05-132-1/+160
| | | | | | | | | | | | when random_compat does not find a suitable random generator. srand.php comes from https://github.com/GeorgeArgyros/Secure-random-bytes-in-PHP
| * fixes #415, even if non-picture file, force download with action.phpplegall2016-05-102-4/+7
| |
* | Merge branch '2.8'plegall2016-05-0342-994/+1156
|\|
| * cherry-pick 50 commits from translation2.8.1plegall2016-05-0342-994/+1156
| | | | | | | | git log --reverse --oneline translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 | bash
* | Merge branch '2.8'plegall2016-05-032-13/+10
|\|
| * Merge branch 'bug/466-move-photos-on-new-album' into 2.8plegall2016-05-032-13/+10
| |\
| | * bug #466 fixed, new album listed when moving photosplegall2016-05-022-13/+10
| | | | | | | | | | | | | | | In the batch manager, merge action blocks "associate" and "move" because they follow the same pattern (list of albums + create new).
* | | Merge branch '2.8'plegall2016-05-030-0/+0
|\| |
| * | fixes #440, update search page on SmartPocket themeplegall2016-05-031-38/+85
| |/ | | | | | | ... to include new features of Piwigo 2.7 and 2.8
| * Dates start from 1970 onward.Cosmin Stroe2016-05-021-8/+8
| |
* | fixes #440, update search page on SmartPocket themeplegall2016-05-031-38/+85
| | | | | | | | ... to include new features of Piwigo 2.7 and 2.8
* | Merge branch '2.8'plegall2016-05-0211-26/+1170
|\|
| * bug #470, use a dedicated lib to generate random bytesplegall2016-04-2611-26/+1170
| |
* | Merge pull request #444 from cstroe/fix_date_defaultsPierrick Le Gall2016-05-021-8/+8
|\ \ | | | | | | Fixes #443: Failure to create tables on fresh install with MySQL 5.7
| * | Dates start from 1970 onward.Cosmin Stroe2016-03-211-8/+8
| | |
* | | Merge branch '2.8'plegall2016-03-251-6/+17
|\ \ \ | | |/ | |/|
| * | fixes #439, describe multiple format in embedded docplegall2016-03-251-6/+17
| | |
* | | Merge branch '2.8'plegall2016-03-241-0/+1
|\| | | |/ |/|
| * fixes #442, forgot to include admin functionsplegall2016-03-241-0/+1
| |
* | Merge branch '2.8'plegall2016-03-100-0/+0
|\| | | | | | | "git merge -s ours 2.8" won't really apply change on version number introduced in 9f15161b62a607967127f1dab96b4f18cd66adb7
| * next version is 2.8.1plegall2016-03-101-1/+1
| |
* | Merge branch '2.8'mistic1002016-03-101-1/+1
|\|
| * Fix #436 Call to undefined method Logger::warning in i.phpmistic1002016-03-102-2/+2
| | | | | | | | Change log_lvl for release branch
* | Merge branch '2.8'mistic1002016-03-091-211/+211
|\|
| * Fix #434 Deprecated constructor for LocalSiteReadermistic1002016-03-091-211/+211
| |
* | issue #378 upgrade datatables to 1.10.11modus752016-03-094-1444/+0
| |
* | Merge branch 'feature/378-upgrade-datatables'modus752016-03-0912-8181/+11591
|\ \
| * | upgrade datatables to 1.10.11 (issue #378)modus752016-02-1812-8181/+11591
| | |
* | | next version on master is 2.9.0beta1plegall2016-03-081-1/+1
| | |
* | | Merge branch '2.8'plegall2016-03-080-0/+0
|\ \ \ | | |/ | |/| | | | | | | "git merge -s ours 2.8" suggested by @moy, with only commits d72e825 + 507c932. On next merge from 2.8 to master, these 2 commits won't be merged.
| * | next version is 2.8.02.8.0plegall2016-03-081-1/+1
| | |
| * | change default configuration settings for a stable branch. Developers who ↵plegall2016-03-081-4/+4
|/ / | | | | | | | | | | need previous configuration settings can modify them in their local configuration git cherry-pick 39d3c6883b181317205b2b3e31c20baf116ac3b2
* | cherry-pick 5 commits from translationplegall2016-03-084-8/+18
| | | | | | | | git log --reverse --oneline translation ^master --pretty=format:"git cherry-pick --no-commit %H" f9fecd0..a452994 | bash
* | merge --squash from translation up to f9fecd0be09ea6da405f1ab2a09e09bc51312dd4plegall2016-03-0874-226/+1307
| | | | | | | | git merge --squash is simpler for the first time, then we plan to do cherry-pick
* | fixes #431, all themes/languages get version "auto"plegall2016-03-0875-75/+75
| |
* | new release script, which sets versions for extensionsplegall2016-03-072-8/+105
| |
* | bug fixed, escape language string before insertplegall2016-03-041-2/+6
| |
* | bug fixed: wrong version number at the end of upgradeplegall2016-03-041-1/+2
| |
* | dynamic list of image_types from historyplegall2016-02-291-1/+1
| | | | | | | | | | | | ... because a plugin can add types in history.image_type code by @ddtddt
* | fixes #425, update piecon.jsplegall2016-02-263-2/+190
| |
* | copyright watermark for 2016plegall2016-02-261-0/+0
| |
* | feature #321, set status with pwg.categories.setInfosplegall2016-02-232-0/+29
| |
* | feature #321, pwg.categories.getList returns statusplegall2016-02-232-5/+5
| |
* | fixes #322, add {m4v,ogg,ogv,webm,webmv} for ffmpeg on uploadplegall2016-02-231-1/+1
| |
* | Merge branch 'feature/423-upgrade-2.8'plegall2016-02-233-3/+133
|\ \ | |/ |/|
| * feature #423, upgrade script to 2.8plegall2016-02-233-3/+133
|/
* bug #325, use original TIFF for EXIF/IPTC readplegall2016-02-161-0/+22
|