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

13019 Commits

Author SHA1 Message Date
Madhura Jayaratne
bfd0a67845 Do not link to itself 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-25 17:59:03 +05:30
Madhura Jayaratne
d0e39b7575 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 17:33:14 +05:30
Madhura Jayaratne
2eab3b5880 bug #4727 Collation column missing in database list when DisableIS is true 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 17:31:03 +05:30
Madhura Jayaratne
750bfbbcb4 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:56:59 +05:30
Madhura Jayaratne
153988f0f9 This link no longer works 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:54:28 +05:30
Madhura Jayaratne
635413442a Coding style improvements 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:52:33 +05:30
Madhura Jayaratne
8ed47444db Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:44:00 +05:30
Madhura Jayaratne
5f32194b4f Select by Id rather than text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 15:16:09 +05:30
Marc Delisle
4458426aa7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-22 16:01:32 -05:00
Marc Delisle
1ad5fd8dab Merge pull request #1468 from geekman-rohit/master 
fix bug #4720 (problem with missing php-mbstring warning)
 2015-01-22 11:36:26 -05:00
Madhura Jayaratne
2afee3e557 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-22 16:36:54 +05:30
Madhura Jayaratne
c84304aae9 Merge branch 'QA_4_3' 2015-01-22 16:35:41 +05:30
Madhura Jayaratne
4f493b110e A better way to handle navigation in filtered results 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 16:34:46 +05:30
Atul Pratap Singh
e8005fddf2 Differentiate between search results and normal tree 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-22 12:08:37 +05:30
Madhura Jayaratne
d4f1781ea8 Merge branch 'QA_4_3' 2015-01-22 09:25:30 +05:30
Madhura Jayaratne
17ab2ff6d4 bug #4724 Cannot navigate in filtered table list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 09:19:06 +05:30
Madhura Jayaratne
8bff56985b Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 07:07:58 +05:30
Madhura Jayaratne
ebb9c1fdbe Merge branch 'bug4704' into QA_4_3 2015-01-22 06:45:41 +05:30
Madhura Jayaratne
3fadd8d5ab Adhere to hide_db directive fully 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 06:45:04 +05:30
Madhura Jayaratne
386ef16ad9 Merge pull request #1467 from madhuracj/bug4716 
#4716 Collapse all in navigation panel is sometimes broken
 2015-01-22 06:36:25 +05:30
Rohit Mulange
f508e9312a fix bug #4720 (problem with missing php-mbstring warning) 
Signed-off-by: Rohit Mulange <rohit@rohit.codes>
 2015-01-21 23:45:02 +05:30
Marc Delisle
e46a192509 Merge commit 'b3c1368' 2015-01-21 13:05:01 -05:00
Alexander Kamp
3da106c572 Bug #4722 Incorrect width table summary when favorite tables is disabled 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-21 13:02:48 -05:00
Atul Pratap Singh
e1a9e02fc0 Fast filter improvement: remove 'x other results found' and replace with Enter search 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:22:12 +05:30
Madhura Jayaratne
9cdcd992b1 Merge branch 'QA_4_3' 2015-01-21 11:14:58 +05:30
Madhura Jayaratne
cb18ec2320 bug #4700 Error text: Internal Server Error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 11:13:44 +05:30
Madhura Jayaratne
43e5a71e2c Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:08:39 +05:30
Madhura Jayaratne
190ea0452e Merge branch 'bug4721' into QA_4_3 2015-01-21 10:00:55 +05:30
Madhura Jayaratne
97dc4831a4 #4716 Collapse all in navigation panel is sometimes broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 08:38:43 +05:30
Madhura Jayaratne
6ff3e42d53 Check whether version and date is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:31:46 +05:30
Marc Delisle
535db88e47 Merge branch 'QA_4_3' 2015-01-20 12:48:58 -05:00
RAKESH KUMAR
915f209ca1 BugFix#4714 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
 2015-01-20 19:34:12 +05:30
Marc Delisle
9f7b25a269 Merge branch 'QA_4_3' 2015-01-18 06:37:16 -05:00
Marc Delisle
27540ea81a Bug Undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-18 06:36:23 -05:00
Marc Delisle
71491754a4 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-17 07:14:45 -05:00
Marc Delisle
55c3e7877f Merge pull request #1450 from nisargjhaveri/sql_format 
SQL formatting with sql-formatter
 2015-01-17 06:57:46 -05:00
Marc Delisle
90b43c41ad Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-16 06:19:52 -05:00
Marc Delisle
6d56ef9c4d Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-16 06:02:39 -05:00
Marc Delisle
c56702d993 4.3.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-15 08:17:25 -05:00
Marc Delisle
205e4175e5 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-14 12:09:34 -05:00
Madhura Jayaratne
f55aa7b939 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 20:58:38 +05:30
Madhura Jayaratne
8cdaf81e27 bug #4702 URL is non RFC-2396 compatible in get_scripts.js.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 20:56:22 +05:30
Madhura Jayaratne
aea519fded bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 19:30:00 +05:30
Madhura Jayaratne
785123b643 bug #4705 Table structure: adding primary key doesn't refresh page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 18:05:14 +05:30
Smita Kumari
b1f059dce3 Merge pull request #1459 from smita786/master 
FRE #1568: fold add column position radio into one 'add column after'
 2015-01-14 16:58:00 +05:30
Hugues Peccatte
7053381719 Merge branch 'f1591_master' 2015-01-13 22:43:19 +01:00
Smita Kumari
5fa0cef84c change text 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-01-13 23:47:30 +05:30
Marc Delisle
1125b87c3e Remove dead code; fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-13 11:15:30 -05:00
Marc Delisle
d1c7ee21af Merge pull request #1458 from madhuracj/displayDir 
Remove display direction
 2015-01-13 10:22:28 -05:00
Smita Kumari
e0e3c0e84f FRE #1568: fold add column position radio into one 'add column after' dropdown 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-01-13 20:24:56 +05:30