[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1562d1: Prepare for 4.7.9-dev

Mon Mar 5 19:19:04 CET 2018

  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1562d1c86be52b4f832e2ce3148ab198353383b8
      https://github.com/phpmyadmin/phpmyadmin/commit/1562d1c86be52b4f832e2ce3148ab198353383b8
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Prepare for 4.7.9-dev

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: c75166c3a9776bc035c0291f284ef59270b7a60e
      https://github.com/phpmyadmin/phpmyadmin/commit/c75166c3a9776bc035c0291f284ef59270b7a60e
  Author: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M libraries/Util.php
    M test/classes/DisplayResultsTest.php

  Log Message:
  -----------
  Revert "Force using POST for SQL query in Util::linkOrButton"

This reverts commit 44df4a309475479af404506dbd77588acc424637.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: be7d5ee738ff70a3fb6cab44b9be8010e68625e9
      https://github.com/phpmyadmin/phpmyadmin/commit/be7d5ee738ff70a3fb6cab44b9be8010e68625e9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/ajax.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/sql.js
    M libraries/Util.php
    M libraries/common.inc.php

  Log Message:
  -----------
  Simplify handling of long URLs in Util::linkOrButton

We no longer create form, but rather rather tag the link to be handled
as POST on the client side.

This way the code is way simpler without need on any special case
handling on server side.

Fixes #13649

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 3b9fb2b664632557866feb083b59743ed60d1e22)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: f31dfc530b49c9c04f73949545106f328f31c3ce
      https://github.com/phpmyadmin/phpmyadmin/commit/f31dfc530b49c9c04f73949545106f328f31c3ce
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M test/classes/UtilTest.php

  Log Message:
  -----------
  Add tests for Util::linkOrButton

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 816c42665af83d8f2652c6c0e9c0d92c63526ae6)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 6f4740e17c07b8cb4b0ec1961460ae036d27ad00
      https://github.com/phpmyadmin/phpmyadmin/commit/6f4740e17c07b8cb4b0ec1961460ae036d27ad00
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M libraries/Util.php
    M test/classes/DisplayResultsTest.php

  Log Message:
  -----------
  Always use POST for links containing SQL query

This way the SQL queries will not apper in the web server logs.

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 99e9854473155a5337fc9361d9eba4bae3d30792)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 8d238a3a1a51e34628a08663ada5437948a403a4
      https://github.com/phpmyadmin/phpmyadmin/commit/8d238a3a1a51e34628a08663ada5437948a403a4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Handle data-post with leading ?

