- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2119b2: Skip this test for now
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2119b2397f34ea15bf37ae7116dbf8dcdc95b39c https://github.com/phpmyadmin/phpmyadmin/commit/2119b2397f34ea15bf37ae7116d… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M test/classes/PMA_Theme_test.php Log Message: ----------- Skip this test for now

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5062b8: loadCss no longer accepts parameter
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5062b8f1f050d8cc338b4de6baec74ebaea15d0b https://github.com/phpmyadmin/phpmyadmin/commit/5062b8f1f050d8cc338b4de6bae… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M test/classes/PMA_Theme_test.php Log Message: ----------- loadCss no longer accepts parameter Commit: 096e50d66c338bf7110cfdf34f2f771066b1e547 https://github.com/phpmyadmin/phpmyadmin/commit/096e50d66c338bf7110cfdf34f2… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M test/classes/PMA_Theme_test.php Log Message: ----------- Expect at least some output Compare: https://github.com/phpmyadmin/phpmyadmin/compare/adec3f29db7c...096e50d66c33

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] adec3f: Define needed globals for test
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: adec3f29db7c3a6acf96dfc630fd449bf57dcdb8 https://github.com/phpmyadmin/phpmyadmin/commit/adec3f29db7c3a6acf96dfc630f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M test/classes/PMA_Theme_test.php Log Message: ----------- Define needed globals for test

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fcd218: Test for _getCheckBoxesForMultipleRowOperations fu...
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fcd2189af03140f0f2b120464df43a67bd66bebb https://github.com/phpmyadmin/phpmyadmin/commit/fcd2189af03140f0f2b120464df… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Test for _getCheckBoxesForMultipleRowOperations function in PMA_DisplayResults class Commit: 56d641e992eb7b695dfc1e993e0d210baf71cb57 https://github.com/phpmyadmin/phpmyadmin/commit/56d641e992eb7b695dfc1e993e0… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Test for _getOffsets function in PMA_DisplayResults class Commit: dc47467812a08b0dab6221be24cbc06f70188920 https://github.com/phpmyadmin/phpmyadmin/commit/dc47467812a08b0dab6221be24c… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Test for _getSortParams function in PMA_DisplayResults class Commit: 3b1fccd00e3e6f9ec8e855de5aee2b0f2a6be633 https://github.com/phpmyadmin/phpmyadmin/commit/3b1fccd00e3e6f9ec8e855de5ae… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Test for _getCheckboxForMultiRowSubmissions function in PMA_DisplayResults class Commit: e6d7ada9581ef17739d4608ec42122114429cdba https://github.com/phpmyadmin/phpmyadmin/commit/e6d7ada9581ef17739d4608ec42… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge remote branch 'upstream/master' Commit: d996f9f42aa762be7435091164e445841ef072ca https://github.com/phpmyadmin/phpmyadmin/commit/d996f9f42aa762be7435091164e… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Merge remote-tracking branch 'chanaka/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e7e3164c0ebb...d996f9f42aa7

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e7e316: Update po files
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e7e3164c0ebbe7f055e6e88a9dd2d7c7cdb7420b https://github.com/phpmyadmin/phpmyadmin/commit/e7e3164c0ebbe7f055e6e88a9dd… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: 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 Log Message: ----------- Update po files

