piwigo - copy of piwigo repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixes #488 make user input watermark filename safe (#492)	jeremydurand	2016-06-02	1	-3/+32
\|
*	fixes #487 replace "Invalid password" by "Invalid username or password" (#489)	jeremydurand	2016-05-30	3	-5/+7
\| \| \| \| \| \|	* fixes #487 replace "Invalid password" by "Invalid username or password" * missing space before exclamation mark
*	Merge branch '2.8'	plegall	2016-05-13	4	-5/+167
\|\
\| *	fixes #479, fallback on srand.php to generate random bytes	plegall	2016-05-13	2	-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.php	plegall	2016-05-10	2	-4/+7
\| \|
* \|	Merge branch '2.8'	plegall	2016-05-03	42	-994/+1156
\|\\|
\| *	cherry-pick 50 commits from translation2.8.1	plegall	2016-05-03	42	-994/+1156
\| \| \| \| \| \| \| \|	git log --reverse --oneline translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 \| bash
* \|	Merge branch '2.8'	plegall	2016-05-03	2	-13/+10
\|\\|
\| *	Merge branch 'bug/466-move-photos-on-new-album' into 2.8	plegall	2016-05-03	2	-13/+10
\| \|\
\| \| *	bug #466 fixed, new album listed when moving photos	plegall	2016-05-02	2	-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'	plegall	2016-05-03	0	-0/+0
\|\\| \|
\| * \|	fixes #440, update search page on SmartPocket theme	plegall	2016-05-03	1	-38/+85
\| \|/ \| \| \| \| \| \|	... to include new features of Piwigo 2.7 and 2.8
\| *	Dates start from 1970 onward.	Cosmin Stroe	2016-05-02	1	-8/+8
\| \|
* \|	fixes #440, update search page on SmartPocket theme	plegall	2016-05-03	1	-38/+85
\| \| \| \| \| \| \| \|	... to include new features of Piwigo 2.7 and 2.8
* \|	Merge branch '2.8'	plegall	2016-05-02	11	-26/+1170
\|\\|
\| *	bug #470, use a dedicated lib to generate random bytes	plegall	2016-04-26	11	-26/+1170
\| \|
* \|	Merge pull request #444 from cstroe/fix_date_defaults	Pierrick Le Gall	2016-05-02	1	-8/+8
\|\ \ \| \| \| \| \| \|	Fixes #443: Failure to create tables on fresh install with MySQL 5.7
\| * \|	Dates start from 1970 onward.	Cosmin Stroe	2016-03-21	1	-8/+8
\| \| \|
* \| \|	Merge branch '2.8'	plegall	2016-03-25	1	-6/+17
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	fixes #439, describe multiple format in embedded doc	plegall	2016-03-25	1	-6/+17
\| \| \|
* \| \|	Merge branch '2.8'	plegall	2016-03-24	1	-0/+1
\|\\| \| \| \|/ \|/\|
\| *	fixes #442, forgot to include admin functions	plegall	2016-03-24	1	-0/+1
\| \|
* \|	Merge branch '2.8'	plegall	2016-03-10	0	-0/+0
\|\\| \| \| \| \| \| \|	"git merge -s ours 2.8" won't really apply change on version number introduced in 9f15161b62a607967127f1dab96b4f18cd66adb7
\| *	next version is 2.8.1	plegall	2016-03-10	1	-1/+1
\| \|
* \|	Merge branch '2.8'	mistic100	2016-03-10	1	-1/+1
\|\\|
\| *	Fix #436 Call to undefined method Logger::warning in i.php	mistic100	2016-03-10	2	-2/+2
\| \| \| \| \| \| \| \|	Change log_lvl for release branch
* \|	Merge branch '2.8'	mistic100	2016-03-09	1	-211/+211
\|\\|
\| *	Fix #434 Deprecated constructor for LocalSiteReader	mistic100	2016-03-09	1	-211/+211
\| \|
* \|	issue #378 upgrade datatables to 1.10.11	modus75	2016-03-09	4	-1444/+0
\| \|
* \|	Merge branch 'feature/378-upgrade-datatables'	modus75	2016-03-09	12	-8181/+11591
\|\ \
\| * \|	upgrade datatables to 1.10.11 (issue #378)	modus75	2016-02-18	12	-8181/+11591
\| \| \|
* \| \|	next version on master is 2.9.0beta1	plegall	2016-03-08	1	-1/+1
\| \| \|
* \| \|	Merge branch '2.8'	plegall	2016-03-08	0	-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.0	plegall	2016-03-08	1	-1/+1
\| \| \|
\| * \|	change default configuration settings for a stable branch. Developers who ↵	plegall	2016-03-08	1	-4/+4
\|/ / \| \| \| \| \| \| \| \| \| \|	need previous configuration settings can modify them in their local configuration git cherry-pick 39d3c6883b181317205b2b3e31c20baf116ac3b2
* \|	cherry-pick 5 commits from translation	plegall	2016-03-08	4	-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 f9fecd0be09ea6da405f1ab2a09e09bc51312dd4	plegall	2016-03-08	74	-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"	plegall	2016-03-08	75	-75/+75
\| \|
* \|	new release script, which sets versions for extensions	plegall	2016-03-07	2	-8/+105
\| \|
* \|	bug fixed, escape language string before insert	plegall	2016-03-04	1	-2/+6
\| \|
* \|	bug fixed: wrong version number at the end of upgrade	plegall	2016-03-04	1	-1/+2
\| \|
* \|	dynamic list of image_types from history	plegall	2016-02-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	... because a plugin can add types in history.image_type code by @ddtddt
* \|	fixes #425, update piecon.js	plegall	2016-02-26	3	-2/+190
\| \|
* \|	copyright watermark for 2016	plegall	2016-02-26	1	-0/+0
\| \|
* \|	feature #321, set status with pwg.categories.setInfos	plegall	2016-02-23	2	-0/+29
\| \|
* \|	feature #321, pwg.categories.getList returns status	plegall	2016-02-23	2	-5/+5
\| \|
* \|	fixes #322, add {m4v,ogg,ogv,webm,webmv} for ffmpeg on upload	plegall	2016-02-23	1	-1/+1
\| \|
* \|	Merge branch 'feature/423-upgrade-2.8'	plegall	2016-02-23	3	-3/+133
\|\ \ \| \|/ \|/\|
\| *	feature #423, upgrade script to 2.8	plegall	2016-02-23	3	-3/+133
\|/
*	bug #325, use original TIFF for EXIF/IPTC read	plegall	2016-02-16	1	-0/+22
\|