- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 049b25: Translated using Weblate.
by Michal Čihař 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 049b251374af5fac324f484f4cfdfe135bcf7fd6 https://github.com/phpmyadmin/phpmyadmin/commit/049b251374af5fac324f484f4cf… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate. Commit: 01e9f1800e00de8288558d531d854f62fb9a1c21 https://github.com/phpmyadmin/phpmyadmin/commit/01e9f1800e00de8288558d531d8… Author: Stian Berg <mail.to.stian(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate. Commit: 77f09b44a22190cd5db2ccbebcda32a46303fd7b https://github.com/phpmyadmin/phpmyadmin/commit/77f09b44a22190cd5db2ccbebcd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/si.po Log Message: ----------- Translated using Weblate. Commit: a15a0562ee69863ba252215e730f62ff5f5ce4b8 https://github.com/phpmyadmin/phpmyadmin/commit/a15a0562ee69863ba252215e730… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-01 (Wed, 01 Aug 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1302191d4771...a15a0562ee69

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 130219: Translated using Weblate.
by Madhura Jayaratne 01 Aug '12

01 Aug '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1302191d47711c35c4e5a5439cd9dbae6b7f6bf6 https://github.com/phpmyadmin/phpmyadmin/commit/1302191d47711c35c4e5a5439cd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/si.po Log Message: ----------- Translated using Weblate.

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 049b25: Translated using Weblate.
by Madhura Jayaratne 01 Aug '12

01 Aug '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 049b251374af5fac324f484f4cfdfe135bcf7fd6 https://github.com/phpmyadmin/phpmyadmin/commit/049b251374af5fac324f484f4cf… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate. Commit: 01e9f1800e00de8288558d531d854f62fb9a1c21 https://github.com/phpmyadmin/phpmyadmin/commit/01e9f1800e00de8288558d531d8… Author: Stian Berg <mail.to.stian(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate. Commit: 77f09b44a22190cd5db2ccbebcda32a46303fd7b https://github.com/phpmyadmin/phpmyadmin/commit/77f09b44a22190cd5db2ccbebcd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-01 (Wed, 01 Aug 2012) Changed paths: M po/si.po Log Message: ----------- Translated using Weblate. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/60be89ca1240...77f09b44a221

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0f0c2f: - [security] Fixed local path disclosure vulnerabi...
by J.M 31 Jul '12

31 Jul '12

Branch: refs/heads/MAINT_3_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f0c2f1e2b3ece41cc1bb99a9931c8fcc7c917bc https://github.com/phpmyadmin/phpmyadmin/commit/0f0c2f1e2b3ece41cc1bb99a993… Author: J.M <me(a)mynetx.net> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M ChangeLog M show_config_errors.php Log Message: ----------- - [security] Fixed local path disclosure vulnerability

1 0

[Phpmyadmin-git] [phpmyadmin/website] 025c2a: Typo
by Marc Delisle 31 Jul '12

31 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 025c2a528e6054ac2a88c25cae4a049e3a9c792c https://github.com/phpmyadmin/website/commit/025c2a528e6054ac2a88c25cae4a04… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M templates/sponsors.tpl Log Message: ----------- Typo

1 0

[Phpmyadmin-git] [phpmyadmin/website] b7ee52: New sponsor: AOE media
by Marc Delisle 31 Jul '12

31 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: b7ee5258366827942708e1b579dd1fcdca854221 https://github.com/phpmyadmin/website/commit/b7ee5258366827942708e1b579dd1f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M css/style.css A images/sponsors/aoemedia_200x65.jpg M templates/_littleboxes.tpl M templates/sponsors.tpl Log Message: ----------- New sponsor: AOE media Commit: 035759ae850137f40aca247f4bdba6042f81c511 https://github.com/phpmyadmin/website/commit/035759ae850137f40aca247f4bdba6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M templates/try.tpl Log Message: ----------- Version no longer exists Commit: 5ff7be7535054c568d6f211e1a7d81e30877fd2b https://github.com/phpmyadmin/website/commit/5ff7be7535054c568d6f211e1a7d81… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: M templates/team.tpl Log Message: ----------- Dead link Commit: 8cad232b36c3b44fb7b1a305fa583f0dd45df080 https://github.com/phpmyadmin/website/commit/8cad232b36c3b44fb7b1a305fa583f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-30 (Mon, 30 Jul 2012) Changed paths: A images/aoemedia_200x65.jpg R images/sponsors/aoemedia_200x65.jpg M templates/_littleboxes.tpl Log Message: ----------- Avoid using the sponsors folder because adblock checks for this Commit: d3e3d505c25dc5383f1f4b282285f66cf4d70c61 https://github.com/phpmyadmin/website/commit/d3e3d505c25dc5383f1f4b282285f6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: R images/aoemedia_200x65.jpg A images/aoemedia_200x68.jpg M templates/_littleboxes.tpl Log Message: ----------- Newer logo Compare: https://github.com/phpmyadmin/website/compare/614430c4769a...d3e3d505c25d

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a1c585: Translated using Weblate.
by Michal Čihař 31 Jul '12

