- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] bfb10f: Remove dead code
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfb10f57b042f2cd7d7c9f95853e6c5126e1c306 https://github.com/phpmyadmin/phpmyadmin/commit/bfb10f57b042f2cd7d7c9f95853… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Remove dead code Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 5dd4218df1024577c5b24509b8871bd03bdcc851 https://github.com/phpmyadmin/phpmyadmin/commit/5dd4218df1024577c5b24509b88… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d30407b919e...5dd4218df102

1 0

[phpmyadmin/phpmyadmin] bfb10f: Remove dead code
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfb10f57b042f2cd7d7c9f95853e6c5126e1c306 https://github.com/phpmyadmin/phpmyadmin/commit/bfb10f57b042f2cd7d7c9f95853… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Remove dead code Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[phpmyadmin/phpmyadmin] 41f5f5: Fix typo
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41f5f57c1f42238cd6e26650462db57fff924052 https://github.com/phpmyadmin/phpmyadmin/commit/41f5f57c1f42238cd6e26650462… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix typo Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 2d30407b919e878d6ad5303f85af1e2cfae9f7f4 https://github.com/phpmyadmin/phpmyadmin/commit/2d30407b919e878d6ad5303f85a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c6a200042af...2d30407b919e

1 0

[phpmyadmin/phpmyadmin] 41f5f5: Fix typo
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41f5f57c1f42238cd6e26650462db57fff924052 https://github.com/phpmyadmin/phpmyadmin/commit/41f5f57c1f42238cd6e26650462… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix typo Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[phpmyadmin/phpmyadmin] 192ab1: Translated using Weblate (Slovak)
by Weblate 11 Oct '15

11 Oct '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 192ab1d205c0075b56bfb306470c14a3899616c8 https://github.com/phpmyadmin/phpmyadmin/commit/192ab1d205c0075b56bfb306470… Author: Martin Lacina <martin(a)whistler.sk> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 82.8% (2672 of 3227 strings) [CI skip] Commit: 5c6a200042af35bf96f4ba10bc59f735d2591a45 https://github.com/phpmyadmin/phpmyadmin/commit/5c6a200042af35bf96f4ba10bc5… Author: Weblate <noreply(a)weblate.org> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7239f7946cd5...5c6a200042af

1 0

[phpmyadmin/phpmyadmin] 0ce416: Fix error in PR 11560
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0ce416b14c5e09be34e0140fe3425d20fed0398d https://github.com/phpmyadmin/phpmyadmin/commit/0ce416b14c5e09be34e0140fe34… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix error in PR 11560 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f6ba32e7958bf53f136640cbdb2e942963c31c63 https://github.com/phpmyadmin/phpmyadmin/commit/f6ba32e7958bf53f136640cbdb2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #11566 from devenbansod/fix_error_in_11560 Fix error in PR #11560 Commit: 369be59c08a085fa8490fbbeb471860993a6d7e4 https://github.com/phpmyadmin/phpmyadmin/commit/369be59c08a085fa8490fbbeb47… Author: Martin Lacina <martin(a)whistler.sk> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.4% (2680 of 3210 strings) [CI skip] Commit: 835c63aed27b1bf5002b9aa60dbee50be78a58e1 https://github.com/phpmyadmin/phpmyadmin/commit/835c63aed27b1bf5002b9aa60db… Author: Weblate <noreply(a)weblate.org> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: da064eec2722b187a101f880c602ebd1bb870038 https://github.com/phpmyadmin/phpmyadmin/commit/da064eec2722b187a101f880c60… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge commit 'f6ba32e' Commit: 7239f7946cd5ead1c57caa26d0809b3354e77d1d https://github.com/phpmyadmin/phpmyadmin/commit/7239f7946cd5ead1c57caa26d08… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fd6ed157a912...7239f7946cd5

1 0

[phpmyadmin/phpmyadmin] 369be5: Translated using Weblate (Slovak)
by Weblate 11 Oct '15

11 Oct '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 369be59c08a085fa8490fbbeb471860993a6d7e4 https://github.com/phpmyadmin/phpmyadmin/commit/369be59c08a085fa8490fbbeb47… Author: Martin Lacina <martin(a)whistler.sk> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.4% (2680 of 3210 strings) [CI skip] Commit: 835c63aed27b1bf5002b9aa60dbee50be78a58e1 https://github.com/phpmyadmin/phpmyadmin/commit/835c63aed27b1bf5002b9aa60db… Author: Weblate <noreply(a)weblate.org> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f6ba32e7958b...835c63aed27b

1 0

[phpmyadmin/phpmyadmin] 0ce416: Fix error in PR 11560
by Marc Delisle 11 Oct '15

11 Oct '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0ce416b14c5e09be34e0140fe3425d20fed0398d https://github.com/phpmyadmin/phpmyadmin/commit/0ce416b14c5e09be34e0140fe34… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Fix error in PR 11560 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f6ba32e7958bf53f136640cbdb2e942963c31c63 https://github.com/phpmyadmin/phpmyadmin/commit/f6ba32e7958bf53f136640cbdb2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #11566 from devenbansod/fix_error_in_11560 Fix error in PR #11560 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9eb8dd974def...f6ba32e7958b

1 0

[phpmyadmin/phpmyadmin] 31d19c: Fix #11520
by Marc Delisle 10 Oct '15

10 Oct '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31d19c4cf72ae48df913e5bdbbccae37b244aa3e https://github.com/phpmyadmin/phpmyadmin/commit/31d19c4cf72ae48df913e5bdbbc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-10-11 (Sun, 11 Oct 2015) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix #11520 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: e9cd6b583c6be168f8f060e4f33e508e6660443d https://github.com/phpmyadmin/phpmyadmin/commit/e9cd6b583c6be168f8f060e4f33… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-10 (Sat, 10 Oct 2015) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge pull request #11560 from devenbansod/fix_11520 Fix #11520 Commit: 9eb8dd974def3a434916a32472666fafc28ae523 https://github.com/phpmyadmin/phpmyadmin/commit/9eb8dd974def3a434916a324726… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-10 (Sat, 10 Oct 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: fd6ed157a91255bbc4c3c14d58a7cbaa7f6e9409 https://github.com/phpmyadmin/phpmyadmin/commit/fd6ed157a91255bbc4c3c14d58a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-10 (Sat, 10 Oct 2015) Changed paths: M ChangeLog M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/914c12a9c29c...fd6ed157a912

1 0

[phpmyadmin/phpmyadmin] 9eb8dd: ChangeLog entry
by Marc Delisle 10 Oct '15

10 Oct '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9eb8dd974def3a434916a32472666fafc28ae523 https://github.com/phpmyadmin/phpmyadmin/commit/9eb8dd974def3a434916a324726… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-10 (Sat, 10 Oct 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0