This makes it easier to convert existing code.

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit f059baa2ec9eaf749dc85e0f339018c326818d15)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 35dc6d4f2cd519027958abd9353ba85f822030f4
      https://github.com/phpmyadmin/phpmyadmin/commit/35dc6d4f2cd519027958abd9353ba85f822030f4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/db_structure.js
    M js/functions.js
    M templates/database/structure/empty_table.phtml

  Log Message:
  -----------
  Adjust table truncate operation to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit ff20564ef07f15bda0a6540ac45427a3b6571015)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: a20b287f4036916e61d49ae70558c1922ee80666
      https://github.com/phpmyadmin/phpmyadmin/commit/a20b287f4036916e61d49ae70558c1922ee80666
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/db_structure.js
    M templates/database/structure/structure_table_row.phtml

  Log Message:
  -----------
  Adjust table drop operation to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 8332861d62dbe130e3d4bf195707f884d89d0cb2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 9af081a4b96c6a87af50fcb42e9c42e1847d863f
      https://github.com/phpmyadmin/phpmyadmin/commit/9af081a4b96c6a87af50fcb42e9c42e1847d863f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/tbl_structure.js
    M templates/table/structure/action_row_in_structure_table.phtml
    M templates/table/structure/actions_in_table_structure.phtml

  Log Message:
  -----------
  Adjust adding table key operations to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 6ee2f1284100b6aa98a3a08dc1f520c48b49ed25)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 8229dabe4686bf9a76a1819f4a97e64083726f7b
      https://github.com/phpmyadmin/phpmyadmin/commit/8229dabe4686bf9a76a1819f4a97e64083726f7b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M templates/table/structure/actions_in_table_structure.phtml

  Log Message:
  -----------
  Adjust browsing distinct values to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit e7eaea8c86bcb012585e709a3511539df509ffb8)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 590b0ed3377d7ead2b9df8bba59ed6a02f996ba6
      https://github.com/phpmyadmin/phpmyadmin/commit/590b0ed3377d7ead2b9df8bba59ed6a02f996ba6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M templates/table/structure/display_partitions.phtml

  Log Message:
  -----------
  Adjust partition manipulations to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 599a981b50ec0c19bb2c827e28edef7106b593e0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: f6bb1901f6eef097a5b827927171eb43cc5fc173
      https://github.com/phpmyadmin/phpmyadmin/commit/f6bb1901f6eef097a5b827927171eb43cc5fc173
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M templates/table/structure/display_table_stats.phtml
    M templates/table/structure/optional_action_links.phtml

  Log Message:
  -----------
  Adjust optimize table to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 750820519124488c6f2cb546a397de4715c7fa8b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 19484adb03bfc831b247d75b13d0986eb421a332
      https://github.com/phpmyadmin/phpmyadmin/commit/19484adb03bfc831b247d75b13d0986eb421a332
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/tbl_structure.js
    M templates/table/structure/table_structure_row.phtml

  Log Message:
  -----------
  Adjust field drop to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 613a146e97e34e6b05d7c8c6de15afdb39d8da2b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 8f9f8aa3b5dba8df743f3dffea3fb5731acb2e38
      https://github.com/phpmyadmin/phpmyadmin/commit/8f9f8aa3b5dba8df743f3dffea3fb5731acb2e38
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/rte.js
    M libraries/rte/rte_list.lib.php

  Log Message:
  -----------
  Adjust RTE oprations to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 2bc87216f0c39e11ea8efd6bedd903aa8ffb51f9)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: fc378b0bd3c034515fac6436713e24f24c4b792d
      https://github.com/phpmyadmin/phpmyadmin/commit/fc378b0bd3c034515fac6436713e24f24c4b792d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M libraries/operations.lib.php
    M test/libraries/PMA_operations_test.php

  Log Message:
  -----------
  Adjust table operations to use POST

Issue #13866

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 6b5d535da547600b46b8077d8f69f663374d6e3e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 1f00c99be950a2173fe5dc1c51410c88c83fe6ff
      https://github.com/phpmyadmin/phpmyadmin/commit/1f00c99be950a2173fe5dc1c51410c88c83fe6ff
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/ajax.js
    M js/db_structure.js
    M js/functions.js
    M js/rte.js
    M js/sql.js
    M js/tbl_structure.js

  Log Message:
  -----------
  Share code for parsing data-post attribute

It can include leading question mark and we should deal with it in all
locations.

Fixes #13913

Signed-off-by: Michal Čihař <michal at cihar.com>
(cherry picked from commit 1fc566fd90d838d35dfa5251f26deb48d15780a7)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 60032ce9de24fe2a329e77b36c20a810f881bace
      https://github.com/phpmyadmin/phpmyadmin/commit/60032ce9de24fe2a329e77b36c20a810f881bace
  Author: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fix getPostData function

dataPost can be undefined

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
(cherry picked from commit 367f49b12bb15f7891abeac22c7f5be538e39af1)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 031c832fd7ee3a3dc06169e0d4371def34b5a016
      https://github.com/phpmyadmin/phpmyadmin/commit/031c832fd7ee3a3dc06169e0d4371def34b5a016
  Author: Gemorroj <wapinet at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/tbl_operations.js

  Log Message:
  -----------
  Update tbl_operations.js

fix maintenance operations

