Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cb7c703c03f656debcea2a16468bd53660fc888e https://github.com/phpmyadmin/phpmyadmin/commit/cb7c703c03f656debcea2a16468b... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php M libraries/structure.lib.php
Log Message: ----------- Fix XSS in recent/favorite tables list feature
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 42a65a5ab6166c4ce15cf4e74e80b7acca7c8e08 https://github.com/phpmyadmin/phpmyadmin/commit/42a65a5ab6166c4ce15cf4e74e80... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php
Log Message: ----------- Trim some trailing space
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: d18a2dd9faad7e0e96df799b59e16ef587afb838 https://github.com/phpmyadmin/phpmyadmin/commit/d18a2dd9faad7e0e96df799b59e1... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php
Log Message: ----------- Fix XSS in PMA_RecentFavoriteTable::getHtmlList()
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: d4f754c937f9e2c0beadff5b2e38215dde1d6a79 https://github.com/phpmyadmin/phpmyadmin/commit/d4f754c937f9e2c0beadff5b2e38... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M libraries/navigation/Navigation.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php
Log Message: ----------- Fix XSS in Hide navigation items feature
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: c68ed5c51ba836f3beb1deec29d91d158acbde3d https://github.com/phpmyadmin/phpmyadmin/commit/c68ed5c51ba836f3beb1deec29d9... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Add Changelog section for 4.2.4.0, list bugs 4464, 4465
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 782fe7a1e579f571111acaa852cb0d328aaaf119 https://github.com/phpmyadmin/phpmyadmin/commit/782fe7a1e579f571111acaa852cb... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php M libraries/navigation/Navigation.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php M libraries/structure.lib.php
Log Message: ----------- Merge commit 'd4f754c' into QA_4_2
Commit: aea604f8508b47ce1331acd360a15ee5398ce809 https://github.com/phpmyadmin/phpmyadmin/commit/aea604f8508b47ce1331acd360a1... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflicts
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aebfcfdc9f9f...aea604f8508b