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

99381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
e54fe4c9fc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-28 18:09:55 +05:30
Madhura Jayaratne
4c04ee7964 Fix multiline functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 18:08:41 +05:30
Michal Čihař
61ba51d4b1 Actually return content of the variable, do not print it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-04-28 14:33:51 +02:00
Michal Čihař
6df80bdef0 Do not use output buffering for pretty printing variable content 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-04-28 14:31:37 +02:00
Madhura Jayaratne
b3da89116d Wrap more long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 17:55:49 +05:30
Madhura Jayaratne
d74e30e3ea Wrap some long lines - PMA_RTN_getQueryFromRequest_test.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 17:44:54 +05:30
Madhura Jayaratne
bed2100583 Wrap some long lines - DisplayResults.class.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 17:40:14 +05:30
Madhura Jayaratne
f78ad0f1d5 Wrap some long lines - pdf/Pdf_Relation_Schema.class.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 17:31:07 +05:30
Madhura Jayaratne
7118974b92 Remove spaces before opening parenthesis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 16:20:48 +05:30
Madhura Jayaratne
4345479ee7 Remove extra spaces before opening parenthesis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 16:15:05 +05:30
Madhura Jayaratne
202b9ae661 Fix more method names in tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:51:56 +05:30
Madhura Jayaratne
57ecddfa56 Fix method names in tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:42:32 +05:30
Madhura Jayaratne
bcc069626c Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:06:53 +05:30
Madhura Jayaratne
65cc20a449 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-28 15:03:47 +05:30
Madhura Jayaratne
d04466cee4 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:02:46 +05:30
Madhura Jayaratne
3803ee476c Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:02:16 +05:30
Madhura Jayaratne
4d79529fcd Reduce duplication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 14:53:26 +05:30
Michal Čihař
9cc6bc1bba Merge remote-tracking branch 'origin/QA_4_4' 2015-04-28 10:15:36 +02:00
Michal Čihař
65d0e0c26f Remove no longer used define 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-04-28 10:15:04 +02:00
Madhura Jayaratne
09ed830d8e Fix some indentations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:53:51 +05:30
Madhura Jayaratne
ac2b21475d Fix spacing after do comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:06:51 +05:30
Madhura Jayaratne
5857fe163d Fix spacing after opening brace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:05:08 +05:30
Madhura Jayaratne
5e7dca6968 Fix spacing after param name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:50:50 +05:30
Madhura Jayaratne
d54df757f6 Fix spacing after param type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:47:24 +05:30
Madhura Jayaratne
e7bf1fb964 Remove more extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:43:23 +05:30
Madhura Jayaratne
a22bb26d7e Remove extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:42:21 +05:30
Madhura Jayaratne
b775f07207 Underscore for private methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:31:07 +05:30
Madhura Jayaratne
152574fa2b No leading underscores for non-private method names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:29:34 +05:30
Madhura Jayaratne
bc1a972413 Add space after comma 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:27:10 +05:30
Madhura Jayaratne
f98600d174 More doc updates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:26:24 +05:30
Madhura Jayaratne
40c82aad55 Update docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:21:41 +05:30
Madhura Jayaratne
09b5c4399e Add missing doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:17:06 +05:30
Madhura Jayaratne
e4a3c69831 Properly exclude recaptcha and swekey 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:12:18 +05:30
Madhura Jayaratne
a1d50f20a9 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-28 07:09:57 +05:30
Madhura Jayaratne
230b0d3ed1 Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:08:48 +05:30
Marc Delisle
3007b73415 New FAQ 6.38 How can I reassign auto-incremented values? 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-27 14:40:19 -04:00
Madhura Jayaratne
3b3a14f33c Space after function keyword 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 19:14:00 +05:30
Madhura Jayaratne
e1ab1925c9 File is being unconditionally included; use "require_once" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 19:12:17 +05:30
Madhura Jayaratne
0cb93d6870 File is being conditionally included; use "include" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 19:11:26 +05:30
Madhura Jayaratne
b4c739849a Improve coding style in normalization.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:35:57 +05:30
Madhura Jayaratne
aa1c35cedf Remove trailing whitespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:26:09 +05:30
Madhura Jayaratne
6cd4b33a79 Remove extra empty line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:23:45 +05:30
Madhura Jayaratne
12165c8d9e Remove duplicate tag 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:22:42 +05:30
Madhura Jayaratne
0e221fd3f5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-27 18:17:57 +05:30
Madhura Jayaratne
cdc6a584aa Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:17:09 +05:30
Marc Delisle
9ffc3b4b91 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-27 08:43:57 -04:00
Marc Delisle
33b969a3b7 Refactor duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-27 08:43:46 -04:00
Madhura Jayaratne
598435fdda Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:13:23 +05:30
Madhura Jayaratne
0f3450a7c5 Spaces around > operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:11:11 +05:30
Madhura Jayaratne
aca3985b5e More spaces around assignments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:07:38 +05:30