Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50d1a4884306ae6705f0bb665ba71da24089b6fe https://github.com/phpmyadmin/phpmyadmin/commit/50d1a4884306ae6705f0bb665ba7... Author: Rouslan Placella rouslan@placella.com Date: 2012-08-09 (Thu, 09 Aug 2012)

Changed paths: M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Fix for trigger page vulnerability, see PMASA-2012-4

Commit: ee306681d0d5ac09b6fc62a7d573020af083e856 https://github.com/phpmyadmin/phpmyadmin/commit/ee306681d0d5ac09b6fc62a7d573... Author: Marc Delisle marc@infomarc.info Date: 2012-08-09 (Thu, 09 Aug 2012)

Changed paths: M js/db_structure.js M js/functions.js

Log Message: ----------- Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4

Commit: dca22c5046aa16899042592b40a0af7b5c4f1fc7 https://github.com/phpmyadmin/phpmyadmin/commit/dca22c5046aa16899042592b40a0... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2012-08-10 (Fri, 10 Aug 2012)

Changed paths: M tbl_create.php

Log Message: ----------- [security] properly escape name of newly created table, see PMASA-2012-4

Commit: 1aec25f5f2163029da51da39a1d13dcb20fb00ea https://github.com/phpmyadmin/phpmyadmin/commit/1aec25f5f2163029da51da39a1d1... Author: Rouslan Placella rouslan@placella.com Date: 2012-08-10 (Fri, 10 Aug 2012)

Changed paths: M libraries/rte/rte_triggers.lib.php

Log Message: ----------- [security] properly escape query error message when creating new trigger, see PMASA-2012-4

Commit: 4612247ac1c42233119d83fe3a66735cff16f212 https://github.com/phpmyadmin/phpmyadmin/commit/4612247ac1c42233119d83fe3a66... Author: Nathan Wu uuuyyttu@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M po/zh_TW.po

Log Message: ----------- Translated using Weblate.

Commit: e084583f4e6b89eed2b83eead6a8b09b26fa168c https://github.com/phpmyadmin/phpmyadmin/commit/e084583f4e6b89eed2b83eead6a8... Author: Ashiyane Digital Security Team HeXa.ashiyane@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M po/fa.po

Log Message: ----------- Translated using Weblate.

Commit: 7444b78a45aab4e7e158042a2d0811ba3e522d63 https://github.com/phpmyadmin/phpmyadmin/commit/7444b78a45aab4e7e158042a2d08... Author: Anusuk Sangubon jaideejung007@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M po/th.po

Log Message: ----------- Translated using Weblate.

Commit: 10ce4259e677386cd7f1071a51cd9ffe68e278b1 https://github.com/phpmyadmin/phpmyadmin/commit/10ce4259e677386cd7f1071a51cd... Author: Weblate noreply@weblate.org Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M ChangeLog M libraries/Table.class.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Commit: d56335691cf1c1d8be3453904a885038da0a8c93 https://github.com/phpmyadmin/phpmyadmin/commit/d56335691cf1c1d8be3453904a88... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M js/tbl_gis_visualization.js

Log Message: ----------- [security] Properly escape content of tooltips in GIS visualization

Commit: d84b98d34012cc5986fe84f1871b0396990391ef https://github.com/phpmyadmin/phpmyadmin/commit/d84b98d34012cc5986fe84f1871b... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js

Log Message: ----------- Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4

Commit: e094f34bed5ef3fd9a4a3cd08e01ff59a260c730 https://github.com/phpmyadmin/phpmyadmin/commit/e094f34bed5ef3fd9a4a3cd08e01... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M tbl_create.php

Log Message: ----------- [security] properly escape name of newly created table, see PMASA-2012-4

Commit: cc97d82fd15771dfee07445323db3473c2e2da60 https://github.com/phpmyadmin/phpmyadmin/commit/cc97d82fd15771dfee07445323db... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php

Log Message: ----------- 3.4.11.1 release

Commit: 46819b311ca25848d0ec4fe9425817b6f9277ec1 https://github.com/phpmyadmin/phpmyadmin/commit/46819b311ca25848d0ec4fe94258... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js M tbl_create.php

Log Message: ----------- Merge branch 'QA_3_4' into MAINT_3_5_2

Commit: 6f200703a3f9e16126822b6add2138f93cec2aac https://github.com/phpmyadmin/phpmyadmin/commit/6f200703a3f9e16126822b6add21... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog

Log Message: ----------- Fix merge conflicts

Commit: cdf9bf3b83d789e3ccb4fe9d486d37634ab6e1bf https://github.com/phpmyadmin/phpmyadmin/commit/cdf9bf3b83d789e3ccb4fe9d486d... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M js/db_structure.js M tbl_create.php

Log Message: ----------- Merge branch 'MAINT_3_5_2' into QA_3_5

Commit: dde8fc471d278a40e0dfa157045bfc0d9fa3e85d https://github.com/phpmyadmin/phpmyadmin/commit/dde8fc471d278a40e0dfa157045b... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M po/th.po M tbl_create.php

Log Message: ----------- Merge branch 'QA_3_5'

Commit: 6c73243bb01d3dee38d5670c10f9fb119b353dd1 https://github.com/phpmyadmin/phpmyadmin/commit/6c73243bb01d3dee38d5670c10f9... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M js/db_structure.js M js/functions.js M js/tbl_gis_visualization.js M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Merge remote branch 'security/MAINT_3_5_2-security' into MAINT_3_5_2

Commit: 5289a032cec12ef9f840652a84efc0af7f6c9bbe https://github.com/phpmyadmin/phpmyadmin/commit/5289a032cec12ef9f840652a84ef... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php

Log Message: ----------- 3.5.2.2 release

Commit: 9ca1bee3c286a6176573487fdae2249e30f7f95d https://github.com/phpmyadmin/phpmyadmin/commit/9ca1bee3c286a6176573487fdae2... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M js/db_structure.js M js/functions.js M js/tbl_gis_visualization.js M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Fix merge conflicts

Commit: 7bf3fe03a418268a774f447c2d036538df5b31d7 https://github.com/phpmyadmin/phpmyadmin/commit/7bf3fe03a418268a774f447c2d03... Author: Marc Delisle marc@infomarc.info Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M js/tbl_gis_visualization.js M libraries/rte/rte_triggers.lib.php

Log Message: ----------- Merge branch 'QA_3_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0a9a7e8530ca...7bf3fe03a418