gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,488 Commits 12 Branches 481 Tags 2.4 GiB
72833685b7
Commit Graph

730 Commits

Author SHA1 Message Date
Madhura Jayaratne
5eedd7b40b Remove more GLOBALS['db'] 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:56:40 +05:30
Madhura Jayaratne
e86112a487 Remove more instances of GLOBALS['db'] usages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:50:33 +05:30
Madhura Jayaratne
e64ed2e8e4 Pass instance variable db instead of GLOBALS db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:46:33 +05:30
Madhura Jayaratne
9c994c741d Use instance variable db rather than the GLOBAL value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 15:30:48 +05:30
Madhura Jayaratne
365d98d4c6 Revert "Remove unused parameter $db" 
This reverts commit d862940cb3.
 2015-06-18 15:22:32 +05:30
Madhura Jayaratne
d862940cb3 Remove unused parameter $db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 13:56:12 +05:30
Isaac Bennetch
cad0eda2c7 Merge pull request #1720 from devenbansod/rfe1594 
RFE#1594: Use plain English descriptors instead of script names for Browse, SQL, Privileges, etc links
 2015-06-12 15:13:34 -04:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Madhura Jayaratne
c88da15e88 Update doc blocks with proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:24:16 +05:30
Marc Delisle
675b589dce Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-03 07:13:07 -04:00
Madhura Jayaratne
7d85ed44dd Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 17:27:33 +05:30
Madhura Jayaratne
e6b4065aee Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:21:56 +05:30
Madhura Jayaratne
d6d016aef9 bug #4936 utf8mb4 fields show only ????s for 4-byte Unicode characters after import 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:20:18 +05:30
Madhura Jayaratne
5b8ce769c8 Merge branch 'QA_4_4' 2015-06-02 14:43:36 +05:30
Madhura Jayaratne
cd2ee14a7c bug #4937 Custom export with backquotes off is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 14:40:25 +05:30
Madhura Jayaratne
52a06ee5f9 Merge branch 'QA_4_4' 2015-05-29 15:37:50 +05:30
Madhura Jayaratne
0391bab825 bug #4931 False error before entering reCAPTCHA 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:30:19 +05:30
Marc Delisle
50fb7adee4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-28 10:23:28 -04:00
Madhura Jayaratne
63fef03cc7 is_process_priv is no longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 09:32:36 +05:30
Marc Delisle
b69b481612 Merge pull request #1679 from Tithugues/addReturns_master 
Add missing return.
 2015-05-18 07:48:34 -04:00
Hugues Peccatte
f305c14d1d PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:12:32 +02:00
Hugues Peccatte
f0792503e9 Update to fix tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 14:24:31 +02:00
Hugues Peccatte
18625f3bbf Update PHPDoc and minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 13:15:08 +02:00
Hugues Peccatte
d3dd47217e Add missing return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 12:54:37 +02:00
Madhura Jayaratne
bdf66cd772 Merge branch 'QA_4_4' 2015-05-14 07:10:10 +05:30
Madhura Jayaratne
5ca7f19d05 Invalid value for CURLOPT_SSL_VERIFYPEER 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 06:52:26 +05:30
Madhura Jayaratne
0e7ac33cb4 Merge branch 'QA_4_4' 2015-05-07 18:03:19 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Marc Delisle
ce3d41fb4c Use uppercase for column type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-01 07:28:23 -04:00
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
d04466cee4 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:02:46 +05:30
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
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
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
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
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
aa1c35cedf Remove trailing whitespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:26:09 +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
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
3d85296d79 Spaces around assignments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:06:36 +05:30
Madhura Jayaratne
7c82094f60 Do not use inline control structures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:00:49 +05:30
Madhura Jayaratne
598f618427 Remove from metadata export until we find a way to align ids between them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:27:45 +05:30
Madhura Jayaratne
7950b63ce0 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:26:28 +05:30