6 Jul
2015
6 Jul
'15
1:41 p.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 989199ee47dfa136b0dcbdf2f3beafbe1b62313c
https://github.com/phpmyadmin/phpmyadmin/commit/989199ee47dfa136b0dcbdf2f3b…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M js/chart.js
M js/tbl_chart.js
M templates/tbl_chart.phtml
Log Message:
-----------
bug saved chart image does not have a proper name or an extension
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: db898fb0b6c0aed0af28c817c821a014dde3ae39
https://github.com/phpmyadmin/phpmyadmin/commit/db898fb0b6c0aed0af28c817c82…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
M js/chart.js
M js/tbl_chart.js
M libraries/tbl_chart.lib.php
Log Message:
-----------
bug - Saved chart image does not have a proper name or an extension
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ecc886717dc1d908f86d63709aef1f5e70fa74a0
https://github.com/phpmyadmin/phpmyadmin/commit/ecc886717dc1d908f86d63709ae…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M CONTRIBUTING.md
M ChangeLog
M README
M README.rst
M changelog.php
M composer.json
M doc/conf.py
M doc/developers.rst
M doc/faq.rst
M doc/intro.rst
M doc/other.rst
M doc/setup.rst
M examples/swekey.sample.conf
M index.php
M js/console.js
M libraries/Config.class.php
M libraries/Util.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/export/ExportXml.class.php
M libraries/server_privileges.lib.php
M setup/frames/index.inc.php
M themes.php
Log Message:
-----------
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Conflicts:
ChangeLog
Commit: ef6bb181b764fc3b50801a69e5de1ad36fc0ffcc
https://github.com/phpmyadmin/phpmyadmin/commit/ef6bb181b764fc3b50801a69e5d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: fd2273922075a5d05c52d7c1c87b6f7e9fd9ea42
https://github.com/phpmyadmin/phpmyadmin/commit/fd2273922075a5d05c52d7c1c87…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5187c52fee2f...fd2273922075