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

103910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
bad6f87f7b Add support for Codacy coverage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:33:27 +01:00
Michal Čihař
6c2474ad35 Avoid duplicate test class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:14 +01:00
Michal Čihař
ecabc91424 Fix export plugin testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:05 +01:00
Michal Čihař
8ebfeb25a0 Fix includes in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:22:28 +01:00
Michal Čihař
aac4e31eee Fix test discovery for class tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:19:59 +01:00
Michal Čihař
46a70dba88 Remove unused method (parent class defines it) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:54:04 +01:00
Michal Čihař
c98fe34e57 Fix documentation of some methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:42:26 +01:00
Michal Čihař
c7c2ff4ab6 issue #11708 Remove no password warning 
The empty password has to be enabled by AllowNoPassword, so user should
know what he is doing. Showing this warning every time doesn't bring any
additional security.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 08:51:11 +01:00
Madhura Jayaratne
547c977bc1 issue #11701 Allow changing parameter order of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 12:20:16 +11:00
Madhura Jayaratne
6259eb0b3c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-01 10:45:54 +11:00
Madhura Jayaratne
171c11b061 Merge branch 'QA_4_5' 2015-12-01 10:44:20 +11:00
Madhura Jayaratne
cb867b8d94 issue #11701 Show create procedure SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 10:42:51 +11:00
Marc Delisle
eb167b3c75 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 13:24:40 -05:00
Marc Delisle
1d5b6c4f0f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-30 08:34:37 -05:00
Marc Delisle
288c03cd43 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 08:34:24 -05:00
Weblate
e91fec9ced Merge remote-tracking branch 'origin/master' 2015-11-30 14:32:26 +01:00
Kristjan Räts
156a2e7f8d Translated using Weblate (Estonian) 
Currently translated at 100.0% (3223 of 3223 strings)

[CI skip]
 2015-11-30 14:32:23 +01:00
Marc Delisle
40c7f518b5 Merge pull request #11704 from nisargjhaveri/issue_11668 
Show table header and create bookmark on empty results
 2015-11-30 08:32:17 -05:00
Nisarg Jhaveri
b463cfc0ff Show table header and create bookmark on empty results 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-30 04:28:50 +05:30
Marc Delisle
ad719a39b3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 15:07:29 -05:00
Marc Delisle
4b86779e0e Merge pull request #11703 from nisargjhaveri/issue_11702 
Add grid-edit update query only to last query result box
 2015-11-29 15:05:55 -05:00
Nisarg Jhaveri
296caced73 Add grid-edit update query only to last query result box 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-30 01:07:34 +05:30
Deven Bansod
7e60b051c6 ChangeLog entry for issue #11504 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-30 00:14:17 +05:30
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Deven Bansod
1f4cff8fc6 Fix misspelt word 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-29 23:05:30 +05:30
Deven Bansod
9e0a7c2513 Merge pull request #11656 from Achilles-96/master 
Fix for issue #11504 - Provide a 'print preview' mode before triggering print directly
 2015-11-29 17:31:39 +05:30
Achilles-96
f72864cb2b Fixes issue 11504 
Signed-off-by: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in>
 2015-11-29 15:44:56 +05:30
Marc Delisle
e257954082 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-28 06:50:23 -05:00
Marc Delisle
ce34b0ffa8 Merge branch 'QA_4_5' 2015-11-27 08:33:16 -05:00
Marc Delisle
7f9339105c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-27 08:32:33 -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
Madhura Jayaratne
a98edc8be0 Merge pull request #11696 from madhuracj/refactor 
Refactor server_collations page
 2015-11-27 23:01:29 +11:00
Madhura Jayaratne
a9bccec802 Fix tests broken due to change in test execution order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 22:47:34 +11:00
Madhura Jayaratne
c7297bf533 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 20:25:32 +11:00
Madhura Jayaratne
090a7e4323 Use templating 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 20:14:28 +11:00
Madhura Jayaratne
2692af32d9 Use a controller for server_collations page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-27 19:54:29 +11:00
Marc Delisle
84f57eaf2f Clarify comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-26 14:23:57 -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
Deven Bansod
07dce3d51b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-11-26 20:02:57 +05:30
Deven Bansod
be16ab1e6a Wrong call to PMA_Util, use proper namespace 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:57:28 +05:30
Deven Bansod
6640fe2877 Merge branch 'QA_4_5' 2015-11-26 19:43:32 +05:30
Deven Bansod
83672ac65c Changelog entry for #11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:43:21 +05:30
Deven Bansod
bc0eda0936 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-11-26 19:33:22 +05:30
Deven Bansod
77f220cee5 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/plugins/auth/AuthenticationCookie.php
 2015-11-26 19:29:18 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:25:18 +05:30
Deven Bansod
31001963d2 Changelog entry for #11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:20:04 +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
b8c992035e Prefix private variables with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:59:12 +11:00