- Git - lists.phpmyadmin.net

[phpmyadmin/website] 9133db: Document not acceptable sites
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 9133db77a6014b27eb80fa0befc93c0adb691894 https://github.com/phpmyadmin/website/commit/9133db77a6014b27eb80fa0befc93c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Document not acceptable sites As agreed on the team meeting, see https://irc.phpmyadmin.net/meetbot/phpmyadmin/2016/phpmyadmin.2016-11-09-12… Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6333b4807ccd100796894af1c5c85269a66453c6 https://github.com/phpmyadmin/website/commit/6333b4807ccd100796894af1c5c852… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Update to mention illegal content links See team mailing list thread for decision (needs login): https://lists.phpmyadmin.net/mailman/private/team/2016-November/004976.html Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3bb28f0db497da67b5a62c1a12caf331764fc09b https://github.com/phpmyadmin/website/commit/3bb28f0db497da67b5a62c1a12caf3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Add missing comma Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c9f2dfca931a3541d9247f438b9b4194937f5d26 https://github.com/phpmyadmin/website/commit/c9f2dfca931a3541d9247f438b9b41… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M pmaweb/templates/_sponsorship_conditions.html Log Message: ----------- Merge pull request #44 from nijel/sponsor-areas Document not acceptable sites Compare: https://github.com/phpmyadmin/website/compare/876dc426c44c...c9f2dfca931a

1 0

[phpmyadmin/phpmyadmin] b8a9b0: Share code for getting temporary directory
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8a9b0f30d3d83746967ef457cca641e014c32a5 https://github.com/phpmyadmin/phpmyadmin/commit/b8a9b0f30d3d83746967ef457cc… Author: osaid <osaid.nasir(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Encoding.php M libraries/File.php M libraries/config/ConfigFile.php Log Message: ----------- Share code for getting temporary directory Changed Encoding.php and File.php. Fixes #12514 Signed-off-by: Osaid <osaid.nasir(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 84971eaf4f1b47a148e60a0042291e5ccb45ea3d https://github.com/phpmyadmin/phpmyadmin/commit/84971eaf4f1b47a148e60a00422… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/config/ConfigFile.php Log Message: ----------- Make function static as it's called statically Issue #12690, #12514 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef1f3b5cf7da...84971eaf4f1b

1 0

[phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc764… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Avoid listing demo.phpmyadmin.net twice Fixes #12744 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac https://github.com/phpmyadmin/phpmyadmin/commit/ef1f3b5cf7da0f8798c4156e3c7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/df66e4fa080e...ef1f3b5cf7da

1 0

[phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc764… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Avoid listing demo.phpmyadmin.net twice Fixes #12744 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] df66e4: Share code for handling uploaded file
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df66e4fa080e2aa938bc415a5be9bfe7af611301 https://github.com/phpmyadmin/phpmyadmin/commit/df66e4fa080e2aa938bc415a5be… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/File.php M prefs_manage.php Log Message: ----------- Share code for handling uploaded file There is no need to duplicate the incomplete logic in several places. Issue #12514, #12690 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 826a88: Fix comment for sql-parser vendor config
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/vendor_config.php Log Message: ----------- Fix comment for sql-parser vendor config Fixes #12745 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 826a88: Fix comment for sql-parser vendor config
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/vendor_config.php Log Message: ----------- Fix comment for sql-parser vendor config Fixes #12745 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a4b6654293162f028fd4ed1bc573f241bdebb119 https://github.com/phpmyadmin/phpmyadmin/commit/a4b6654293162f028fd4ed1bc57… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85f297ea6d4a...a4b665429316

1 0

[phpmyadmin/phpmyadmin] 85f297: Remove no longer needed include from setup
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 85f297ea6d4ae2061457195995e2036772225070 https://github.com/phpmyadmin/phpmyadmin/commit/85f297ea6d4ae2061457195995e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M setup/frames/index.inc.php Log Message: ----------- Remove no longer needed include from setup Fixes #12748 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 10caf5: Check if variables are set prior to use
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 10caf5bcae948c687fbd4d64eb5af2641a3c8119 https://github.com/phpmyadmin/phpmyadmin/commit/10caf5bcae948c687fbd4d64eb5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Config.php Log Message: ----------- Check if variables are set prior to use Issue #12713 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 4d0d64: Translated using Weblate (Chinese (Taiwan))
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d0d64872851912f58a312306c9d3cc47a660922 https://github.com/phpmyadmin/phpmyadmin/commit/4d0d64872851912f58a312306c9… Author: ncwgf <hd(a)cgsword.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Chinese (Taiwan)) Currently translated at 99.0% (3192 of 3222 strings) [CI skip] Commit: 09bfa5fa9d4cb6f6e99cc7e775227d6273bd5c6c https://github.com/phpmyadmin/phpmyadmin/commit/09bfa5fa9d4cb6f6e99cc7e7752… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 9c52bd07242e77986533a53c9d2052ae4c0662ac https://github.com/phpmyadmin/phpmyadmin/commit/9c52bd07242e77986533a53c9d2… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M doc/setup.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 8640f79aae02f4863b31019f424d14754312f3ac https://github.com/phpmyadmin/phpmyadmin/commit/8640f79aae02f4863b31019f424… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6' Commit: 598cfa7c401c0019498adf383aa6b4365fbc3be5 https://github.com/phpmyadmin/phpmyadmin/commit/598cfa7c401c0019498adf383aa… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/zh_TW.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: b746697397fbb70bb01456b1680b491862a2a8ba https://github.com/phpmyadmin/phpmyadmin/commit/b746697397fbb70bb01456b1680… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Correctly handle HTTP status when doing requests When performing requests, we should not simply return content in case of failure, the error should be propagated. This could lead to invalid reporting of Git commit data as we would tread GitHub rate limiting response as commit information. Fixes #12713 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 10caf5bcae948c687fbd4d64eb5af2641a3c8119 https://github.com/phpmyadmin/phpmyadmin/commit/10caf5bcae948c687fbd4d64eb5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Config.php Log Message: ----------- Check if variables are set prior to use Issue #12713 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b758e59bc495bd7aa8751ce3b78c3a87230cee3d https://github.com/phpmyadmin/phpmyadmin/commit/b758e59bc495bd7aa8751ce3b78… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Config.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3e7819fd4fae...b758e59bc495

1 0