August 2012 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bb9820: Fix merge conflicts for security patch
by Marc Delisle 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bb982053899718f94471ce3f5728ab963c11dda3 https://github.com/phpmyadmin/phpmyadmin/commit/bb982053899718f94471ce3f572… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M js/db_structure.js Log Message: ----------- Fix merge conflicts for security patch

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c26356: oop: fix properties object in plugin_interface
by Michal Čihař 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c26356e9cadef294b1b9a958f5b8d3514f6e4293 https://github.com/phpmyadmin/phpmyadmin/commit/c26356e9cadef294b1b9a958f5b… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M libraries/plugin_interface.lib.php Log Message: ----------- oop: fix properties object in plugin_interface Commit: 8ebbab0c30f5808913eea8850ba63c720746f75f https://github.com/phpmyadmin/phpmyadmin/commit/8ebbab0c30f5808913eea8850ba… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M libraries/plugins/export/ExportSql.class.php Log Message: ----------- oop: fix getTableDefStandIn for ExportSql Commit: 2df005b9e525e9393605abe6cfc8e0b536a542cc https://github.com/phpmyadmin/phpmyadmin/commit/2df005b9e525e9393605abe6cfc… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportSql.class.php Log Message: ----------- Merge remote-tracking branch 'alex/plugins-and-OOP' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2eeddb7c5f80...2df005b9e525

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1ca869: test class for gettext_reader
by Michal Čihař 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1ca8692aba9110f362e3a855faca422aff5d7845 https://github.com/phpmyadmin/phpmyadmin/commit/1ca8692aba9110f362e3a855fac… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-08-10 (Fri, 10 Aug 2012) Changed paths: M test/classes/PMA_Error_Handler_test.php M test/libraries/PMA_sanitize_test.php A test/libraries/php-gettext/PMA_gettext_test.php Log Message: ----------- test class for gettext_reader Commit: ab79c0897d5e202fb90cc08fe5225778c7d065d4 https://github.com/phpmyadmin/phpmyadmin/commit/ab79c0897d5e202fb90cc08fe52… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-08-10 (Fri, 10 Aug 2012) Changed paths: A test/libraries/php-gettext/PMA_StreamReader_test.php Log Message: ----------- Test class for Commit: 2eeddb7c5f80dcbbca989cdd904ed584d97128f5 https://github.com/phpmyadmin/phpmyadmin/commit/2eeddb7c5f80dcbbca989cdd904… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M test/classes/PMA_Error_Handler_test.php M test/libraries/PMA_sanitize_test.php A test/libraries/php-gettext/PMA_StreamReader_test.php A test/libraries/php-gettext/PMA_gettext_test.php Log Message: ----------- Merge remote-tracking branch 'yasitha/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c1a70c49bf2d...2eeddb7c5f80

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bd18f6: Translated using Weblate.
by Weblate 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bd18f6fb26e03187eda5d2359d1f2cdc3e7786cf https://github.com/phpmyadmin/phpmyadmin/commit/bd18f6fb26e03187eda5d2359d1… Author: shanyan baishui <Siramizu(a)gmail.com> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate. Commit: c1a70c49bf2d19ffc998ad8a9867ab5a9b136192 https://github.com/phpmyadmin/phpmyadmin/commit/c1a70c49bf2d19ffc998ad8a986… Author: Weblate <noreply(a)weblate.org> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M libraries/DisplayResults.class.php M server_status.php M test/classes/PMA_DisplayResults_test.php M themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a8c9bded2f40...c1a70c49bf2d

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 62ea33: Sortable ability for server processlist
by Michal Čihař 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 62ea33921dd2a66f03cf80c120b3cee8c10da332 https://github.com/phpmyadmin/phpmyadmin/commit/62ea33921dd2a66f03cf80c120b… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-11 (Sat, 11 Aug 2012) Changed paths: M server_status.php M themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css Log Message: ----------- Sortable ability for server processlist Commit: 54dfe9eb0fb382f442b8dabc1bc9145a2e83dfa8 https://github.com/phpmyadmin/phpmyadmin/commit/54dfe9eb0fb382f442b8dabc1bc… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-11 (Sat, 11 Aug 2012) Changed paths: M ChangeLog M libraries/Menu.class.php M libraries/Table.class.php M libraries/operations.lib.php M libraries/tbl_info.inc.php M phpinfo.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po M tbl_operations.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: 20b196daf5a694eed69edd27807c1bd0f74cf61c https://github.com/phpmyadmin/phpmyadmin/commit/20b196daf5a694eed69edd27807… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-11 (Sat, 11 Aug 2012) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- Fixed some code violations in PMA_DisplayResults class Commit: fde2a58babca31808f43eed0ff9f24d3c40e208f https://github.com/phpmyadmin/phpmyadmin/commit/fde2a58babca31808f43eed0ff9… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Improve some tests for functions in PMA_DisplayResults class Commit: 054fab3ffef52fed86c5733e8cbe9d89ff07ccae https://github.com/phpmyadmin/phpmyadmin/commit/054fab3ffef52fed86c5733e8cb… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> 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 M po/th.po M tbl_create.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: a8c9bded2f4059959cdd11dd893fbf47bf11a075 https://github.com/phpmyadmin/phpmyadmin/commit/a8c9bded2f4059959cdd11dd893… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-13 (Mon, 13 Aug 2012) Changed paths: M libraries/DisplayResults.class.php M server_status.php M test/classes/PMA_DisplayResults_test.php M themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css Log Message: ----------- Merge remote-tracking branch 'chanaka/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/29ea192a8101...a8c9bded2f40

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 29ea19: These look obviously wrong
by Michal Čihař 13 Aug '12

