18 Jan
2017
18 Jan
'17
11:51 a.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 77c33d0444d500377d54cf97e640d70c865856c8
https://github.com/phpmyadmin/phpmyadmin/commit/77c33d0444d500377d54cf97e64…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M ChangeLog
M libraries/DisplayResults.php
M libraries/config/messages.inc.php
M libraries/controllers/table/TableRelationController.php
M libraries/plugins/export/ExportSql.php
M libraries/pmd_common.php
M templates/database/designer/delete_relation_panel.phtml
M templates/database/designer/new_relation_panel.phtml
M templates/database/designer/options_panel.phtml
M templates/database/designer/side_menu.phtml
M templates/database/designer/table_list.phtml
M templates/table/relation/common_form.phtml
M test/classes/plugin/export/ExportSqlTest.php
Log Message:
-----------
Rename Relations to Relationships in many places; Fixes issue #12536
Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>
Commit: 2de8a2d47682030b677e0496a4e205abd152c017
https://github.com/phpmyadmin/phpmyadmin/commit/2de8a2d47682030b677e0496a4e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths:
M ChangeLog
M doc/config.rst
M export.php
M index.php
M js/server_status_queries.js
M js/tbl_zoom_plot_jqplot.js
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/dbi/DBIMysqli.php
M libraries/insert_edit.lib.php
M libraries/server_status_queries.lib.php
A phpinfo.php
M po/az.po
M po/ia.po
M po/pt.po
M po/pt_BR.po
M test/libraries/PMA_server_status_queries_test.php
Log Message:
-----------
Merge branch 'master' into 12536
Commit: 1f8621dbb084269e29318ff43fae1f28826e4f64
https://github.com/phpmyadmin/phpmyadmin/commit/1f8621dbb084269e29318ff43fa…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths:
M ChangeLog
M libraries/DisplayResults.php
M libraries/config/messages.inc.php
M libraries/controllers/table/TableRelationController.php
M libraries/plugins/export/ExportSql.php
M libraries/pmd_common.php
M templates/database/designer/delete_relation_panel.phtml
M templates/database/designer/new_relation_panel.phtml
M templates/database/designer/options_panel.phtml
M templates/database/designer/side_menu.phtml
M templates/database/designer/table_list.phtml
M templates/table/relation/common_form.phtml
M test/classes/plugin/export/ExportSqlTest.php
Log Message:
-----------
Merge pull request #12892 from ibennetch/12536
Rename Relations to Relationships in many places; Fixes issue #12536
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eafd5a5d9337...1f8621dbb084