Commit Graph

9908 Commits

Author SHA1 Message Date
plegall 2543002c8b Merge branch '2.8' 2016-05-03 16:12:56 +02:00
plegall f0d29d9134 cherry-pick 50 commits from translation
git log --reverse --oneline  translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 | bash
2.8.1
2016-05-03 15:55:16 +02:00
plegall 105ccb8d0f Merge branch '2.8' 2016-05-03 15:16:34 +02:00
plegall c5af8c4922 Merge branch 'bug/466-move-photos-on-new-album' into 2.8 2016-05-03 15:14:18 +02:00
plegall 3f96dc19f0 Merge branch '2.8' 2016-05-03 15:07:08 +02:00
plegall e4a3b92fa4 fixes #440, update search page on SmartPocket theme
... to include new features of Piwigo 2.7 and 2.8
2016-05-03 15:04:42 +02:00
plegall b544ee3948 fixes #440, update search page on SmartPocket theme
... to include new features of Piwigo 2.7 and 2.8
2016-05-03 15:02:29 +02:00
plegall d1cb1f86a8 bug #466 fixed, new album listed when moving photos
In the batch manager, merge action blocks "associate" and "move" because they
follow the same pattern (list of albums + create new).
2016-05-02 16:09:50 +02:00
Cosmin Stroe 89e0eed10a Dates start from 1970 onward. 2016-05-02 13:09:38 +02:00
plegall 7ea9cf9075 Merge branch '2.8' 2016-05-02 13:09:12 +02:00
Pierrick Le Gall cfa7bf2228 Merge pull request #444 from cstroe/fix_date_defaults
Fixes #443: Failure to create tables on fresh install with MySQL 5.7
2016-05-02 12:57:37 +02:00
plegall f51ee90c66 bug #470, use a dedicated lib to generate random bytes 2016-04-26 11:07:44 +02:00
plegall bffd582bf7 Merge branch '2.8' 2016-03-25 15:37:39 +01:00
plegall a3c46de751 fixes #439, describe multiple format in embedded doc 2016-03-25 15:32:10 +01:00
plegall 97f5d13ff3 Merge branch '2.8' 2016-03-24 09:54:45 +01:00
plegall c9c10bd524 fixes #442, forgot to include admin functions 2016-03-24 09:52:40 +01:00
Cosmin Stroe c7bedefa30 Dates start from 1970 onward. 2016-03-21 03:24:24 -05:00
plegall 8cfee1dbc5 Merge branch '2.8'
"git merge -s ours 2.8" won't really apply change on version number introduced in 9f15161b62
2016-03-10 20:42:18 +01:00
plegall 9f15161b62 next version is 2.8.1 2016-03-10 20:41:30 +01:00
mistic100 a32c643cf2 Merge branch '2.8' 2016-03-10 19:36:29 +01:00
mistic100 eb1fb63128 Fix #436 Call to undefined method Logger::warning in i.php
Change log_lvl for release branch
2016-03-10 19:33:57 +01:00
mistic100 40dd6bc2ff Merge branch '2.8' 2016-03-09 22:08:31 +01:00
mistic100 de99e91b40 Fix #434 Deprecated constructor for LocalSiteReader 2016-03-09 22:07:32 +01:00
modus75 8c1a4a181c issue #378 upgrade datatables to 1.10.11 2016-03-09 22:01:25 +01:00
modus75 7dd5029fc6 Merge branch 'feature/378-upgrade-datatables' 2016-03-09 21:54:47 +01:00
plegall 4f60f4508c next version on master is 2.9.0beta1 2016-03-08 15:41:06 +01:00
plegall f0ac27292e Merge branch '2.8'
"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.
2016-03-08 15:34:51 +01:00
plegall 507c932db9 next version is 2.8.0 2.8.0 2016-03-08 15:32:30 +01:00
plegall d72e8256a1 change default configuration settings for a stable branch. Developers who need previous configuration settings can modify them in their local configuration
git cherry-pick 39d3c6883b
2016-03-08 15:31:07 +01:00
plegall 234c132a1f cherry-pick 5 commits from translation
git log --reverse --oneline  translation ^master --pretty=format:"git cherry-pick --no-commit %H" f9fecd0..a452994 | bash
2016-03-08 15:27:52 +01:00
plegall 2e071ba4a1 merge --squash from translation up to f9fecd0be0
git merge --squash is simpler for the first time, then we plan to do cherry-pick
2016-03-08 10:51:10 +01:00
plegall d80d853a23 fixes #431, all themes/languages get version "auto" 2016-03-08 10:13:13 +01:00
plegall 7f672711a0 new release script, which sets versions for extensions 2016-03-07 20:59:19 +01:00
plegall e2bf31e482 bug fixed, escape language string before insert 2016-03-04 15:26:16 +01:00
plegall 91276709b4 bug fixed: wrong version number at the end of upgrade 2016-03-04 14:27:20 +01:00
plegall f1f206f1bd dynamic list of image_types from history
... because a plugin can add types in history.image_type

code by @ddtddt
2016-02-29 18:30:42 +01:00
plegall 1928125edc fixes #425, update piecon.js 2016-02-26 19:39:36 +01:00
plegall ca910609e9 copyright watermark for 2016 2016-02-26 16:06:54 +01:00
plegall bbe117080d feature #321, set status with pwg.categories.setInfos 2016-02-23 15:58:31 +01:00
plegall e936d291eb feature #321, pwg.categories.getList returns status 2016-02-23 15:35:49 +01:00
plegall be671c1401 fixes #322, add {m4v,ogg,ogv,webm,webmv} for ffmpeg on upload 2016-02-23 13:50:52 +01:00
plegall 01d923bcb0 Merge branch 'feature/423-upgrade-2.8' 2016-02-23 12:18:58 +01:00
plegall 90be0782ff feature #423, upgrade script to 2.8 2016-02-23 10:44:32 +01:00
modus75 8b51eb1b40 upgrade datatables to 1.10.11 (issue #378) 2016-02-18 21:33:06 +01:00
plegall 8ffed40003 bug #325, use original TIFF for EXIF/IPTC read 2016-02-16 17:15:10 +01:00
plegall 1fe2631774 fixes #290, avoid error on MySQL insert with ipv6 2016-02-16 14:56:32 +01:00
plegall a9a17a27cb feature #295, proxy support for fetchRemote 2016-02-15 15:02:16 +01:00
plegall e03dff12b1 Merge branch 'feature/355-search-by-words-on-tags' 2016-02-15 14:50:57 +01:00
plegall 8897e75fc2 feature #355, OR with other "search by word" results
+ use $logger instead of old style "echo" for debugging
2016-02-13 19:31:26 +01:00
plegall 713bc49746 feature #355, apply search by word on tags
we "simulate" a search by tag, but we still perform a "search by words" AND "search by tags", which lead to different result compared to "word on title OR file OR description OR tags"
2016-02-13 18:36:55 +01:00