31 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a1c585bd032a165c26f04a5801a9a348159fb465 https://github.com/phpmyadmin/phpmyadmin/commit/a1c585bd032a165c26f04a5801a… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate. Commit: b02b1598363afb9609309ab63b912784522b448c https://github.com/phpmyadmin/phpmyadmin/commit/b02b1598363afb9609309ab63b9… Author: Stian Berg <mail.to.stian(a)gmail.com> Date: 2012-07-31 (Tue, 31 Jul 2012) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate. Commit: 9d8eed9c8fe07898f8ea3e731f5d0cc0929bdb78 https://github.com/phpmyadmin/phpmyadmin/commit/9d8eed9c8fe07898f8ea3e731f5… Author: Michal Čihař <weblate(a)l10n.cihar.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 Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3b78768c1827...9d8eed9c8fe0

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d47030: Generate some links inside mysql schema
by Michal Čihař 31 Jul '12

31 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d47030c4c8856bbfd343acc8168e097ce7e7606c https://github.com/phpmyadmin/phpmyadmin/commit/d47030c4c8856bbfd343acc8168… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/DisplayResults.class.php A libraries/mysql_schema_relation.lib.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php Log Message: ----------- Generate some links inside mysql schema Commit: c433abda77f4480b7212812698a8af0920655bbb https://github.com/phpmyadmin/phpmyadmin/commit/c433abda77f4480b7212812698a… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/DisplayResults.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 A test/classes/PMA_DBQbe_test.php A test/classes/PMA_DbSearch_test.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: 3b78768c1827fff4b964e3e43456e3febafdb17d https://github.com/phpmyadmin/phpmyadmin/commit/3b78768c1827fff4b964e3e4345… Author: Michal Čihař <mcihar(a)suse.cz> 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 Log Message: ----------- Merge remote-tracking branch 'chanaka/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/138dc524a218...3b78768c1827

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52fccf: oop: globals for ExportCsv
by Alex Marin 30 Jul '12

30 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 52fccf01501686733862e68aef0edd5b67a8c34d https://github.com/phpmyadmin/phpmyadmin/commit/52fccf01501686733862e68aef0… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/export/ExportCsv.class.php Log Message: ----------- oop: globals for ExportCsv Commit: e5514b464c4fa93ffe20a4c76bd316e911b65a4a https://github.com/phpmyadmin/phpmyadmin/commit/e5514b464c4fa93ffe20a4c76bd… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/export/ExportHtmlword.class.php Log Message: ----------- oop: globals for ExportHtmlword Commit: 3274113ee79991eb9876605da06798f51a17398c https://github.com/phpmyadmin/phpmyadmin/commit/3274113ee79991eb9876605da06… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/export/ExportLatex.class.php Log Message: ----------- oop: globals for ExportLatex Commit: 1a7fd1b6cd75399ae4ecb5728968fc450bca17c4 https://github.com/phpmyadmin/phpmyadmin/commit/1a7fd1b6cd75399ae4ecb572896… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- oop: remove getters, setters and usages for global crlf Commit: a1febe814738040b7bd37fc1c77469147107ade0 https://github.com/phpmyadmin/phpmyadmin/commit/a1febe814738040b7bd37fc1c77… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- oop: remove getters, setters and usages for global db Commit: 8bffa1eeec8d1c7146033a9e07aaf03bd61f9871 https://github.com/phpmyadmin/phpmyadmin/commit/8bffa1eeec8d1c7146033a9e07a… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- oop: remove getters, setters and usages for global cfg Commit: 23f97d9133c1cb5f313113aea1da6138d6f1c1c6 https://github.com/phpmyadmin/phpmyadmin/commit/23f97d9133c1cb5f313113aea1d… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php Log Message: ----------- oop: remove getters, setters and usages for global cfgRelation Commit: 7d95c5920800097ecf8eb001d2f2f6ef32ee9015 https://github.com/phpmyadmin/phpmyadmin/commit/7d95c5920800097ecf8eb001d2f… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportTexytext.class.php Log Message: ----------- oop: remove getters, setters and usages for global what Commit: 428d6ecf10cebbf567387d93b3115b9b2ee6c3d0 https://github.com/phpmyadmin/phpmyadmin/commit/428d6ecf10cebbf567387d93b31… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportOdt.class.php Log Message: ----------- oop: remove getters, setters and usages for global plugin_param Commit: 676b79497855b6bc93a6e3bcc29908106df6429b https://github.com/phpmyadmin/phpmyadmin/commit/676b79497855b6bc93a6e3bcc29… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php Log Message: ----------- oop: remove getters, setters and usages for global get_charset_of_file Commit: 0519282c1300ad67e9644bc1b915c263c9440813 https://github.com/phpmyadmin/phpmyadmin/commit/0519282c1300ad67e9644bc1b91… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/ExportPlugin.class.php Log Message: ----------- oop: remove unused variables from ExportPlugin Commit: 60d679b839fbad165ae5f886f91d7767bb8a2f46 https://github.com/phpmyadmin/phpmyadmin/commit/60d679b839fbad165ae5f886f91… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/export/ExportSql.class.php Log Message: ----------- oop: globals for ExportSql Commit: 26c35fbc9ab4217689ef64fa12d7e89ffdde4d37 https://github.com/phpmyadmin/phpmyadmin/commit/26c35fbc9ab4217689ef64fa12d… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M libraries/plugins/export/ExportSql.class.php Log Message: ----------- oop: coding style for ExportSql Commit: 50d8322b38c400ddbad97818f7585d46a0adb1bd https://github.com/phpmyadmin/phpmyadmin/commit/50d8322b38c400ddbad97818f75… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: 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/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php Log Message: ----------- oop: replace conditional includes for properties in export plug-ins Commit: 3f30a1bf9601044cf5d7fe7839124286718e5ba5 https://github.com/phpmyadmin/phpmyadmin/commit/3f30a1bf9601044cf5d7fe78391… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: 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/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/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- oop: coding style for export plug-ins Commit: 138dc524a218d17ca3f0afae95bff48ec219f9b8 https://github.com/phpmyadmin/phpmyadmin/commit/138dc524a218d17ca3f0afae95b… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M ChangeLog M db_qbe.php M import.php M js/makegrid.js A libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/relation.lib.php M libraries/rte/rte_routines.lib.php M pmd_pdf.php M pmd_relation_new.php M pmd_save_pos.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 prefs_manage.php M querywindow.php M schema_export.php M scripts/advisor2po M server_binlog.php M setup/lib/ConfigGenerator.class.php M sql.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 A test/classes/PMA_DBQbe_test.php A test/classes/PMA_DbSearch_test.php Log Message: ----------- Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9fe5079777a...138dc524a218

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7b0b44: Add test class for DbSearch.class.php
by Michal Čihař 29 Jul '12