Signed-off-by: Gemorroj <wapinet at gmail.com>
(cherry picked from commit b3c9a0c115d6d24f5f94ed2e0a8c2276f4aab8c2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: c21a9cf51fc7ed2f4da293013032e82ccda20a15
      https://github.com/phpmyadmin/phpmyadmin/commit/c21a9cf51fc7ed2f4da293013032e82ccda20a15
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/ajax.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/rte.js
    M js/sql.js
    M js/tbl_operations.js
    M js/tbl_structure.js
    M libraries/Util.php
    M libraries/common.inc.php
    M libraries/operations.lib.php
    M libraries/rte/rte_list.lib.php
    M templates/database/structure/empty_table.phtml
    M templates/database/structure/structure_table_row.phtml
    M templates/table/structure/action_row_in_structure_table.phtml
    M templates/table/structure/actions_in_table_structure.phtml
    M templates/table/structure/display_partitions.phtml
    M templates/table/structure/display_table_stats.phtml
    M templates/table/structure/optional_action_links.phtml
    M templates/table/structure/table_structure_row.phtml
    M test/classes/DisplayResultsTest.php
    M test/classes/UtilTest.php
    M test/libraries/PMA_operations_test.php

  Log Message:
  -----------
  Merge pull request #14036 from mauriciofauth/broken-sort

Fix broken sort

  Commit: 082a17dfd8a3c4b1a20646e59e03fec8a5d8b554
      https://github.com/phpmyadmin/phpmyadmin/commit/082a17dfd8a3c4b1a20646e59e03fec8a5d8b554
  Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]

  Commit: 7f3947dc6cc3ae719f3a38dae4dce5163811089a
      https://github.com/phpmyadmin/phpmyadmin/commit/7f3947dc6cc3ae719f3a38dae4dce5163811089a
  Author: Weblate <noreply at weblate.org>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M js/ajax.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/rte.js
    M js/sql.js
    M js/tbl_operations.js
    M js/tbl_structure.js
    M libraries/Util.php
    M libraries/common.inc.php
    M libraries/operations.lib.php
    M libraries/rte/rte_list.lib.php
    M templates/database/structure/empty_table.phtml
    M templates/database/structure/structure_table_row.phtml
    M templates/table/structure/action_row_in_structure_table.phtml
    M templates/table/structure/actions_in_table_structure.phtml
    M templates/table/structure/display_partitions.phtml
    M templates/table/structure/display_table_stats.phtml
    M templates/table/structure/optional_action_links.phtml
    M templates/table/structure/table_structure_row.phtml
    M test/classes/DisplayResultsTest.php
    M test/classes/UtilTest.php
    M test/libraries/PMA_operations_test.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

  Commit: e1920f10c21c0e2dfea9e54ee7ecf994b55d6735
      https://github.com/phpmyadmin/phpmyadmin/commit/e1920f10c21c0e2dfea9e54ee7ecf994b55d6735
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Update linkcheck ignore list

- remove SNI issues as this seems to be fixed
- add pecl.php.net as that is showing timeouts for last weel

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 3fe1e5a6252a601add4bff97bd8fc3545b9a407b
      https://github.com/phpmyadmin/phpmyadmin/commit/3fe1e5a6252a601add4bff97bd8fc3545b9a407b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M .travis.yml
    M test/ci-install-docs

  Log Message:
  -----------
  Use python 3.6 to build docs

It fixes SNI issues.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 9e432241d96f991855610805ed60de5366b27f87
      https://github.com/phpmyadmin/phpmyadmin/commit/9e432241d96f991855610805ed60de5366b27f87
  Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]

  Commit: a5e473267bce717023767b14fcb614d35f7d0cec
      https://github.com/phpmyadmin/phpmyadmin/commit/a5e473267bce717023767b14fcb614d35f7d0cec
  Author: Weblate <noreply at weblate.org>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M .travis.yml
    M test/ci-install-docs

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

  Commit: cf1ad5c59f0990ac9199a9fdd232c0122b4aed4c
      https://github.com/phpmyadmin/phpmyadmin/commit/cf1ad5c59f0990ac9199a9fdd232c0122b4aed4c
  Author: Robert Antoni Buj Gelonch <robert.buj at gmail.com>
  Date:   2018-02-24 (Sat, 24 Feb 2018)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]

  Commit: b34301220d10a6dbeea5c8e9864689acff90b3f0
      https://github.com/phpmyadmin/phpmyadmin/commit/b34301220d10a6dbeea5c8e9864689acff90b3f0
  Author: Aki Kettunen <aki at akikettu.net>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M po/fi.po

  Log Message:
  -----------
  Translated using Weblate (Finnish)

