Git November 2015

git@phpmyadmin.net

34 participants
252 discussions

[phpmyadmin/phpmyadmin] be16ab: Wrong call to PMA_Util, use proper namespace

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: be16ab1e6a233a0ca8e744fe306a47ec1c1f9c98 https://github.com/phpmyadmin/phpmyadmin/commit/be16ab1e6a233a0ca8e744fe306… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/check_user_privileges.lib.php Log Message: ----------- Wrong call to PMA_Util, use proper namespace Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 07dce3d51bfb17fb0a7adbe9fd29ae1fce9c0a91 https://github.com/phpmyadmin/phpmyadmin/commit/07dce3d51bfb17fb0a7adbe9fd2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/controllers/server/ServerDatabasesController.php M libraries/server_privileges.lib.php M test/classes/controllers/DatabaseStructureControllerTest.php M test/classes/controllers/TableRelationControllerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/controllers/TableStructureControllerTest.php M user_password.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b8c992035e66...07dce3d51bfb

8 years, 8 months

[phpmyadmin/phpmyadmin] b8c992: Prefix private variables with underscore

by Madhura Jayaratne

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8c992035e66c00c671cf9d9f0d461251664dcae https://github.com/phpmyadmin/phpmyadmin/commit/b8c992035e66c00c671cf9d9f0d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M test/classes/controllers/DatabaseStructureControllerTest.php M test/classes/controllers/TableRelationControllerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/controllers/TableStructureControllerTest.php Log Message: ----------- Prefix private variables with underscore Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

8 years, 8 months

[phpmyadmin/phpmyadmin] ced43a: More style violations in controllers fixed

by Madhura Jayaratne

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ced43af95d87bbb320df07cc56cac09135eca3ce https://github.com/phpmyadmin/phpmyadmin/commit/ced43af95d87bbb320df07cc56c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/controllers/server/ServerDatabasesController.php Log Message: ----------- More style violations in controllers fixed Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 1cffd63940e656bf6417bfc07d879f7b8864f7da https://github.com/phpmyadmin/phpmyadmin/commit/1cffd63940e656bf6417bfc07d8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php M user_password.php Log Message: ----------- More coding style fixes Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: fd9194e7ac9baad048f94b2786540c8b1db5b390 https://github.com/phpmyadmin/phpmyadmin/commit/fd9194e7ac9baad048f94b27865… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6640fe28772c...fd9194e7ac9b

8 years, 8 months

[phpmyadmin/phpmyadmin] 0a4fd5: Fixes issue 11691

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0a4fd5d87babd223df424f7be6fa02ed4cdb495c https://github.com/phpmyadmin/phpmyadmin/commit/0a4fd5d87babd223df424f7be6f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fixes issue 11691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 68555d3584d40e35bdb3bae0637e616c9aeee488 https://github.com/phpmyadmin/phpmyadmin/commit/68555d3584d40e35bdb3bae0637… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #11692 from devenbansod/fix_11691 Fixes #11691 : Query was empty on creating User in 4.5.2 Commit: 83672ac65cd91951cc743a0db5e17e8a7f9e03b9 https://github.com/phpmyadmin/phpmyadmin/commit/83672ac65cd91951cc743a0db5e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #11691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 6640fe28772c32021d034927bf32cbe81dd701fa https://github.com/phpmyadmin/phpmyadmin/commit/6640fe28772c32021d034927bf3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bc0eda093634...6640fe28772c

8 years, 8 months

[phpmyadmin/phpmyadmin] 83672a: Changelog entry for #11691

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 83672ac65cd91951cc743a0db5e17e8a7f9e03b9 https://github.com/phpmyadmin/phpmyadmin/commit/83672ac65cd91951cc743a0db5e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #11691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>

8 years, 8 months

[phpmyadmin/phpmyadmin] 0a4fd5: Fixes issue 11691

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0a4fd5d87babd223df424f7be6fa02ed4cdb495c https://github.com/phpmyadmin/phpmyadmin/commit/0a4fd5d87babd223df424f7be6f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fixes issue 11691 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 68555d3584d40e35bdb3bae0637e616c9aeee488 https://github.com/phpmyadmin/phpmyadmin/commit/68555d3584d40e35bdb3bae0637… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #11692 from devenbansod/fix_11691 Fixes #11691 : Query was empty on creating User in 4.5.2 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8eb712579d67...68555d3584d4

