aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '2.8'HEADmasterplegall2016-08-291-0/+13
|\
| * Merge branch 'bug/376-mysql-5.7-order_by' into 2.8plegall2016-08-291-0/+13
| |\
| | * typo fixed in commentplegall2016-07-261-1/+1
| | |
| | * fixes #376, remove option ONLY_FULL_GROUP_BY in sql_modeplegall2016-07-261-0/+13
| | | | | | | | | | | | based on solution provided by Mercury_LABBS on piwigo.org forums
* | | Merge branch 2.8, which is a "fake" mergeplegall2016-08-290-0/+0
|\| | | | | | | | | | | git merge -s ours 2.8 : to avoid merging version number change
| * | next version is 2.8.3plegall2016-08-291-1/+1
| |/
* | fixes #469, add download link on photo edit/admin pageplegall2016-07-1816-92/+183
| |
* | fixes #490, less visible borders on tags by letterplegall2016-07-131-0/+17
| |
* | Merge branch 2.8, which is a "fake" mergeplegall2016-07-070-0/+0
|\| | | | | | | git merge -s ours 2.8 : to avoid merging version number change
| * next release is 2.8.22.8.22.8plegall2016-07-071-1/+1
| |
* | Merge branch '2.8'plegall2016-07-0710-22/+160
|\|
| * cheery-pick 8 commits from translationplegall2016-07-056-9/+117
| | | | | | | | git log --reverse --oneline translation ^master --pretty=format:"git cherry-pick --no-commit %H" c7465d6..39ad66c | bash
| * fixes #270 add password reset form to smartpocketplegall2016-07-052-6/+33
| |
| * bug #476, set http code to 401 only when not redirectingplegall2016-07-051-1/+2
|
| * fixes #476, in case of guest_access=false, redirect_http instead of ↵plegall2016-05-301-2/+6
| | | | | | | | redirect_html
* | feature #478, improve performancesplegall2016-07-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | By reducing frequency of update on user_infos.last_visit. Instead of updating on each page visit, we wait at least a session length, which is 30 minutes by default. @modus75 suggested to use function log_user instead, which is a better design. Unfortunately it would lead to much less accuracy, because on many systems PHP sessions are never purged (Debian with default settings). It would be possible to come back everyday and never update the last_visit, as long as the web browser is not closed.
* | Merge branch 'bug/452-image-tags-lastmodified'plegall2016-06-232-1/+126
|\ \
| * | fixes #452, update images.lastmodified when changing tag listplegall2016-06-232-1/+126
| /
* | Merge branch 'feature/478-last-visit'plegall2016-06-235-31/+119
| |
* | typo fixed, missing commaplegall2016-05-311-1/+1
| |
* | fixes #478, add new column user_infos.last_visitplegall2016-05-315-31/+119
| | | | | | | | | | | | This will speed up user edit popin opening, by avoiding to search in history for the last user visit. The column user_infos.last_visit_from_history true/false says if the last_visit has already been search in history (to avoid making it twice). I could have implemented the search of last_visit for all users in the migration task 149 but in case of many users and long history, it would have taken years to execute...
* | 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
* 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 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
* 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
|