Currently translated at 69.0% (2216 of 3208 strings)

[CI skip]

  Commit: 13e7973c4fd90d7b8e7adb82cca3a508ce2b2e9c
      https://github.com/phpmyadmin/phpmyadmin/commit/13e7973c4fd90d7b8e7adb82cca3a508ce2b2e9c
  Author: Stanisław Krukowski <pet209a1 at riseup.net>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M po/pl.po

  Log Message:
  -----------
  Translated using Weblate (Polish)

Currently translated at 98.6% (3166 of 3208 strings)

[CI skip]

  Commit: 276a569431e06656e448dc3402b97b91f0209bea
      https://github.com/phpmyadmin/phpmyadmin/commit/276a569431e06656e448dc3402b97b91f0209bea
  Author: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M templates/table/search/input_box.phtml

  Log Message:
  -----------
  Fix double escaping in enum dropdown

Fix #14044

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: 62fc8e24f43d28e52bb927a861ec66888fbdc151
      https://github.com/phpmyadmin/phpmyadmin/commit/62fc8e24f43d28e52bb927a861ec66888fbdc151
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M po/pl.po

  Log Message:
  -----------
  Translated using Weblate (Polish)

Currently translated at 98.6% (3166 of 3208 strings)

[CI skip]

  Commit: 2d352492b198bca56e1ae31257020e2f555fe586
      https://github.com/phpmyadmin/phpmyadmin/commit/2d352492b198bca56e1ae31257020e2f555fe586
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M doc/import_export.rst

  Log Message:
  -----------
  More up to date OpenDocument docs

Currently all vendors support this.

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 3481e3c27091fd465c641f8adec4c1330dfd63af
      https://github.com/phpmyadmin/phpmyadmin/commit/3481e3c27091fd465c641f8adec4c1330dfd63af
  Author: Yaron Shahrabani <sh.yaron at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M po/he.po

  Log Message:
  -----------
  Translated using Weblate (Hebrew)

Currently translated at 16.3% (523 of 3208 strings)

[CI skip]

  Commit: bfbea294f3781d19c1e9917c3e44946e669ad122
      https://github.com/phpmyadmin/phpmyadmin/commit/bfbea294f3781d19c1e9917c3e44946e669ad122
  Author: Weblate <noreply at weblate.org>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M doc/import_export.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

  Commit: 984c6a0054b85c1fbadef21eb88f8872f64eba3a
      https://github.com/phpmyadmin/phpmyadmin/commit/984c6a0054b85c1fbadef21eb88f8872f64eba3a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M js/common.js
    M js/db_central_columns.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_tracking.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/microhistory.js
    M js/multi_column_sort.js
    M js/navigation.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/sql.js
    M js/tbl_operations.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M js/tbl_tracking.js
    M libraries/Header.php

  Log Message:
  -----------
  Honor arg_separator in AJAX requests

Fixes #13940

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: c9153ed21a8b0625b846700ec19540c5671029c8
      https://github.com/phpmyadmin/phpmyadmin/commit/c9153ed21a8b0625b846700ec19540c5671029c8
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog for #14036

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 1270873d511ce36d353c6a681891421710f2cf7a
      https://github.com/phpmyadmin/phpmyadmin/commit/1270873d511ce36d353c6a681891421710f2cf7a
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  More ChangeLog entries related to c21a9cf; issues #13927 and #13887

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: a0024aa041c368ba27dbaa7ac9b4fe4be3272f3e
      https://github.com/phpmyadmin/phpmyadmin/commit/a0024aa041c368ba27dbaa7ac9b4fe4be3272f3e
  Author: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fix missing addition operator on string concatenation