13 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 29ea192a8101e9c5effde1fa674d6592973a9c48 https://github.com/phpmyadmin/phpmyadmin/commit/29ea192a8101e9c5effde1fa674… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M po/th.po Log Message: ----------- These look obviously wrong

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 50d1a4: Fix for trigger page vulnerability, see PMASA-2012...
by Marc Delisle 12 Aug '12

12 Aug '12

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50d1a4884306ae6705f0bb665ba71da24089b6fe https://github.com/phpmyadmin/phpmyadmin/commit/50d1a4884306ae6705f0bb665ba… Author: Rouslan Placella <rouslan(a)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/ee306681d0d5ac09b6fc62a7d57… Author: Marc Delisle <marc(a)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/dca22c5046aa16899042592b40a… Author: Dieter Adriaenssens <ruleant(a)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/1aec25f5f2163029da51da39a1d… Author: Rouslan Placella <rouslan(a)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: d56335691cf1c1d8be3453904a885038da0a8c93 https://github.com/phpmyadmin/phpmyadmin/commit/d56335691cf1c1d8be3453904a8… Author: Madhura Jayaratne <madhura.cj(a)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/d84b98d34012cc5986fe84f1871… Author: Marc Delisle <marc(a)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/e094f34bed5ef3fd9a4a3cd08e0… Author: Dieter Adriaenssens <ruleant(a)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/cc97d82fd15771dfee07445323d… Author: Marc Delisle <marc(a)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/46819b311ca25848d0ec4fe9425… Author: Marc Delisle <marc(a)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/6f200703a3f9e16126822b6add2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Commit: 6c73243bb01d3dee38d5670c10f9fb119b353dd1 https://github.com/phpmyadmin/phpmyadmin/commit/6c73243bb01d3dee38d5670c10f… Author: Marc Delisle <marc(a)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/5289a032cec12ef9f840652a84e… Author: Marc Delisle <marc(a)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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b133e277f1e...5289a032cec1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 12 Aug '12

12 Aug '12

Branch: refs/tags/RELEASE_3_5_2_2 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 12 Aug '12

12 Aug '12

Branch: refs/tags/RELEASE_3_4_11_1 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 50d1a4: Fix for trigger page vulnerability, see PMASA-2012...
by Marc Delisle 12 Aug '12

12 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50d1a4884306ae6705f0bb665ba71da24089b6fe https://github.com/phpmyadmin/phpmyadmin/commit/50d1a4884306ae6705f0bb665ba… Author: Rouslan Placella <rouslan(a)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/ee306681d0d5ac09b6fc62a7d57… Author: Marc Delisle <marc(a)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/dca22c5046aa16899042592b40a… Author: Dieter Adriaenssens <ruleant(a)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/1aec25f5f2163029da51da39a1d… Author: Rouslan Placella <rouslan(a)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/4612247ac1c42233119d83fe3a6… Author: Nathan Wu <uuuyyttu(a)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/e084583f4e6b89eed2b83eead6a… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)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/7444b78a45aab4e7e158042a2d0… Author: Anusuk Sangubon <jaideejung007(a)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/10ce4259e677386cd7f1071a51c… Author: Weblate <noreply(a)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/d56335691cf1c1d8be3453904a8… Author: Madhura Jayaratne <madhura.cj(a)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/d84b98d34012cc5986fe84f1871… Author: Marc Delisle <marc(a)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/e094f34bed5ef3fd9a4a3cd08e0… Author: Dieter Adriaenssens <ruleant(a)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/cc97d82fd15771dfee07445323d… Author: Marc Delisle <marc(a)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/46819b311ca25848d0ec4fe9425… Author: Marc Delisle <marc(a)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/6f200703a3f9e16126822b6add2… Author: Marc Delisle <marc(a)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/cdf9bf3b83d789e3ccb4fe9d486… Author: Marc Delisle <marc(a)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/dde8fc471d278a40e0dfa157045… Author: Marc Delisle <marc(a)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/6c73243bb01d3dee38d5670c10f… Author: Marc Delisle <marc(a)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/5289a032cec12ef9f840652a84e… Author: Marc Delisle <marc(a)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/9ca1bee3c286a6176573487fdae… Author: Marc Delisle <marc(a)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/7bf3fe03a418268a774f447c2d0… Author: Marc Delisle <marc(a)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

1 0