- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] a78b96: Changelog entry for #12944 and #13317
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a78b963025b62b9a44dc09a8def71dbe75e6dea6 https://github.com/phpmyadmin/phpmyadmin/commit/a78b963025b62b9a44dc09a8def… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12944 and #13317 [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] bae477: data shown in JSON format if the data-type is json
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bae477477b7b272d2b8cb5842fc7f28d87f480f0 https://github.com/phpmyadmin/phpmyadmin/commit/bae477477b7b272d2b8cb5842fc… Author: Manish Bisht <manish.bisht490(a)gmail.com> Date: 2017-06-15 (Thu, 15 Jun 2017) Changed paths: M js/makegrid.js Log Message: ----------- data shown in JSON format if the data-type is json Signed-off-by: Manish Bisht <manish.bisht490(a)gmail.com> Commit: 0ded26965b16ddd2fe15b698fcdd07d35bb970d6 https://github.com/phpmyadmin/phpmyadmin/commit/0ded26965b16ddd2fe15b698fcd… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M js/makegrid.js Log Message: ----------- Merge pull request #13317 from manishbisht/json-editor JSON data shown in JSON format while editing Compare: https://github.com/phpmyadmin/phpmyadmin/compare/688143af8ff7...0ded26965b16

1 0

[phpmyadmin/phpmyadmin] a586ca: Translated using Weblate (Belarusian)
by Weblate 28 Jun '17

28 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a586ca7a247277cad7ee8674ea842b53ab6b4e6c https://github.com/phpmyadmin/phpmyadmin/commit/a586ca7a247277cad7ee8674ea8… Author: Viktar Vauchkevich <victorenator(a)gmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 63.2% (2027 of 3203 strings) [CI skip] Commit: 1bc5f1fc5cbb637b15aaa773776bdb3c819c1798 https://github.com/phpmyadmin/phpmyadmin/commit/1bc5f1fc5cbb637b15aaa773776… Author: Weblate <noreply(a)weblate.org> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M test/classes/UtilTest.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3e6f5f1847c1...1bc5f1fc5cbb

1 0

[phpmyadmin/phpmyadmin] 49c963: Add tests for both paths in curl
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49c963542df3ada44bf369281cbea420513d7c59 https://github.com/phpmyadmin/phpmyadmin/commit/49c963542df3ada44bf369281cb… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M test/classes/UtilTest.php Log Message: ----------- Add tests for both paths in curl Test both CURLOPT_CAPATH and URLOPT_CAINFO setup. Fixes #13398 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3e6f5f1847c15c74354dd925fc1e1ed17772c027 https://github.com/phpmyadmin/phpmyadmin/commit/3e6f5f1847c15c74354dd925fc1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/pt_BR.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a2d71c5d2447...3e6f5f1847c1

1 0

[phpmyadmin/phpmyadmin] b6666e: Translated using Weblate (Portuguese (Brazil))
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b6666e4bc0d0e49fe696ba61b90941a6a2985eb1 https://github.com/phpmyadmin/phpmyadmin/commit/b6666e4bc0d0e49fe696ba61b90… Author: George Bezerra <georgelione(a)gmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: 19fe294049e2d052486199b68d26cf11ea4907ae https://github.com/phpmyadmin/phpmyadmin/commit/19fe294049e2d052486199b68d2… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: a2d71c5d24474f4e4b10049b9f83a4c693a40345 https://github.com/phpmyadmin/phpmyadmin/commit/a2d71c5d24474f4e4b10049b9f8… Author: Weblate <noreply(a)weblate.org> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: 3e6f5f1847c15c74354dd925fc1e1ed17772c027 https://github.com/phpmyadmin/phpmyadmin/commit/3e6f5f1847c15c74354dd925fc1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/pt_BR.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 Commit: 688143af8ff711d06740ead2f7890bc871d6fc45 https://github.com/phpmyadmin/phpmyadmin/commit/688143af8ff711d06740ead2f78… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef6085d5510c...688143af8ff7

1 0

[phpmyadmin/phpmyadmin] b397b4: Translated using Weblate (Belarusian)
by Weblate 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b397b40b1b6b54a61bc78c17c3b686c9522dec3c https://github.com/phpmyadmin/phpmyadmin/commit/b397b40b1b6b54a61bc78c17c3b… Author: Viktar Vauchkevich <victorenator(a)gmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 63.3% (2034 of 3211 strings) [CI skip] Commit: ef6085d5510c26e06be0e2178f97a986cf26305f https://github.com/phpmyadmin/phpmyadmin/commit/ef6085d5510c26e06be0e2178f9… Author: Weblate <noreply(a)weblate.org> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M test/classes/UtilTest.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4ee38fe8d07a...ef6085d5510c

1 0

[phpmyadmin/phpmyadmin] 49c963: Add tests for both paths in curl
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49c963542df3ada44bf369281cbea420513d7c59 https://github.com/phpmyadmin/phpmyadmin/commit/49c963542df3ada44bf369281cb… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M test/classes/UtilTest.php Log Message: ----------- Add tests for both paths in curl Test both CURLOPT_CAPATH and URLOPT_CAINFO setup. Fixes #13398 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4ee38fe8d07a44ca0f2449355d50ca695a386a14 https://github.com/phpmyadmin/phpmyadmin/commit/4ee38fe8d07a44ca0f2449355d5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M test/classes/UtilTest.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0ceda63d9d1a...4ee38fe8d07a

1 0

[phpmyadmin/phpmyadmin] b6666e: Translated using Weblate (Portuguese (Brazil))
by Weblate 28 Jun '17

28 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b6666e4bc0d0e49fe696ba61b90941a6a2985eb1 https://github.com/phpmyadmin/phpmyadmin/commit/b6666e4bc0d0e49fe696ba61b90… Author: George Bezerra <georgelione(a)gmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: 19fe294049e2d052486199b68d26cf11ea4907ae https://github.com/phpmyadmin/phpmyadmin/commit/19fe294049e2d052486199b68d2… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: a2d71c5d24474f4e4b10049b9f83a4c693a40345 https://github.com/phpmyadmin/phpmyadmin/commit/a2d71c5d24474f4e4b10049b9f8… Author: Weblate <noreply(a)weblate.org> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6a86026eacaa...a2d71c5d2447

1 0

[phpmyadmin/phpmyadmin] 6a8602: Correctly escape column name when sorting
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a86026eacaa286c2707a9a05c291c40eb9ec180 https://github.com/phpmyadmin/phpmyadmin/commit/6a86026eacaa286c2707a9a05c2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Correctly escape column name when sorting Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1c247ce4ff68d8552251e89e48e72857259d3fe9 https://github.com/phpmyadmin/phpmyadmin/commit/1c247ce4ff68d8552251e89e48e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Merge branch 'QA_4_7' Commit: 0ceda63d9d1a5e82de3130020b68f6789169853d https://github.com/phpmyadmin/phpmyadmin/commit/0ceda63d9d1a5e82de3130020b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M po/pt_BR.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/10ae12b900ee...0ceda63d9d1a

1 0

[phpmyadmin/phpmyadmin] 6a8602: Correctly escape column name when sorting
by Michal Čihař 28 Jun '17

28 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a86026eacaa286c2707a9a05c291c40eb9ec180 https://github.com/phpmyadmin/phpmyadmin/commit/6a86026eacaa286c2707a9a05c2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-28 (Wed, 28 Jun 2017) Changed paths: M libraries/DisplayResults.php Log Message: ----------- Correctly escape column name when sorting Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0