Fix #14050

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>

  Commit: e5edef4639432cd5815f1f83a51c16b0f8bc497c
      https://github.com/phpmyadmin/phpmyadmin/commit/e5edef4639432cd5815f1f83a51c16b0f8bc497c
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  English-language fixup.

Thanks to "rafpaf" for noticing this at https://github.com/phpmyadmin/phpmyadmin/pull/13997

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: 93da5b0af84443a9a85130f858196e8b753969cf
      https://github.com/phpmyadmin/phpmyadmin/commit/93da5b0af84443a9a85130f858196e8b753969cf
  Author: Yaron Shahrabani <sh.yaron at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M po/he.po

  Log Message:
  -----------
  Translated using Weblate (Hebrew)

Currently translated at 16.5% (532 of 3208 strings)

[CI skip]

  Commit: 16c6c114fa062854115d031f741bda0e248676db
      https://github.com/phpmyadmin/phpmyadmin/commit/16c6c114fa062854115d031f741bda0e248676db
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Revert "Fix missing addition operator on string concatenation"

This reverts commit a0024aa041c368ba27dbaa7ac9b4fe4be3272f3e.

  Commit: 3034a23feda18c44f83fd8eb3129cb47adf32c29
      https://github.com/phpmyadmin/phpmyadmin/commit/3034a23feda18c44f83fd8eb3129cb47adf32c29
  Author: Michal Čihař <michal at cihar.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M js/common.js
    M js/db_central_columns.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_tracking.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/microhistory.js
    M js/multi_column_sort.js
    M js/navigation.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/sql.js
    M js/tbl_operations.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M js/tbl_tracking.js
    M libraries/Header.php

  Log Message:
  -----------
  Revert "Honor arg_separator in AJAX requests"

This reverts commit 984c6a0054b85c1fbadef21eb88f8872f64eba3a.

See #13940

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: b3b170da62cfc6d9afb81c4e78aefc6ece350527
      https://github.com/phpmyadmin/phpmyadmin/commit/b3b170da62cfc6d9afb81c4e78aefc6ece350527
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Prepare for version 4.7.9

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: 80914e327e4deafe78e0813ffdba7fce8acf10ac
      https://github.com/phpmyadmin/phpmyadmin/commit/80914e327e4deafe78e0813ffdba7fce8acf10ac
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    A composer.lock

  Log Message:
  -----------
  Adding composer lock for 4.7.9

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: 8775f7a3b0642c603c0783569d2704d6759b332a
      https://github.com/phpmyadmin/phpmyadmin/commit/8775f7a3b0642c603c0783569d2704d6759b332a
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    R composer.lock

  Log Message:
  -----------
  Removing composer.lock

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

  Commit: a091beea60feba48ee7945f2a1f4588e990f4480
      https://github.com/phpmyadmin/phpmyadmin/commit/a091beea60feba48ee7945f2a1f4588e990f4480
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M README
    M doc/conf.py
    M doc/import_export.rst
    M doc/setup.rst
    M js/ajax.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/rte.js
    M js/sql.js
    M js/tbl_operations.js
    M js/tbl_structure.js
    M libraries/Config.php
    M libraries/Util.php
    M libraries/common.inc.php
    M libraries/operations.lib.php
    M libraries/rte/rte_list.lib.php
    M po/ca.po
    M po/fi.po
    M po/he.po
    M po/pl.po
    M templates/database/structure/empty_table.phtml
    M templates/database/structure/structure_table_row.phtml
    M templates/table/search/input_box.phtml
    M templates/table/structure/action_row_in_structure_table.phtml
    M templates/table/structure/actions_in_table_structure.phtml
    M templates/table/structure/display_partitions.phtml
    M templates/table/structure/display_table_stats.phtml
    M templates/table/structure/optional_action_links.phtml
    M templates/table/structure/table_structure_row.phtml
    M test/ci-install-docs
    M test/classes/DisplayResultsTest.php
    M test/classes/UtilTest.php
    M test/libraries/PMA_operations_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_7' into STABLE

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad535aa0b262...a091beea60fe