Branch: refs/heads/QA_4_5
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cedc7a442c7a636ec7caad62f0d3cc177b5bc365
https://github.com/phpmyadmin/phpmyadmin/commit/cedc7a442c7a636ec7caad62f0d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M ChangeLog
M js/cross_framing_protection.js
Log Message:
-----------
Fix hiding of page content behind menu
We use jQuery to to the initializaton rather than directly overwriting
onload, which breaks other things,
Fixes #11820, #11812
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c197c3fba58a6c4fe4d801e9609408bd1339d6db
https://github.com/phpmyadmin/phpmyadmin/commit/c197c3fba58a6c4fe4d801e9609…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/db_table_exists.lib.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Fix handling of databases with dot in a name
We do not need to concatenate and parse the items, the cache backend
accepts array directly.
Fixes #11798
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b16bec706a99b3058a14baffeef58470e59200a9
https://github.com/phpmyadmin/phpmyadmin/commit/b16bec706a99b3058a14baffeef…
Author: Kiguda Kosuru <tech(a)kiguda.net>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M po/ja.po
Log Message:
-----------
Translated using Weblate (Japanese)
Currently translated at 66.7% (2143 of 3210 strings)
[CI skip]
Commit: 912f96114dc803404e2854ebb5796757a4eeedb6
https://github.com/phpmyadmin/phpmyadmin/commit/912f96114dc803404e2854ebb57…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/db_table_exists.lib.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Merge pull request #11815 from nijel/dot-database
Fix handling of databases with dot in a name
Commit: e9d3ef465f67ae70f7ba708c58531b963865c286
https://github.com/phpmyadmin/phpmyadmin/commit/e9d3ef465f67ae70f7ba708c585…
Author: Masahiro Nishi <grooversmail(a)gmail.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M po/ja.po
Log Message:
-----------
Translated using Weblate (Japanese)
Currently translated at 67.4% (2166 of 3210 strings)
[CI skip]
Commit: d6291c2f8f63f3612a502360d4ed897db5524bb7
https://github.com/phpmyadmin/phpmyadmin/commit/d6291c2f8f63f3612a502360d4e…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/db_table_exists.lib.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: 6d83b09840795abf03cd654d7f3b047605626f35
https://github.com/phpmyadmin/phpmyadmin/commit/6d83b09840795abf03cd654d7f3…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Log Message:
-----------
Merge commit 'b16bec706a99b3058a14baffeef58470e59200a9'
Commit: e1c9dec998f601e8d3d98a98df1e92deec88defa
https://github.com/phpmyadmin/phpmyadmin/commit/e1c9dec998f601e8d3d98a98df1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.php
M libraries/Table.php
M libraries/db_table_exists.lib.php
M test/classes/TableTest.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Merge commit '912f96114dc803404e2854ebb5796757a4eeedb6'
Commit: 991df753c703014289e4479d91b16dbbcdce0dc1
https://github.com/phpmyadmin/phpmyadmin/commit/991df753c703014289e4479d91b…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Log Message:
-----------
Merge branch 'QA_4_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85d58a7fe8db...991df753c703
Branch: refs/heads/QA_4_5
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c197c3fba58a6c4fe4d801e9609408bd1339d6db
https://github.com/phpmyadmin/phpmyadmin/commit/c197c3fba58a6c4fe4d801e9609…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/db_table_exists.lib.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Fix handling of databases with dot in a name
We do not need to concatenate and parse the items, the cache backend
accepts array directly.
Fixes #11798
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 912f96114dc803404e2854ebb5796757a4eeedb6
https://github.com/phpmyadmin/phpmyadmin/commit/912f96114dc803404e2854ebb57…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.class.php
M libraries/Table.class.php
M libraries/db_table_exists.lib.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Merge pull request #11815 from nijel/dot-database
Fix handling of databases with dot in a name
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b16bec706a99...912f96114dc8
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 55b317c69964991d1204ade1eb3d4c69de120683
https://github.com/phpmyadmin/phpmyadmin/commit/55b317c69964991d1204ade1eb3…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M db_operations.php
M examples/openid.php
M export.php
M file_echo.php
M gis_data_editor.php
M import.php
M index.php
M libraries/Advisor.php
M libraries/Config.php
M libraries/DatabaseInterface.php
M libraries/DbQbe.php
M libraries/DbSearch.php
M libraries/DisplayResults.php
M libraries/Error.php
M libraries/File.php
M libraries/Font.php
M libraries/Header.php
M libraries/Index.php
M libraries/Linter.php
M libraries/ListDatabase.php
M libraries/Menu.php
M libraries/Message.php
M libraries/PDF.php
M libraries/Response.php
M libraries/Scripts.php
M libraries/ServerStatusData.php
M libraries/StorageEngine.php
M libraries/SysInfoLinux.php
M libraries/Table.php
M libraries/Tracker.php
M libraries/TypesMySQL.php
M libraries/Util.php
M libraries/bookmark.lib.php
M libraries/browse_foreigners.lib.php
M libraries/central_columns.lib.php
M libraries/check_user_privileges.lib.php
M libraries/common.inc.php
M libraries/config/Form.php
M libraries/config/FormDisplay.php
M libraries/config/FormDisplay.tpl.php
M libraries/config/ServerConfigChecks.php
M libraries/config/Validator.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/controllers/server/ServerDatabasesController.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/controllers/table/TableChartController.php
M libraries/controllers/table/TableRelationController.php
M libraries/controllers/table/TableSearchController.php
M libraries/controllers/table/TableStructureController.php
M libraries/core.lib.php
M libraries/db_common.inc.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/error_report.lib.php
M libraries/export.lib.php
M libraries/gis/GISGeometry.php
M libraries/gis/GISGeometrycollection.php
M libraries/gis/GISLinestring.php
M libraries/gis/GISMultilinestring.php
M libraries/gis/GISMultipoint.php
M libraries/gis/GISMultipolygon.php
M libraries/gis/GISPoint.php
M libraries/gis/GISPolygon.php
M libraries/gis/GISVisualization.php
M libraries/iconv_wrapper.lib.php
M libraries/import.lib.php
M libraries/insert_edit.lib.php
M libraries/ip_allow_deny.lib.php
M libraries/mime.lib.php
M libraries/mult_submits.inc.php
M libraries/mult_submits.lib.php
M libraries/navigation/NavigationTree.php
M libraries/normalization.lib.php
M libraries/operations.lib.php
M libraries/plugin_interface.lib.php
M libraries/plugins/ImportPlugin.php
M libraries/plugins/auth/AuthenticationCookie.php
M libraries/plugins/export/ExportCsv.php
M libraries/plugins/export/ExportLatex.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/export/ExportXml.php
M libraries/plugins/export/TableProperty.php
M libraries/plugins/import/ImportCsv.php
M libraries/plugins/import/ImportMediawiki.php
M libraries/plugins/import/ImportShp.php
M libraries/plugins/schema/dia/Dia.php
M libraries/plugins/schema/eps/Eps.php
M libraries/plugins/schema/pdf/Pdf.php
M libraries/plugins/schema/svg/Svg.php
M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
M libraries/pmd_common.php
M libraries/relation.lib.php
M libraries/replication.inc.php
M libraries/replication_gui.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_footer.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/sanitizing.lib.php
M libraries/select_lang.lib.php
M libraries/server_privileges.lib.php
M libraries/server_status_monitor.lib.php
M libraries/server_status_processes.lib.php
M libraries/server_status_variables.lib.php
M libraries/server_user_groups.lib.php
M libraries/sql.lib.php
M libraries/sql_query_form.lib.php
M libraries/tbl_columns_definition_form.inc.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M libraries/transformations.lib.php
M libraries/url_generating.lib.php
M prefs_manage.php
M setup/frames/index.inc.php
M setup/lib/ConfigGenerator.php
M sql.php
M tbl_addfield.php
M tbl_change.php
M tbl_create.php
M tbl_get_field.php
M tbl_operations.php
M tbl_relation.php
M templates/columns_definitions/column_attribute.phtml
M templates/columns_definitions/column_auto_increment.phtml
M templates/database/structure/structure_table_row.phtml
M templates/server/plugins/section.phtml
M templates/server/plugins/section_links.phtml
M templates/table/relation/foreign_key_row.phtml
M templates/table/search/input_box.phtml
M templates/table/structure/actions_in_table_structure.phtml
M templates/table/structure/table_structure_row.phtml
M test/classes/ConfigTest.php
M test/libraries/PMA_display_export_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumXssTest.php
M test/selenium/TestBase.php
Log Message:
-----------
Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 66234c452183b6dc712c733e4a76ae0cbe2dfb76
https://github.com/phpmyadmin/phpmyadmin/commit/66234c452183b6dc712c733e4a7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M db_operations.php
M examples/openid.php
M export.php
M file_echo.php
M gis_data_editor.php
M import.php
M index.php
M libraries/Advisor.php
M libraries/Config.php
M libraries/DatabaseInterface.php
M libraries/DbQbe.php
M libraries/DbSearch.php
M libraries/DisplayResults.php
M libraries/Error.php
M libraries/File.php
M libraries/Font.php
M libraries/Header.php
M libraries/Index.php
M libraries/Linter.php
M libraries/ListDatabase.php
M libraries/Menu.php
M libraries/Message.php
M libraries/PDF.php
M libraries/Response.php
M libraries/Scripts.php
M libraries/ServerStatusData.php
M libraries/StorageEngine.php
M libraries/SysInfoLinux.php
M libraries/Table.php
M libraries/Tracker.php
M libraries/TypesMySQL.php
M libraries/Util.php
M libraries/bookmark.lib.php
M libraries/browse_foreigners.lib.php
M libraries/central_columns.lib.php
M libraries/check_user_privileges.lib.php
M libraries/common.inc.php
M libraries/config/Form.php
M libraries/config/FormDisplay.php
M libraries/config/FormDisplay.tpl.php
M libraries/config/ServerConfigChecks.php
M libraries/config/Validator.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/controllers/server/ServerDatabasesController.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/controllers/table/TableChartController.php
M libraries/controllers/table/TableRelationController.php
M libraries/controllers/table/TableSearchController.php
M libraries/controllers/table/TableStructureController.php
M libraries/core.lib.php
M libraries/db_common.inc.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/error_report.lib.php
M libraries/export.lib.php
M libraries/gis/GISGeometry.php
M libraries/gis/GISGeometrycollection.php
M libraries/gis/GISLinestring.php
M libraries/gis/GISMultilinestring.php
M libraries/gis/GISMultipoint.php
M libraries/gis/GISMultipolygon.php
M libraries/gis/GISPoint.php
M libraries/gis/GISPolygon.php
M libraries/gis/GISVisualization.php
M libraries/iconv_wrapper.lib.php
M libraries/import.lib.php
M libraries/insert_edit.lib.php
M libraries/ip_allow_deny.lib.php
M libraries/mime.lib.php
M libraries/mult_submits.inc.php
M libraries/mult_submits.lib.php
M libraries/navigation/NavigationTree.php
M libraries/normalization.lib.php
M libraries/operations.lib.php
M libraries/plugin_interface.lib.php
M libraries/plugins/ImportPlugin.php
M libraries/plugins/auth/AuthenticationCookie.php
M libraries/plugins/export/ExportCsv.php
M libraries/plugins/export/ExportLatex.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/export/ExportXml.php
M libraries/plugins/export/TableProperty.php
M libraries/plugins/import/ImportCsv.php
M libraries/plugins/import/ImportMediawiki.php
M libraries/plugins/import/ImportShp.php
M libraries/plugins/schema/dia/Dia.php
M libraries/plugins/schema/eps/Eps.php
M libraries/plugins/schema/pdf/Pdf.php
M libraries/plugins/schema/svg/Svg.php
M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
M libraries/pmd_common.php
M libraries/relation.lib.php
M libraries/replication.inc.php
M libraries/replication_gui.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_footer.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/sanitizing.lib.php
M libraries/select_lang.lib.php
M libraries/server_privileges.lib.php
M libraries/server_status_monitor.lib.php
M libraries/server_status_processes.lib.php
M libraries/server_status_variables.lib.php
M libraries/server_user_groups.lib.php
M libraries/sql.lib.php
M libraries/sql_query_form.lib.php
M libraries/tbl_columns_definition_form.inc.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M libraries/transformations.lib.php
M libraries/url_generating.lib.php
M prefs_manage.php
M setup/frames/index.inc.php
M setup/lib/ConfigGenerator.php
M sql.php
M tbl_addfield.php
M tbl_change.php
M tbl_create.php
M tbl_get_field.php
M tbl_operations.php
M tbl_relation.php
M templates/columns_definitions/column_attribute.phtml
M templates/columns_definitions/column_auto_increment.phtml
M templates/database/structure/structure_table_row.phtml
M templates/server/plugins/section.phtml
M templates/server/plugins/section_links.phtml
M templates/table/relation/foreign_key_row.phtml
M templates/table/search/input_box.phtml
M templates/table/structure/actions_in_table_structure.phtml
M templates/table/structure/table_structure_row.phtml
M test/classes/ConfigTest.php
M test/libraries/PMA_display_export_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumXssTest.php
M test/selenium/TestBase.php
Log Message:
-----------
Merge pull request #11768 from nijel/overload
Remove /*overload*/ prefix from mb_* calls
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/41caf7bafa2f...66234c452183