29 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7b0b4482d807a4f46064f3fe82c7a93df079e0ff https://github.com/phpmyadmin/phpmyadmin/commit/7b0b4482d807a4f46064f3fe82c… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-27 (Fri, 27 Jul 2012) Changed paths: A test/classes/PMA_DbSearch_test.php Log Message: ----------- Add test class for DbSearch.class.php Commit: 9ba19188abc13d9fa7d31628c423cbfcfae41d9c https://github.com/phpmyadmin/phpmyadmin/commit/9ba19188abc13d9fa7d31628c42… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-27 (Fri, 27 Jul 2012) Changed paths: M db_operations.php M db_qbe.php M export.php M import.php M libraries/CommonFunctions.class.php A libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/config.default.php M libraries/database_interface.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/import.lib.php M libraries/plugin_interface.lib.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/import/ImportSql.class.php A libraries/properties/PropertyItem.class.php A libraries/properties/options/OptionsPropertyGroup.class.php A libraries/properties/options/OptionsPropertyItem.class.php A libraries/properties/options/OptionsPropertyOneItem.class.php A libraries/properties/options/groups/OptionsPropertyMainGroup.class.php A libraries/properties/options/groups/OptionsPropertyRootGroup.class.php A libraries/properties/options/groups/OptionsPropertySubgroup.class.php A libraries/properties/options/items/BoolPropertyItem.class.php A libraries/properties/options/items/DocPropertyItem.class.php A libraries/properties/options/items/HiddenPropertyItem.class.php A libraries/properties/options/items/MessageOnlyPropertyItem.class.php A libraries/properties/options/items/RadioPropertyItem.class.php A libraries/properties/options/items/SelectPropertyItem.class.php A libraries/properties/options/items/TextPropertyItem.class.php A libraries/properties/plugins/ExportPluginProperties.class.php A libraries/properties/plugins/ImportPluginProperties.class.php A libraries/properties/plugins/PluginPropertyItem.class.php A libraries/properties/plugins/TransformationsPluginProperties.class.php M libraries/relation.lib.php M libraries/rte/rte_routines.lib.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 scripts/advisor2po M sql.php Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: 3e9a5f69dcbadd15ad848aec567b512456bd8dca https://github.com/phpmyadmin/phpmyadmin/commit/3e9a5f69dcbadd15ad848aec567… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-28 (Sat, 28 Jul 2012) Changed paths: A test/classes/PMA_DBQbe_test.php M test/classes/PMA_DbSearch_test.php Log Message: ----------- Test class for PMA_DBQbe Commit: b592b48eaa77650ac67dc8c5a098ef53c656f3e8 https://github.com/phpmyadmin/phpmyadmin/commit/b592b48eaa77650ac67dc8c5a09… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-07-28 (Sat, 28 Jul 2012) Changed paths: M ChangeLog M js/makegrid.js M libraries/DisplayResults.class.php M libraries/relation.lib.php M setup/lib/ConfigGenerator.class.php Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: a9fe5079777a1647a29eb7b83fdc111dc842af9a https://github.com/phpmyadmin/phpmyadmin/commit/a9fe5079777a1647a29eb7b83fd… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: A test/classes/PMA_DBQbe_test.php A test/classes/PMA_DbSearch_test.php Log Message: ----------- Merge remote-tracking branch 'yasitha/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d85c64cb25ed...a9fe5079777a

1 0