8 years, 8 months

[phpmyadmin/phpmyadmin] 310019: Changelog entry for #11684

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31001963d2a64c250dae6f2e400653d3efc0a8e8 https://github.com/phpmyadmin/phpmyadmin/commit/31001963d2a64c250dae6f2e400… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #11684 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8eb712579d67ebcc31210aca7320279494d8e62a https://github.com/phpmyadmin/phpmyadmin/commit/8eb712579d67ebcc31210aca732… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fixes #11693 : Flush privileges overusage - related to issue 11597 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 77f220cee5020759c9056ac2bec6a64e648e53f7 https://github.com/phpmyadmin/phpmyadmin/commit/77f220cee5020759c9056ac2bec… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.php Log Message: ----------- Merge branch 'QA_4_5' Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: libraries/plugins/auth/AuthenticationCookie.php Commit: bc0eda093634b5daf848b879633a5fb040e357e7 https://github.com/phpmyadmin/phpmyadmin/commit/bc0eda093634b5daf848b879633… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/controllers/server/ServerDatabasesController.php M libraries/controllers/server/ServerVariablesController.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9416ff7c3f75...bc0eda093634

8 years, 8 months

[phpmyadmin/phpmyadmin] cd6e5b: Fix coding style violations

by Madhura Jayaratne

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd6e5b0025fb7835354bc4f9c11ad53d49da9402 https://github.com/phpmyadmin/phpmyadmin/commit/cd6e5b0025fb7835354bc4f9c11… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/controllers/server/ServerDatabasesController.php M libraries/controllers/server/ServerVariablesController.php Log Message: ----------- Fix coding style violations Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 9416ff7c3f755f09af207093b7b6e7e0f722874e https://github.com/phpmyadmin/phpmyadmin/commit/9416ff7c3f755f09af207093b7b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/controllers/server/ServerDatabasesController.php M libraries/rte/rte_export.lib.php M libraries/server_privileges.lib.php M po/pt_BR.po M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e8b8d670cd06...9416ff7c3f75

8 years, 8 months

[phpmyadmin/phpmyadmin] 310019: Changelog entry for #11684

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31001963d2a64c250dae6f2e400653d3efc0a8e8 https://github.com/phpmyadmin/phpmyadmin/commit/31001963d2a64c250dae6f2e400… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #11684 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8eb712579d67ebcc31210aca7320279494d8e62a https://github.com/phpmyadmin/phpmyadmin/commit/8eb712579d67ebcc31210aca732… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fixes #11693 : Flush privileges overusage - related to issue 11597 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fa36f0019838...8eb712579d67

8 years, 8 months

[phpmyadmin/phpmyadmin] d55abc: Fix issue 11684

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d55abcd5ffa1ea8785f1217f5b7d78a8a54b8542 https://github.com/phpmyadmin/phpmyadmin/commit/d55abcd5ffa1ea8785f1217f5b7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-24 (Tue, 24 Nov 2015) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Fix issue 11684 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 67b9ab471a88d4b8ebf401be01966a8ddced19e8 https://github.com/phpmyadmin/phpmyadmin/commit/67b9ab471a88d4b8ebf401be019… Author: Jader Teixeira <jaderfeldmann(a)gmail.com> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.6% (2974 of 3211 strings) [CI skip] Commit: 060884139c3470a114c55cef1330a4f26cd52de3 https://github.com/phpmyadmin/phpmyadmin/commit/060884139c3470a114c55cef133… Author: Weblate <noreply(a)weblate.org> Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M ChangeLog M libraries/rte/rte_export.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: fa36f00198381422eb1ea61f8ccccef8a166199c https://github.com/phpmyadmin/phpmyadmin/commit/fa36f00198381422eb1ea61f8cc… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Merge pull request #11686 from devenbansod/fix_11684 Fix issue #11684 Commit: 107f054ed6bc889ce0a771354c1d8b539311fd0f https://github.com/phpmyadmin/phpmyadmin/commit/107f054ed6bc889ce0a771354c1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: libraries/server_privileges.lib.php po/pt_BR.po user_password.php Commit: e8b8d670cd06a2a3055ff8f5ed099151e16febce https://github.com/phpmyadmin/phpmyadmin/commit/e8b8d670cd06a2a3055ff8f5ed0… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix an error in merge Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0d8a4425d482...e8b8d670cd06

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2015