1 0

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

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af010f052ea8f42221ce22a5af101b1e898c907c https://github.com/phpmyadmin/phpmyadmin/commit/af010f052ea8f42221ce22a5af1… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: 62e078f3993ff529f4db9d1eb4568f2afd623038 https://github.com/phpmyadmin/phpmyadmin/commit/62e078f3993ff529f4db9d1eb45… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: be0ac30ef9dc000110b50a9819e0c862806f5240 https://github.com/phpmyadmin/phpmyadmin/commit/be0ac30ef9dc000110b50a9819e… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: f25f7ca2cd37b0556164a28ae8288535b75f7d42 https://github.com/phpmyadmin/phpmyadmin/commit/f25f7ca2cd37b0556164a28ae82… Author: Robert Readman <robert_readman(a)hotmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/en_GB.po Log Message: ----------- Translated using Weblate. Commit: a3d2b6521a2e9e594c853732b6628ec8b5588149 https://github.com/phpmyadmin/phpmyadmin/commit/a3d2b6521a2e9e594c853732b66… Author: aitzol berasategi <aitzol76(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/eu.po Log Message: ----------- Translated using Weblate. Commit: ed2d817dcdfb27caafb7f0ed9c84f2d3177ad1ec https://github.com/phpmyadmin/phpmyadmin/commit/ed2d817dcdfb27caafb7f0ed9c8… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: 9591b0a454f00afa7f77aca919fee1976b92d17a https://github.com/phpmyadmin/phpmyadmin/commit/9591b0a454f00afa7f77aca919f… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 79c1e16271100cae6cf67088794a2490af8a7c08 https://github.com/phpmyadmin/phpmyadmin/commit/79c1e16271100cae6cf67088794… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: b12c4112d9bb448674df19d65947294349cbe07f https://github.com/phpmyadmin/phpmyadmin/commit/b12c4112d9bb448674df19d6594… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M export.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 7586fe459a68605068dfc784d519047e5a2c6e00 https://github.com/phpmyadmin/phpmyadmin/commit/7586fe459a68605068dfc784d51… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: 5982c4f562b0d59647f3fff2fab4fe3b4bcab27a https://github.com/phpmyadmin/phpmyadmin/commit/5982c4f562b0d59647f3fff2fab… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M test/classes/PMA_Footer_test.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: ebefd85b6b2914e350f314f4356024cfe3a92ca6 https://github.com/phpmyadmin/phpmyadmin/commit/ebefd85b6b2914e350f314f4356… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: 46a2d62791ac99c35325aee4204fda7914bdb354 https://github.com/phpmyadmin/phpmyadmin/commit/46a2d62791ac99c35325aee4204… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: ff11fdd8bc97f14293f87730e16e84f7b731ff2b https://github.com/phpmyadmin/phpmyadmin/commit/ff11fdd8bc97f14293f87730e16… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: f775b0d3e08539065e71f4a2e7794526f345d2f5 https://github.com/phpmyadmin/phpmyadmin/commit/f775b0d3e08539065e71f4a2e77… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: f857b92768df124a868a6a50e6d1c38111fdd708 https://github.com/phpmyadmin/phpmyadmin/commit/f857b92768df124a868a6a50e6d… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: b4a8627bad263e715438d1daf7e913893368f794 https://github.com/phpmyadmin/phpmyadmin/commit/b4a8627bad263e715438d1daf7e… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M po/en_GB.po M po/eu.po M po/fa.po Log Message: ----------- Merge remote-tracking branch 'weblate/master' Conflicts: po/en_GB.po po/eu.po po/fa.po Commit: 6f13e5faf7c5933bc761c9482c353dd29eed1d78 https://github.com/phpmyadmin/phpmyadmin/commit/6f13e5faf7c5933bc761c9482c3… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M po/eu.po M po/fa.po Log Message: ----------- Fix format strings Commit: dea82fc87d43cd1302e1225886c155c1ef69a920 https://github.com/phpmyadmin/phpmyadmin/commit/dea82fc87d43cd1302e1225886c… Author: Ashiyane Digital Security Team <HeXa.ashiyane(a)gmail.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate. Commit: 108d22bc8e0f6923c7afc8364fc7a5a4c7d465a5 https://github.com/phpmyadmin/phpmyadmin/commit/108d22bc8e0f6923c7afc8364fc… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-03 (Tue, 03 Jul 2012) Changed paths: M po/fa.po Log Message: ----------- Merge remote-tracking branch 'weblate/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/837d76baf660...108d22bc8e0f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 375453: Add neutral string for transformations in pma_colu...
by Michal Čihař 03 Jul '12

