- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 969997: Fixed bug #3553551 - Invalid HTML code in multi su...
by Rouslan Placella 02 Aug '12

02 Aug '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9699979ea962d745b939186fa0bd705cb5b00756 https://github.com/phpmyadmin/phpmyadmin/commit/9699979ea962d745b939186fa0b… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-08-02 (Thu, 02 Aug 2012) Changed paths: M ChangeLog M libraries/mult_submits.inc.php Log Message: ----------- Fixed bug #3553551 - Invalid HTML code in multi submits confirmation form

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d72f32: Translated using Weblate.
by Xavier Navarro 02 Aug '12

02 Aug '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d72f329301c28d222facce53e3da67deeb41b782 https://github.com/phpmyadmin/phpmyadmin/commit/d72f329301c28d222facce53e3d… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2012-08-02 (Thu, 02 Aug 2012) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate.

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 87bcfe: Links for information_schema
by Michal Čihař 02 Aug '12

02 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 87bcfe6debe478f58db9f5e7e7ce95fafa1d758f https://github.com/phpmyadmin/phpmyadmin/commit/87bcfe6debe478f58db9f5e7e7c… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/DisplayResults.class.php R libraries/mysql_schema_relation.lib.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php A libraries/special_schema_links.lib.php Log Message: ----------- Links for information_schema Commit: 22c16fea5a51d867ca4825765a62742583b29bd2 https://github.com/phpmyadmin/phpmyadmin/commit/22c16fea5a51d867ca4825765a6… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/README M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/properties/plugins/ExportPluginProperties.class.php M libraries/properties/plugins/ImportPluginProperties.class.php M libraries/server_privileges.lib.php M po/si.po M server_privileges.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: 9705f8e1cd36f4eaafb550c07f823c77274c1495 https://github.com/phpmyadmin/phpmyadmin/commit/9705f8e1cd36f4eaafb550c07f8… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/Tracker.class.php Log Message: ----------- Fix undefined function issue in Tracker class Commit: fbe4bf77706024167209a9dd70b43dc7fc396035 https://github.com/phpmyadmin/phpmyadmin/commit/fbe4bf77706024167209a9dd70b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-02 (Thu, 02 Aug 2012) Changed paths: M libraries/DisplayResults.class.php M libraries/Tracker.class.php R libraries/mysql_schema_relation.lib.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php A libraries/special_schema_links.lib.php Log Message: ----------- Merge remote-tracking branch 'chanaka/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5942db983962...fbe4bf777060

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d5bf4f: Remove outer fieldset
by Marc Delisle 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d5bf4f087462043219ff0058058348d95785e41b https://github.com/phpmyadmin/phpmyadmin/commit/d5bf4f087462043219ff0058058… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Remove outer fieldset Commit: c2e22dd1ac57eeada6bd6c341430643bd8eecc0e https://github.com/phpmyadmin/phpmyadmin/commit/c2e22dd1ac57eeada6bd6c34143… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Fix footer fieldset of zoom search and simplify some code Commit: a2fc65637fb14597d7cb8b7a95a8be7fcdd244c7 https://github.com/phpmyadmin/phpmyadmin/commit/a2fc65637fb14597d7cb8b7a95a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Do not hide the end tag in some other function Commit: 7901d0d4e46f0a19bbad078a6c01a0d0fccbc3e3 https://github.com/phpmyadmin/phpmyadmin/commit/7901d0d4e46f0a19bbad078a6c0… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Simplify the code a bit Commit: d0e4e37e846925f8ceb31f434c38535ef6c5abae https://github.com/phpmyadmin/phpmyadmin/commit/d0e4e37e846925f8ceb31f434c3… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Same look and feel of the settings page Commit: d32f4138573f022fa25c435dd2bbded9faf0425f https://github.com/phpmyadmin/phpmyadmin/commit/d32f4138573f022fa25c435dd2b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/Menu.class.php Log Message: ----------- Activate search tab for both ordinary table search and zoom search Commit: d56883327bc6a294eaed713d3044b53d306eccbb https://github.com/phpmyadmin/phpmyadmin/commit/d56883327bc6a294eaed713d304… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Make the two tabs look alike Commit: 5942db98396298e1ba8921bc080fecfc0b0766a9 https://github.com/phpmyadmin/phpmyadmin/commit/5942db98396298e1ba8921bc080… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/Menu.class.php M libraries/TableSearch.class.php Log Message: ----------- Merge pull request #87 from madhuracj/SearchPageImprovements Table search page improvements Compare: https://github.com/phpmyadmin/phpmyadmin/compare/da869f796b0f...5942db983962

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0793e7: Fixed fatal JS error when changing insert action
by Marc Delisle 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0793e76c1168d596a3a951bc86d51831f332e9e4 https://github.com/phpmyadmin/phpmyadmin/commit/0793e76c1168d596a3a951bc86d… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M js/tbl_change.js Log Message: ----------- Fixed fatal JS error when changing insert action Commit: da869f796b0f1acc977abf7ebd01d44fd2725994 https://github.com/phpmyadmin/phpmyadmin/commit/da869f796b0f1acc977abf7ebd0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M js/tbl_change.js Log Message: ----------- Merge pull request #86 from roccivic/js-insert-fix Fixed fatal JS error when changing insert action Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8ff3ab885418...da869f796b0f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8ff3ab: Remove trailing white spaces
by Madhura Jayaratne 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8ff3ab885418e29bf8790f86b1cb5d84f52ab207 https://github.com/phpmyadmin/phpmyadmin/commit/8ff3ab885418e29bf8790f86b1c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Remove trailing white spaces

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e51499: Remove 'export privileges for all users' link as i...
by Marc Delisle 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e51499d33c3fa190a3366a01aeb11cb951dbb56e https://github.com/phpmyadmin/phpmyadmin/commit/e51499d33c3fa190a3366a01aeb… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Remove 'export privileges for all users' link as it is now redundant Commit: 82293cf45094b6771a5ec3ce296f7c24392d2600 https://github.com/phpmyadmin/phpmyadmin/commit/82293cf45094b6771a5ec3ce296… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/server_privileges.lib.php M server_privileges.php Log Message: ----------- Merge pull request #85 from madhuracj/master Removing redundant 'Export privileges for all users' link Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4f3072bd2029...82293cf45094

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3242c5: Coding style improvements and white space cleanup
by Madhura Jayaratne 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3242c5fb74be1a9dd85d708f4c956307750a298d https://github.com/phpmyadmin/phpmyadmin/commit/3242c5fb74be1a9dd85d708f4c9… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M server_privileges.php Log Message: ----------- Coding style improvements and white space cleanup Commit: f4c4fe8ebe5fe59bc0f08d96edfe801ecb1edc0b https://github.com/phpmyadmin/phpmyadmin/commit/f4c4fe8ebe5fe59bc0f08d96edf… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- White space clean up Commit: 4f3072bd2029fb5201f841cce328bfd04f5c6da1 https://github.com/phpmyadmin/phpmyadmin/commit/4f3072bd2029fb5201f841cce32… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/DisplayResults.class.php A libraries/mysql_schema_relation.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/export/README M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M libraries/properties/plugins/ExportPluginProperties.class.php M libraries/properties/plugins/ImportPluginProperties.class.php M po/ca.po M po/nb.po M po/si.po M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63f3cf7d2f1e...4f3072bd2029

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 02c379: oop: properties for ImportCsv
by Michal Čihař 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 02c37994c11679900a2d16d05fde7982fd160bc1 https://github.com/phpmyadmin/phpmyadmin/commit/02c37994c11679900a2d16d05fd… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugins/import/ImportCsv.class.php R libraries/plugins/import/ImportDocsql.class.php R libraries/plugins/import/ImportLdi.class.php R libraries/plugins/import/ImportMediawiki.class.php R libraries/plugins/import/ImportOds.class.php R libraries/plugins/import/ImportShp.class.php R libraries/plugins/import/ImportSql.class.php R libraries/plugins/import/ImportXml.class.php A libraries/plugins/import/todo_refactor/ImportDocsql.class.php A libraries/plugins/import/todo_refactor/ImportLdi.class.php A libraries/plugins/import/todo_refactor/ImportMediawiki.class.php A libraries/plugins/import/todo_refactor/ImportOds.class.php A libraries/plugins/import/todo_refactor/ImportShp.class.php A libraries/plugins/import/todo_refactor/ImportSql.class.php A libraries/plugins/import/todo_refactor/ImportXml.class.php Log Message: ----------- oop: properties for ImportCsv Commit: 55c27dd333943612bc0417c432e4a8608bb66d36 https://github.com/phpmyadmin/phpmyadmin/commit/55c27dd333943612bc0417c432e… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugin_interface.lib.php Log Message: ----------- oop: fix undefined method bug for import plug-ins Commit: c91058d0d61f64cdcdf8fb02ffd89f0adbd5e3da https://github.com/phpmyadmin/phpmyadmin/commit/c91058d0d61f64cdcdf8fb02ffd… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportDocsql.class.php R libraries/plugins/import/todo_refactor/ImportDocsql.class.php Log Message: ----------- oop: properties for ImportDocSQL Commit: 912ad23d411c3e97fa348068aad79de94a512a77 https://github.com/phpmyadmin/phpmyadmin/commit/912ad23d411c3e97fa348068aad… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportLdi.class.php R libraries/plugins/import/todo_refactor/ImportLdi.class.php Log Message: ----------- oop: properties for ImportLdi Commit: 01ba929c94c227803f95fda43987651bf178ef78 https://github.com/phpmyadmin/phpmyadmin/commit/01ba929c94c227803f95fda4398… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportMediawiki.class.php R libraries/plugins/import/todo_refactor/ImportMediawiki.class.php M libraries/properties/plugins/ExportPluginProperties.class.php M libraries/properties/plugins/ImportPluginProperties.class.php Log Message: ----------- oop: properties for ImportMediawiki Commit: d83fc57c51e9fd93128ece34d8aa2c2f5b2f58c7 https://github.com/phpmyadmin/phpmyadmin/commit/d83fc57c51e9fd93128ece34d8a… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugins/import/ImportLdi.class.php A libraries/plugins/import/ImportOds.class.php R libraries/plugins/import/todo_refactor/ImportOds.class.php Log Message: ----------- oop: properties for ImportOds Commit: 7411cd39894e8b1b437598595c1b3c2e3f05ec48 https://github.com/phpmyadmin/phpmyadmin/commit/7411cd39894e8b1b437598595c1… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportShp.class.php R libraries/plugins/import/todo_refactor/ImportShp.class.php Log Message: ----------- oop: properties for ImportShp Commit: 45d6e21148aa5aaa198042325a72ead830d26d29 https://github.com/phpmyadmin/phpmyadmin/commit/45d6e21148aa5aaa198042325a7… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportSql.class.php R libraries/plugins/import/todo_refactor/ImportSql.class.php Log Message: ----------- oop: properties for ImportSql Commit: e16f13b0bdcb9f44563ae65503154df024eb18f9 https://github.com/phpmyadmin/phpmyadmin/commit/e16f13b0bdcb9f44563ae655031… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A libraries/plugins/import/ImportXml.class.php R libraries/plugins/import/todo_refactor/ImportXml.class.php Log Message: ----------- oop: properties for ImportXml Commit: d82e1e2e9e93c8df10faac601d4da8b96d6f88ea https://github.com/phpmyadmin/phpmyadmin/commit/d82e1e2e9e93c8df10faac601d4… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugin_interface.lib.php Log Message: ----------- oop: properties - show "This format has no options" message Commit: 59ba476e439af93b07bb3edbba096217578672f1 https://github.com/phpmyadmin/phpmyadmin/commit/59ba476e439af93b07bb3edbba0… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugins/export/README Log Message: ----------- oop: update export readme with new properties Commit: b5ec05f7c900b92714867d41340165258746f1e0 https://github.com/phpmyadmin/phpmyadmin/commit/b5ec05f7c900b92714867d41340… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M libraries/plugins/import/README Log Message: ----------- oop: update import readme with new properties Commit: 3a3dff6b5f58da29295d4374da8d5bd44b083287 https://github.com/phpmyadmin/phpmyadmin/commit/3a3dff6b5f58da29295d4374da8… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M libraries/DisplayResults.class.php A libraries/mysql_schema_relation.lib.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M po/ca.po M po/nb.po Log Message: ----------- Merge branch 'master' into plugins-and-OOP Commit: 63f3cf7d2f1e83e909f51322137846a85d127a79 https://github.com/phpmyadmin/phpmyadmin/commit/63f3cf7d2f1e83e909f51322137… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M libraries/plugin_interface.lib.php M libraries/plugins/export/README M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportMediawiki.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/properties/plugins/ExportPluginProperties.class.php M libraries/properties/plugins/ImportPluginProperties.class.php Log Message: ----------- Merge remote-tracking branch 'alex/plugins-and-OOP' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/706205d7664a...63f3cf7d2f1e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0e4e02: Fixed failing test cases
by Michal Čihař 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0e4e024a15198c064b38833033d6c375a6d38aca https://github.com/phpmyadmin/phpmyadmin/commit/0e4e024a15198c064b38833033d… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php Log Message: ----------- Fixed failing test cases Commit: 0388f9adcd1f4a1a5d81a8c9010b034be2bcbee9 https://github.com/phpmyadmin/phpmyadmin/commit/0388f9adcd1f4a1a5d81a8c9010… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M libraries/DisplayResults.class.php A libraries/mysql_schema_relation.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M pmd_pdf.php M pmd_relation_new.php M pmd_save_pos.php M po/ca.po M po/es.po M po/nb.po M po/ru.po M po/si.po M po/sl.po M po/sv.po M po/tr.po M prefs_manage.php M querywindow.php M schema_export.php M server_binlog.php M tbl_get_field.php M tbl_gis_visualization.php M tbl_indexes.php M tbl_move_copy.php M tbl_relation.php M tbl_structure.php M tbl_tracking.php Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: 706205d7664ad670458a39e4fac711e6ad5bc3cf https://github.com/phpmyadmin/phpmyadmin/commit/706205d7664ad670458a39e4fac… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php Log Message: ----------- Merge remote-tracking branch 'yasitha/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a15a0562ee69...706205d7664a

1 0