[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1b1d68: Use proper check to verify if index is set in the ...
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 https://github.com/phpmyadmin/phpmyadmin/commit/1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: --- Use proper check to verify if index is set in the Request Fix #12759 Signed-off-by: Deven Bansod Commit: b1e14110de7d2872569684c78c0a0e76ab14ff24 https://github.com/phpmyadmin/phpmyadmin/commit/b1e14110de7d2872569684c78c0a0e76ab14ff24 Author: pralin Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Translated using Weblate (Japanese) Currently translated at 70.7% (2280 of 3222 strings) [CI skip] Commit: 2d4c88ab1515e4f3c012a482346880c8f592fea6 https://github.com/phpmyadmin/phpmyadmin/commit/2d4c88ab1515e4f3c012a482346880c8f592fea6 Author: Weblate Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: --- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 https://github.com/phpmyadmin/phpmyadmin/commit/17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog Log Message: --- ChangeLog for #12759 Signed-off-by: Deven Bansod Commit: 6baa646c74f041f3646017333eb86e414821f034 https://github.com/phpmyadmin/phpmyadmin/commit/6baa646c74f041f3646017333eb86e414821f034 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: --- Check if the cfgrelation tables are actually set before using them Fix #12760 Signed-off-by: Deven Bansod Commit: 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog Log Message: --- ChangeLog for #12760 Signed-off-by: Deven Bansod Commit: 9fdc05ce3818fbab3ef9ba185f000c8d6f57368f https://github.com/phpmyadmin/phpmyadmin/commit/9fdc05ce3818fbab3ef9ba185f000c8d6f57368f Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 6473f6910a2558149e0c0237693968e737396b86 https://github.com/phpmyadmin/phpmyadmin/commit/6473f6910a2558149e0c0237693968e737396b86 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: --- Merge branch 'QA_4_6' Conflicts: po/ja.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d879ecaaa862...6473f6910a25___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e050cd: Translated using Weblate (Japanese)
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e050cdb8adf520a5b83547e4a9d835d5c34802aa https://github.com/phpmyadmin/phpmyadmin/commit/e050cdb8adf520a5b83547e4a9d835d5c34802aa Author: pralin Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Translated using Weblate (Japanese) Currently translated at 70.3% (2275 of 3232 strings) [CI skip] Commit: 6d7bfe2e315c043bbdf8188689304cbd6cffa8fc https://github.com/phpmyadmin/phpmyadmin/commit/6d7bfe2e315c043bbdf8188689304cbd6cffa8fc Author: Weblate Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: --- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6473f6910a25...6d7bfe2e315c___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 996f5a: Translated using Weblate (Japanese)
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 996f5a591d37d573154952ee928558c5737cf83e https://github.com/phpmyadmin/phpmyadmin/commit/996f5a591d37d573154952ee928558c5737cf83e Author: pralin Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Translated using Weblate (Japanese) Currently translated at 70.7% (2280 of 3222 strings) [CI skip] Commit: 3990a6c311758db6a67c0b2cb2c2e26034fabf20 https://github.com/phpmyadmin/phpmyadmin/commit/3990a6c311758db6a67c0b2cb2c2e26034fabf20 Author: Weblate Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: --- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9fdc05ce3818...3990a6c31175___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6baa64: Check if the cfgrelation tables are actually set b...
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6baa646c74f041f3646017333eb86e414821f034 https://github.com/phpmyadmin/phpmyadmin/commit/6baa646c74f041f3646017333eb86e414821f034 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: --- Check if the cfgrelation tables are actually set before using them Fix #12760 Signed-off-by: Deven Bansod Commit: 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog Log Message: --- ChangeLog for #12760 Signed-off-by: Deven Bansod Commit: 9fdc05ce3818fbab3ef9ba185f000c8d6f57368f https://github.com/phpmyadmin/phpmyadmin/commit/9fdc05ce3818fbab3ef9ba185f000c8d6f57368f Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d4c88ab1515...9fdc05ce3818___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b1e141: Translated using Weblate (Japanese)
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b1e14110de7d2872569684c78c0a0e76ab14ff24 https://github.com/phpmyadmin/phpmyadmin/commit/b1e14110de7d2872569684c78c0a0e76ab14ff24 Author: pralin Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Translated using Weblate (Japanese) Currently translated at 70.7% (2280 of 3222 strings) [CI skip] Commit: 2d4c88ab1515e4f3c012a482346880c8f592fea6 https://github.com/phpmyadmin/phpmyadmin/commit/2d4c88ab1515e4f3c012a482346880c8f592fea6 Author: Weblate Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: --- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/17e4e9e5c06b...2d4c88ab1515___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1b1d68: Use proper check to verify if index is set in the ...
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 https://github.com/phpmyadmin/phpmyadmin/commit/1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: --- Use proper check to verify if index is set in the Request Fix #12759 Signed-off-by: Deven Bansod Commit: 17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 https://github.com/phpmyadmin/phpmyadmin/commit/17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M ChangeLog Log Message: --- ChangeLog for #12759 Signed-off-by: Deven Bansod Compare: https://github.com/phpmyadmin/phpmyadmin/compare/09f56abed651...17e4e9e5c06b___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 19d263: Translated using Weblate (Japanese)
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 19d2632f955b60f3cb4c42c34b71ff1b0a0cc587 https://github.com/phpmyadmin/phpmyadmin/commit/19d2632f955b60f3cb4c42c34b71ff1b0a0cc587 Author: pralin Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M po/ja.po Log Message: --- Translated using Weblate (Japanese) Currently translated at 70.3% (2275 of 3232 strings) [CI skip] Commit: d879ecaaa8621fa65bd6ac525d49f45fe084a109 https://github.com/phpmyadmin/phpmyadmin/commit/d879ecaaa8621fa65bd6ac525d49f45fe084a109 Author: Weblate Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M setup/frames/index.inc.php Log Message: --- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a530503c225b...d879ecaaa862___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a53050: Replace call to undefined function by correct call
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a530503c225b24fab279b9b9e74a094c313d60fd https://github.com/phpmyadmin/phpmyadmin/commit/a530503c225b24fab279b9b9e74a094c313d60fd Author: Deven Bansod Date: 2016-11-29 (Tue, 29 Nov 2016) Changed paths: M setup/frames/index.inc.php Log Message: --- Replace call to undefined function by correct call Fix #12756 Signed-off-by: Deven Bansod ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] 071536: Add version label
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 0715366ee317fd43589cc1a85d09ed3edbbd4c57 https://github.com/phpmyadmin/docker/commit/0715366ee317fd43589cc1a85d09ed3edbbd4c57 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Add version label Issue #85 Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 09f56a: Fix test expectations
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 09f56abed65186216858cf30bdb6f3bea01c708f https://github.com/phpmyadmin/phpmyadmin/commit/09f56abed65186216858cf30bdb6f3bea01c708f Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: --- Fix test expectations Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 62cf19: remove unused property "$_isAjaxPage"
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 62cf19dbd70335d24f2e21cb95f495c40b95a64f https://github.com/phpmyadmin/phpmyadmin/commit/62cf19dbd70335d24f2e21cb95f495c40b95a64f Author: Arrizal Amin Date: 2016-11-20 (Sun, 20 Nov 2016) Changed paths: M libraries/Response.php Log Message: --- remove unused property "$_isAjaxPage" Signed-off-by: Arrizal Amin Commit: 09f56abed65186216858cf30bdb6f3bea01c708f https://github.com/phpmyadmin/phpmyadmin/commit/09f56abed65186216858cf30bdb6f3bea01c708f Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: --- Fix test expectations Signed-off-by: Michal Čihař Commit: d3b6d1e7fda368c4422fdbff2bd1bad970fd7a88 https://github.com/phpmyadmin/phpmyadmin/commit/d3b6d1e7fda368c4422fdbff2bd1bad970fd7a88 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/core/PMA_headerLocation_test.php Log Message: --- Merge branch 'QA_4_6' Commit: 2a2b52bbec90c4d08bcb63fe9eb613d59eda0262 https://github.com/phpmyadmin/phpmyadmin/commit/2a2b52bbec90c4d08bcb63fe9eb613d59eda0262 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Response.php Log Message: --- Merge remote-tracking branch 'origin/pull/12721' Commit: 2d2bc08d6c307815ca03ea8ae88dee6f0476be64 https://github.com/phpmyadmin/phpmyadmin/commit/2d2bc08d6c307815ca03ea8ae88dee6f0476be64 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Response.php Log Message: --- Remove obsolete comment Signed-off-by: Michal Čihař Compare: https://github.com/phpmyadmin/phpmyadmin/compare/519bddaa0988...2d2bc08d6c30___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 48ebdf: Add missing end of meta tags in header
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48ebdf1852bae90f0f1431fc7983f591ce540025 https://github.com/phpmyadmin/phpmyadmin/commit/48ebdf1852bae90f0f1431fc7983f591ce540025 Author: Jees K Denny Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php Log Message: --- Add missing end of meta tags in header Issue #12746 Signed-off-by: Jees K Denny Signed-off-by: Michal Čihař Commit: 068eae7e676fb7f6962036c71074707c13ccf216 https://github.com/phpmyadmin/phpmyadmin/commit/068eae7e676fb7f6962036c71074707c13ccf216 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M templates/header_location.phtml Log Message: --- Add missing end of tags Fixes #12746 Signed-off-by: Michal Čihař Commit: 519bddaa0988bebac11060922b0ad82b815e6dfd https://github.com/phpmyadmin/phpmyadmin/commit/519bddaa0988bebac11060922b0ad82b815e6dfd Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php M templates/header_location.phtml Log Message: --- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84971eaf4f1b...519bddaa0988___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 48ebdf: Add missing end of meta tags in header
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48ebdf1852bae90f0f1431fc7983f591ce540025 https://github.com/phpmyadmin/phpmyadmin/commit/48ebdf1852bae90f0f1431fc7983f591ce540025 Author: Jees K Denny Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/Header.php Log Message: --- Add missing end of meta tags in header Issue #12746 Signed-off-by: Jees K Denny Signed-off-by: Michal Čihař Commit: 068eae7e676fb7f6962036c71074707c13ccf216 https://github.com/phpmyadmin/phpmyadmin/commit/068eae7e676fb7f6962036c71074707c13ccf216 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M templates/header_location.phtml Log Message: --- Add missing end of tags Fixes #12746 Signed-off-by: Michal Čihař Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad55a6eba86d...068eae7e676f___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/website] 9133db: Document not acceptable sites
Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 9133db77a6014b27eb80fa0befc93c0adb691894 https://github.com/phpmyadmin/website/commit/9133db77a6014b27eb80fa0befc93c0adb691894 Author: Michal Čihař 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.16.html Signed-off-by: Michal Čihař Commit: 6333b4807ccd100796894af1c5c85269a66453c6 https://github.com/phpmyadmin/website/commit/6333b4807ccd100796894af1c5c85269a66453c6 Author: Michal Čihař 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ř Commit: 3bb28f0db497da67b5a62c1a12caf331764fc09b https://github.com/phpmyadmin/website/commit/3bb28f0db497da67b5a62c1a12caf331764fc09b Author: Michal Čihař 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ř Commit: c9f2dfca931a3541d9247f438b9b4194937f5d26 https://github.com/phpmyadmin/website/commit/c9f2dfca931a3541d9247f438b9b4194937f5d26 Author: Michal Čihař 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___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b8a9b0: Share code for getting temporary directory
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8a9b0f30d3d83746967ef457cca641e014c32a5 https://github.com/phpmyadmin/phpmyadmin/commit/b8a9b0f30d3d83746967ef457cca641e014c32a5 Author: osaid 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 Signed-off-by: Michal Čihař Commit: 84971eaf4f1b47a148e60a0042291e5ccb45ea3d https://github.com/phpmyadmin/phpmyadmin/commit/84971eaf4f1b47a148e60a0042291e5ccb45ea3d Author: Michal Čihař 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ř Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef1f3b5cf7da...84971eaf4f1b___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] df66e4: Share code for handling uploaded file
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df66e4fa080e2aa938bc415a5be9bfe7af611301 https://github.com/phpmyadmin/phpmyadmin/commit/df66e4fa080e2aa938bc415a5be9bfe7af611301 Author: Michal Čihař 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ř ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd Author: Michal Čihař 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ř Commit: ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac https://github.com/phpmyadmin/phpmyadmin/commit/ef1f3b5cf7da0f8798c4156e3c7ca2e88205b9ac Author: Michal Čihař 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___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ad55a6: Avoid listing demo.phpmyadmin.net twice
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd Author: Michal Čihař 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ř ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 826a88: Fix comment for sql-parser vendor config
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f94e2016bbd255 Author: Michal Čihař 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ř ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 826a88: Fix comment for sql-parser vendor config
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f94e2016bbd255 Author: Michal Čihař 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ř Commit: a4b6654293162f028fd4ed1bc573f241bdebb119 https://github.com/phpmyadmin/phpmyadmin/commit/a4b6654293162f028fd4ed1bc573f241bdebb119 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Log Message: --- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85f297ea6d4a...a4b665429316___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 85f297: Remove no longer needed include from setup
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 85f297ea6d4ae2061457195995e2036772225070 https://github.com/phpmyadmin/phpmyadmin/commit/85f297ea6d4ae2061457195995e2036772225070 Author: Michal Čihař 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ř ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 10caf5: Check if variables are set prior to use
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 10caf5bcae948c687fbd4d64eb5af2641a3c8119 https://github.com/phpmyadmin/phpmyadmin/commit/10caf5bcae948c687fbd4d64eb5af2641a3c8119 Author: Michal Čihař 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ř ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4d0d64: Translated using Weblate (Chinese (Taiwan))
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d0d64872851912f58a312306c9d3cc47a660922 https://github.com/phpmyadmin/phpmyadmin/commit/4d0d64872851912f58a312306c9d3cc47a660922 Author: ncwgf 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/09bfa5fa9d4cb6f6e99cc7e775227d6273bd5c6c Author: Marc Delisle 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/9c52bd07242e77986533a53c9d2052ae4c0662ac Author: Weblate 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/8640f79aae02f4863b31019f424d14754312f3ac Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Log Message: --- Merge branch 'QA_4_6' Commit: 598cfa7c401c0019498adf383aa6b4365fbc3be5 https://github.com/phpmyadmin/phpmyadmin/commit/598cfa7c401c0019498adf383aa6b4365fbc3be5 Author: Michal Čihař 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/b746697397fbb70bb01456b1680b491862a2a8ba Author: Michal Čihař 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ř Commit: 10caf5bcae948c687fbd4d64eb5af2641a3c8119 https://github.com/phpmyadmin/phpmyadmin/commit/10caf5bcae948c687fbd4d64eb5af2641a3c8119 Author: Michal Čihař 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ř Commit: b758e59bc495bd7aa8751ce3b78c3a87230cee3d https://github.com/phpmyadmin/phpmyadmin/commit/b758e59bc495bd7aa8751ce3b78c3a87230cee3d Author: Michal Čihař 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___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] 2a761b: Increase upload size limit to 512MB
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 2a761b2a73d405be6a33354a7931c8db11e93d51 https://github.com/phpmyadmin/docker/commit/2a761b2a73d405be6a33354a7931c8db11e93d51 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M etc/nginx.conf M etc/php.ini Log Message: --- Increase upload size limit to 512MB Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker]
Branch: refs/tags/4.6.5.1-1 Home: https://github.com/phpmyadmin/docker ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6c8ce0: Translated using Weblate (Chinese (Taiwan))
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6c8ce08529860fa41b91f3dacf45a66d697e57cc https://github.com/phpmyadmin/phpmyadmin/commit/6c8ce08529860fa41b91f3dacf45a66d697e57cc Author: ncwgf 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 98.7% (3193 of 3232 strings) [CI skip] Commit: 3e7819fd4fae3dadf29314be94246bfe87b97d24 https://github.com/phpmyadmin/phpmyadmin/commit/3e7819fd4fae3dadf29314be94246bfe87b97d24 Author: Weblate Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M ChangeLog M doc/setup.rst Log Message: --- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4e81f883f80e...3e7819fd4fae___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4d0d64: Translated using Weblate (Chinese (Taiwan))
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d0d64872851912f58a312306c9d3cc47a660922 https://github.com/phpmyadmin/phpmyadmin/commit/4d0d64872851912f58a312306c9d3cc47a660922 Author: ncwgf 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/09bfa5fa9d4cb6f6e99cc7e775227d6273bd5c6c Author: Marc Delisle 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/9c52bd07242e77986533a53c9d2052ae4c0662ac Author: Weblate 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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4d26bec55acd...9c52bd07242e___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9970d9: Release 4.6.5.1
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9970d9d32e858c74ba13f64a810effe60629e70e https://github.com/phpmyadmin/phpmyadmin/commit/9970d9d32e858c74ba13f64a810effe60629e70e Author: Isaac Bennetch Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: --- Release 4.6.5.1 Signed-off-by: Isaac Bennetch Commit: 88bbbcf27da8d92e7b8ee447ce889136dbf890b5 https://github.com/phpmyadmin/phpmyadmin/commit/88bbbcf27da8d92e7b8ee447ce889136dbf890b5 Author: Isaac Bennetch Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/tbl_partition_definition.inc.php Log Message: --- Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 Commit: c1acb3a212872fd235446efa446c3531653a5917 https://github.com/phpmyadmin/phpmyadmin/commit/c1acb3a212872fd235446efa446c3531653a5917 Author: Isaac Bennetch Date: 2016-11-26 (Sat, 26 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: --- Prepare for 4.6.6-dev Signed-off-by: Isaac Bennetch Commit: 4d26bec55acd47cc2b5298802269284b3d16b374 https://github.com/phpmyadmin/phpmyadmin/commit/4d26bec55acd47cc2b5298802269284b3d16b374 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M doc/setup.rst Log Message: --- Adjust docs to latest Docker image changes Signed-off-by: Michal Čihař Commit: 4e81f883f80e6686417fc4b74d1df6400fcbdbba https://github.com/phpmyadmin/phpmyadmin/commit/4e81f883f80e6686417fc4b74d1df6400fcbdbba Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M ChangeLog M doc/setup.rst Log Message: --- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/73f1007c3586...4e81f883f80e___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4d26be: Adjust docs to latest Docker image changes
Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d26bec55acd47cc2b5298802269284b3d16b374 https://github.com/phpmyadmin/phpmyadmin/commit/4d26bec55acd47cc2b5298802269284b3d16b374 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M doc/setup.rst Log Message: --- Adjust docs to latest Docker image changes Signed-off-by: Michal Čihař ___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] 5cef68: Cleanup documentation folder
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 5cef68749ad1167b3e2944c31da8fdf45857983a https://github.com/phpmyadmin/docker/commit/5cef68749ad1167b3e2944c31da8fdf45857983a Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Cleanup documentation folder We really do not need documentation source in the Docker image. Fixes #79 Signed-off-by: Michal Čihař Commit: d53aadc0bb801b543c470e67da17f45d633dce0c https://github.com/phpmyadmin/docker/commit/d53aadc0bb801b543c470e67da17f45d633dce0c Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Merge pull request #93 from nijel/doc-cleanup Cleanup documentation folder Compare: https://github.com/phpmyadmin/docker/compare/6c1410cbef0e...d53aadc0bb80___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] f58155: Move all configuration to /etc
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: f581555bcf8384117d2bac4a7f26fe065175af3a https://github.com/phpmyadmin/docker/commit/f581555bcf8384117d2bac4a7f26fe065175af3a Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M .travis.yml M Dockerfile M README.md R config.inc.php M etc/php.ini A etc/phpmyadmin/config.inc.php Log Message: --- Move all configuration to /etc * configuration is now in /etc * reorder commands for better Docker layer caching Signed-off-by: Michal Čihař Commit: f544b5ca9773b25a6e15385b195518c34114b723 https://github.com/phpmyadmin/docker/commit/f544b5ca9773b25a6e15385b195518c34114b723 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M .travis.yml M Dockerfile M README.md R config.inc.php M etc/php.ini A etc/phpmyadmin/config.inc.php Log Message: --- Merge pull request #92 from nijel/master Try to reorder commands for better Docker layer caching Compare: https://github.com/phpmyadmin/docker/compare/d53aadc0bb80...f544b5ca9773___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] 352e5f: Split setting variable from export
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 352e5fe6eda6c2e25a4e68bee954394ca38a9df2 https://github.com/phpmyadmin/docker/commit/352e5fe6eda6c2e25a4e68bee954394ca38a9df2 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Split setting variable from export This way we can correctly get error from the mkdir. Fixes #86 Signed-off-by: Michal Čihař Commit: 6c1410cbef0e5984091f383161823940f1ffdc7e https://github.com/phpmyadmin/docker/commit/6c1410cbef0e5984091f383161823940f1ffdc7e Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Merge pull request #91 from nijel/master Split setting variable from export Compare: https://github.com/phpmyadmin/docker/compare/c81443abd100...6c1410cbef0e___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
[phpMyAdmin Git] [phpmyadmin/docker] 717738: Bump version to 4.6.5.1
Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 7177389b2042ccce23d5d7b1e7b727702990f55d https://github.com/phpmyadmin/docker/commit/7177389b2042ccce23d5d7b1e7b727702990f55d Author: vancepym Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Bump version to 4.6.5.1 Commit: c81443abd100de2b64191f785ff9bb7cd762a2b2 https://github.com/phpmyadmin/docker/commit/c81443abd100de2b64191f785ff9bb7cd762a2b2 Author: Michal Čihař Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: --- Merge pull request #90 from vancepym/patch-1 Bump version to 4.6.5.1 Compare: https://github.com/phpmyadmin/docker/compare/3142368a079d...c81443abd100___ Git mailing list Git@phpmyadmin.net https://lists.phpmyadmin.net/mailman/listinfo/git
