gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,019 Commits 12 Branches 481 Tags 2.4 GiB
f37cbfda3c
Commit Graph

461 Commits

Author SHA1 Message Date
Marc Delisle
eb167b3c75 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 13:24:40 -05:00
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Marc Delisle
ce34b0ffa8 Merge branch 'QA_4_5' 2015-11-27 08:33:16 -05:00
Bert-Jan de Lange
bc89aabdf9 Fix for not being able to create users on Percona Server 
Inspired by the patch 9bf88cbd32.patch

Signed-off-by: Bert-Jan de Lange <info@bert-jan.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-27 08:30:58 -05:00
Marc Delisle
62d05510b9 Merge branch 'QA_4_5' 2015-11-26 11:55:25 -05:00
Marc Delisle
25bd0b56e2 Fixes #11695 PMA_getDataForDeleteUsers() warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-26 11:55:01 -05:00
Madhura Jayaratne
fd9194e7ac Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-26 19:56:01 +11:00
Deven Bansod
6640fe2877 Merge branch 'QA_4_5' 2015-11-26 19:43:32 +05:30
Deven Bansod
e8b8d670cd Fix an error in merge 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 14:45:34 +05:30
Deven Bansod
107f054ed6 Merge branch 'QA_4_5' 
Conflicts:
	libraries/server_privileges.lib.php
	po/pt_BR.po
	user_password.php
 2015-11-26 14:40:25 +05:30
Madhura Jayaratne
1cffd63940 More coding style fixes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:54:39 +11:00
Deven Bansod
0a4fd5d87b Fixes issue 11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 15:13:29 +05:30
Deven Bansod
d55abcd5ff Fix issue 11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-24 15:46:50 +05:30
Marc Delisle
83e9ae54af Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-17 07:52:45 -05:00
Marc Delisle
ad0ac35ff8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-16 14:44:30 -05:00
Hugues Peccatte
08cdf6f2fd Merge branch 'master' into psr1_master 2015-11-08 16:16:05 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Marc Delisle
e9fc32bf71 Clarify logic 
See https://github.com/dseguy/clearPHP/blob/master/rules/no-implied-if.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-06 07:39:53 -05:00
Madhura Jayaratne
ebf4955eb3 Merge branch 'QA_4_5' 2015-11-02 07:54:32 +11:00
Madhura Jayaratne
1698c5db44 Fix #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-02 07:46:39 +11:00
Marc Delisle
ffd2a95519 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-28 10:28:41 -04:00
Marc Delisle
0e57191f0a Merge branch 'QA_4_5' 2015-10-28 08:44:19 -04:00
Deven Bansod
d604a36135 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 22:18:38 +05:30
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files. 
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:39 +01:00
Marc Delisle
c0b387acf2 Merge commit '1e6f128' 2015-10-27 12:57:10 -04:00
Deven Bansod
1e6f128202 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 03:17:51 +05:30
Madhura Jayaratne
c2846af4c8 Fix #11606 PMA_Util not found when changing password 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 07:34:13 +11:00
Marc Delisle
f99e889d4f Merge branch 'QA_4_5' 2015-10-15 14:26:51 -04:00
Marc Delisle
1ffb565a8e Use just one term for the same description 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-15 14:26:22 -04:00
Marc Delisle
da5e605ba7 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-15 12:26:17 -04:00
Deven Bansod
19f1536a1c Fixed error in PR : 11569 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-16 02:55:07 +05:30
Marc Delisle
b07ba3c831 Merge commit 'b884ccd' 2015-10-13 11:33:12 -04:00
Marc Delisle
7ddbfefb9d Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:32:21 -04:00
Deven Bansod
8a82a04ff9 Refactor code for generation of available auth plugins HTML 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-14 00:33:15 +05:30
Marc Delisle
b884ccd753 Enable translation of auth plugin description 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:14:57 -04:00
Marc Delisle
40f484e3aa Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-12 17:41:43 -04:00
Deven Bansod
bd49edfb90 Fix 11561 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-13 06:24:12 +05:30
Marc Delisle
5dd4218df1 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 07:00:53 -04:00
Marc Delisle
bfb10f57b0 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:59:55 -04:00
Marc Delisle
2d30407b91 Merge branch 'QA_4_5' 2015-10-11 06:54:29 -04:00
Marc Delisle
41f5f57c1f Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:54:07 -04:00
Marc Delisle
da064eec27 Merge commit 'f6ba32e' 2015-10-11 06:49:50 -04:00
Deven Bansod
0ce416b14c Fix error in PR 11560 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 16:51:49 +05:30
Marc Delisle
fd6ed157a9 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:28:14 -04:00
Deven Bansod
31d19c4cf7 Fix #11520 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 05:29:50 +05:30
Hugues Peccatte
6c8c288067 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-29 21:19:57 +02:00
Marc Delisle
7b3b85c541 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 18:01:15 -04:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Marc Delisle
62859dffbc Merge branch 'QA_4_5' 2015-09-25 13:49:36 -04:00
Marc Delisle
62a4e61a65 Optimize function call 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 13:48:55 -04:00