03 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3754538e2cf0fbc17945485f0d4af9d3ec1dde0b https://github.com/phpmyadmin/phpmyadmin/commit/3754538e2cf0fbc17945485f0d4… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M libraries/transformations.lib.php M transformation_wrapper.php Log Message: ----------- Add neutral string for transformations in pma_column_info Commit: e330544b91cea8d0c8dd7bb5b4f27c87cb1e1a10 https://github.com/phpmyadmin/phpmyadmin/commit/e330544b91cea8d0c8dd7bb5b4f… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M ChangeLog M browse_foreigners.php M db_create.php M db_datadict.php M db_events.php M db_operations.php M db_printview.php M db_qbe.php M db_routines.php M db_search.php M db_structure.php M db_tables_search.php M db_tracking.php M export.php M import.php M index.php M js/db_operations.js M js/functions.js M js/tbl_change.js M libraries/Advisor.class.php A libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/File.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Index.class.php M libraries/List_Database.class.php M libraries/Menu.class.php M libraries/Message.class.php M libraries/PDF.class.php M libraries/RecentTable.class.php M libraries/StorageEngine.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/Tracker.class.php M libraries/bookmark.lib.php M libraries/build_html_for_db.lib.php M libraries/check_user_privileges.lib.php M libraries/common.inc.php R libraries/common.lib.php M libraries/config/FormDisplay.tpl.php M libraries/core.lib.php M libraries/database_interface.lib.php M libraries/db_common.inc.php M libraries/db_info.inc.php M libraries/db_structure.lib.php M libraries/db_table_exists.lib.php M libraries/display_create_database.lib.php M libraries/display_create_table.lib.php M libraries/display_export.lib.php M libraries/display_git_revision.lib.php M libraries/display_import.lib.php M libraries/display_select_lang.lib.php M libraries/engines/innodb.lib.php M libraries/engines/pbxt.lib.php M libraries/gis/pma_gis_polygon.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php M libraries/js_escape.lib.php M libraries/mult_submits.inc.php M libraries/mysql_charsets.lib.php M libraries/navigation_header.inc.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/export/ExportCodegen.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/ExportOdt.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/import/ImportCsv.class.php M libraries/plugins/import/ImportDocsql.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_footer.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_main.inc.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/User_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/server_common.inc.php M libraries/server_synchronize.lib.php M libraries/server_variables_doc.php M libraries/sql_query_form.lib.php M libraries/sqlparser.lib.php M libraries/tbl_common.inc.php M libraries/tbl_info.inc.php M libraries/tbl_properties.inc.php M libraries/tcpdf/tcpdf.php M libraries/transformations.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M main.php M navigation.php M pmd_display_field.php M pmd_general.php M pmd_pdf.php M pmd_relation_new.php M pmd_relation_upd.php M pmd_save_pos.php M po/fa.po M po/fr.po M prefs_manage.php M querywindow.php M schema_edit.php M server_binlog.php M server_collations.php M server_databases.php M server_engines.php M server_plugins.php M server_privileges.php M server_replication.php M server_status.php M server_synchronize.php M server_variables.php M sql.php M tbl_addfield.php M tbl_alter.php M tbl_change.php M tbl_create.php M tbl_export.php M tbl_get_field.php M tbl_indexes.php M tbl_move_copy.php M tbl_operations.php M tbl_printview.php M tbl_relation.php M tbl_replace.php M tbl_structure.php M tbl_tracking.php M tbl_zoom_select.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_File_test.php A test/classes/PMA_Footer_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_PDF_test.php M test/classes/PMA_Theme_Manager_test.php M test/libraries/PMA_GIS_modifyQuery_test.php M test/libraries/PMA_STR_sub_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/libraries/common/PMA_buildActionTitles_test.php M test/libraries/common/PMA_cache_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_contains_nonprintable_ascii_test.php M test/libraries/common/PMA_convert_bit_default_value_test.php M test/libraries/common/PMA_escapeMySqlWildcards_test.php M test/libraries/common/PMA_expandUserString_test.php M test/libraries/common/PMA_extractColumnSpec_test.php M test/libraries/common/PMA_extractValueFromFormattedSize_test.php M test/libraries/common/PMA_foreignKeySupported_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php M test/libraries/common/PMA_formatSql_test.php M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php M test/libraries/common/PMA_getCheckbox_test.php M test/libraries/common/PMA_getDbLink_test.php M test/libraries/common/PMA_getDivForSliderEffect_test.php M test/libraries/common/PMA_getDropdown_test.php M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php M test/libraries/common/PMA_getIcon_test.php M test/libraries/common/PMA_getRadioFields_test.php M test/libraries/common/PMA_getTitleForTarget_test.php M test/libraries/common/PMA_localisedDateTimespan_test.php M test/libraries/common/PMA_pow_test.php M test/libraries/common/PMA_printableBitValue_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/common/PMA_showDocu_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/common/PMA_stringOperations_test.php M test/libraries/common/PMA_unsupportedDatatypes_test.php M test/libraries/common/PMA_whichCrlf_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_headerLocation_test_disabled.php M test/libraries/js_escape_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_ParameterParser_test.php M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php M test/theme.php M transformation_wrapper.php M user_password.php M view_create.php M view_operations.php Log Message: ----------- merge master Commit: defb4d6d39c0c3f5776fbfa6b256633c84129537 https://github.com/phpmyadmin/phpmyadmin/commit/defb4d6d39c0c3f5776fbfa6b25… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M libraries/Tracker.class.php Log Message: ----------- fix missing include in PMA_Tracker class Commit: f5989eb628613f5e7403bddd152fb3ec87884579 https://github.com/phpmyadmin/phpmyadmin/commit/f5989eb628613f5e7403bddd152… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M libraries/transformations.lib.php Log Message: ----------- fix error from merge conflict in transformations Commit: 64d00c52ae429b0a07d3625e218840372a213268 https://github.com/phpmyadmin/phpmyadmin/commit/64d00c52ae429b0a07d3625e218… Author: Alex Marin <alex.ukf(a)gmail.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M export.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 test/classes/PMA_Footer_test.php M user_password.php Log Message: ----------- Merge branch 'master' into plugins-and-OOP Commit: 837d76baf660486eab17075f09341fe63e4c6e6f https://github.com/phpmyadmin/phpmyadmin/commit/837d76baf660486eab17075f093… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M libraries/Tracker.class.php M libraries/transformations.lib.php M transformation_wrapper.php Log Message: ----------- Merge pull request #77 from alexukf/plugins-and-OOP Transformations bugs Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b55019e00cf4...837d76baf660

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b55019: Fix function call not camelCased yet
by J.M 02 Jul '12

02 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b55019e00cf4b15395d72745de7f48f73924f719 https://github.com/phpmyadmin/phpmyadmin/commit/b55019e00cf4b15395d72745de7… Author: J.M <me(a)mynetx.net> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M export.php Log Message: ----------- Fix function call not camelCased yet

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3c301b: Incorrect file reference
by Marc Delisle 02 Jul '12

02 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c301b0d597b8660a2f0b43fdf71a6043d390ad5 https://github.com/phpmyadmin/phpmyadmin/commit/3c301b0d597b8660a2f0b43fdf7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: M user_password.php Log Message: ----------- Incorrect file reference

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cf2ed4: Update .po files
by Marc Delisle 02 Jul '12

02 Jul '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cf2ed4fd58ea85551e89db0a5f81452be0c7a353 https://github.com/phpmyadmin/phpmyadmin/commit/cf2ed4fd58ea85551e89db0a5f8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-07-02 (Mon, 02 Jul 2012) Changed paths: 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 Log Message: ----------- Update .po files

1 0