Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 01c553a795e92257b1dadda0e9e90efcd69f166d https://github.com/phpmyadmin/phpmyadmin/commit/01c553a795e92257b1dadda0e9e9... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-31 (Sun, 31 Aug 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.8 release Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 33b39f9f1dd9a4d27856530e5ac004e23b30e8ac https://github.com/phpmyadmin/phpmyadmin/commit/33b39f9f1dd9a4d27856530e5ac0... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M ChangeLog M js/ajax.js A js/whitelist.php M libraries/Header.class.php M libraries/Scripts.class.php Log Message: ----------- bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: c0548df2f9eeb9500be73137b77e9ad159637f57 https://github.com/phpmyadmin/phpmyadmin/commit/c0548df2f9eeb9500be73137b77e... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Log Message: ----------- Merge commit '01c553a' into QA_4_2 Commit: f2be36ae806429aa215a3b24779330921af4f25e https://github.com/phpmyadmin/phpmyadmin/commit/f2be36ae806429aa215a3b247793... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M ChangeLog M js/ajax.js A js/whitelist.php M libraries/Header.class.php M libraries/Scripts.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ef714febec3...f2be36ae8064