Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 773c507cda348a5a5518fb5c5daa8ed0de176359 https://github.com/phpmyadmin/phpmyadmin/commit/773c507cda348a5a5518fb5c5daa... Author: Marc Delisle <marc@infomarc.info> Date: 2014-07-31 (Thu, 31 Jul 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.7 release Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 0cd293f5e13aa245e4a57b8d373597cc0e421b6f https://github.com/phpmyadmin/phpmyadmin/commit/0cd293f5e13aa245e4a57b8d3735... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- bug #4505 [security] XSS in view operations page Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 647c9d12e33a6b64e1c3ff7487f72696bdf2dccb https://github.com/phpmyadmin/phpmyadmin/commit/647c9d12e33a6b64e1c3ff7487f7... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/sql.js Log Message: ----------- bug #4501 [security] XSS in table browse page Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 2c45d7caa614afd71dbe3d0f7270f51ce5569614 https://github.com/phpmyadmin/phpmyadmin/commit/2c45d7caa614afd71dbe3d0f7270... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- bug #4502 [security] Self-XSS in enum value editor Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: cd9f302bf7f91a160fe7080f9a612019ef847f1c https://github.com/phpmyadmin/phpmyadmin/commit/cd9f302bf7f91a160fe7080f9a61... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/server_status_monitor.js Log Message: ----------- bug #4503 [security] Self-XSSes in monitor Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 90ddeecf60fc029608b972e490b735f3a65ed0cb https://github.com/phpmyadmin/phpmyadmin/commit/90ddeecf60fc029608b972e490b7... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/tbl_chart.js Log Message: ----------- bug #4504 [security] Self-XSS in query charts Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 3ffc967fb60cf2910cc2f571017e977558c67821 https://github.com/phpmyadmin/phpmyadmin/commit/3ffc967fb60cf2910cc2f571017e... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M libraries/tbl_relation.lib.php Log Message: ----------- bug #4517 [security] XSS in relation view Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 7f977f46335b9707fb5f7bf30d6bdb92263d2233 https://github.com/phpmyadmin/phpmyadmin/commit/7f977f46335b9707fb5f7bf30d6b... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.7.1 release Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 6c9d6a96be2c12a40433a26aa0209abda2cb2f8e https://github.com/phpmyadmin/phpmyadmin/commit/6c9d6a96be2c12a40433a26aa020... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-17 (Sun, 17 Aug 2014) Log Message: ----------- Merge commit '773c507' into QA_4_2 Commit: cfc1e45510bd23a1ba8ce2ef79afcd0edd038efc https://github.com/phpmyadmin/phpmyadmin/commit/cfc1e45510bd23a1ba8ce2ef79af... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 30ffae63cf6da5c52a96f76b16962c51526d2d56 https://github.com/phpmyadmin/phpmyadmin/commit/30ffae63cf6da5c52a96f76b1696... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-17 (Sun, 17 Aug 2014) Changed paths: M ChangeLog M js/functions.js M js/server_status_monitor.js M js/sql.js M js/tbl_chart.js M libraries/tbl_relation.lib.php Log Message: ----------- Merge commit '3ffc967' into QA_4_2 Commit: e0043d959e82302329432e85056b0f528d32bfcd https://github.com/phpmyadmin/phpmyadmin/commit/e0043d959e82302329432e85056b... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-17 (Sun, 17 Aug 2014) Log Message: ----------- Merge commit '7f977f4' into QA_4_2 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a22324185f07...e0043d959e82