Commit Graph

10243 Commits

Author SHA1 Message Date
Michal Čihař
d9724bfa67 Merge pull request #665 from adamgsoc2013/UT_table_pages
add Unit test cases for PMA_tbl_relation
2013-09-09 02:15:55 -07:00
Marc Delisle
b040fab515 Merge pull request #673 from scnakandala/refac_browse_foreigners
Refactoring browse_foreigners.php
2013-09-08 14:28:23 -07:00
Spun Nakandala
8ff74d0b0d error corrected 2013-09-08 23:51:54 +05:30
Kasun Chathuranga
21b3dd1a6f Merge branch 'master' into UT
Conflicts:
	libraries/server_privileges.lib.php
2013-09-08 11:29:23 +05:30
Dieter Adriaenssens
055e1b4c85 wrap long lines 2013-09-07 23:15:38 +02:00
Dieter Adriaenssens
4a2a360f8c fix coding style 2013-09-07 23:08:02 +02:00
Dieter Adriaenssens
e853e65077 fix coding style : closing brace should be on a new line 2013-09-07 23:01:06 +02:00
Marc Delisle
830de1ff03 Fix codestyle 2013-09-07 08:20:26 -04:00
Spun Nakandala
fd32385236 added method PMA_getHtmlForColumnElement 2013-09-06 23:14:15 +05:30
Kasun Chathuranga
df26e950e7 Handle sub tabs properly 2013-09-06 22:25:38 +05:30
Kasun Chathuranga
bf389c0730 Long line 2013-09-06 22:00:07 +05:30
Kasun Chathuranga
959ddfa2ea Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into UT 2013-09-06 21:53:28 +05:30
Kasun Chathuranga
7ace92a786 Grant is considered separately 2013-09-06 21:48:59 +05:30
Kasun Chathuranga
07444b4708 Properly identify grant type 2013-09-06 21:46:53 +05:30
Dieter Adriaenssens
4b43310d6f fix coding style : use lowercase null 2013-09-06 17:53:54 +02:00
Dieter Adriaenssens
a6ca1f05b6 fix coding style : opening brace should be on a new line 2013-09-06 17:50:32 +02:00
Dieter Adriaenssens
2b4de460b3 fix coding style, spacing 2013-09-06 17:38:45 +02:00
Spun Nakandala
c38da98d4a added browse_foreigners.lib.php and extracted methods from browse_foreigners to it. 2013-09-06 21:00:16 +05:30
Kasun Chathuranga
17de8a6a49 Shorten a lines exceeding 85 characters 2013-09-06 07:35:09 +05:30
Kasun Chathuranga
0c28430659 Wildcards are not applicable to table privileges 2013-09-06 07:29:44 +05:30
Kasun Chathuranga
c9268f80ad Adhere to coding style 2013-09-06 07:22:00 +05:30
Atul Pratap Singh
f0585a2693 Fix reload flag on database change 2013-09-06 02:55:34 +05:30
Isaac Bennetch
2666ee5023 Merge pull request #662 from kasunchathuranga/tablePrivs
Privileges tab for table level
2013-09-05 09:27:24 -07:00
Kasun Chathuranga
059d2e2d10 Rights tab should only be accessible to super users 2013-09-05 07:58:12 +05:30
Atul Pratap Singh
cb364d5458 Merge branch 'merge' of https://github.com/kasunchathuranga/phpmyadmin
Conflicts:
	export.php
2013-09-03 23:18:23 +05:30
Marc Delisle
6772b75d3b Merge pull request #666 from xmujay/refactor_tbl_print_view
Refactor tbl print view
2013-09-03 09:22:10 -07:00
Kasun Chathuranga
8d70cd4dec Merge branch 'QA_4_0' into merge. Resolved conflicts. 2013-09-03 14:13:02 +05:30
adamgsoc2013
d9954b3d6a add UT for PMA_tbl_relation 2013-09-02 21:46:38 +08:00
xmujay
bdd64d50ee add function for render Space Usage 2013-09-02 20:09:46 +08:00
Marc Delisle
930a024d02 Merge pull request #663 from scnakandala/refac_tbl_indexes
Refactoring tbl_indexes.php
2013-09-01 15:42:25 -07:00
Kasun Chathuranga
a884f3a9e8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into tablePrivs 2013-09-01 22:53:43 +05:30
xmujay
afe918e251 fix code style 2013-09-02 00:36:51 +08:00
xmujay
ecd6de0e02 refactor table print view 2013-09-02 00:25:36 +08:00
Atul Pratap Singh
87e63d0651 Merge pull request #659 from kasunchathuranga/navSelect
Expand the navigation and highlight the current database or table/view
2013-09-01 07:00:12 -07:00
Marc Delisle
56a9031f4e Fix merge conflicts 2013-08-31 07:56:31 -04:00
Marc Delisle
e231569bce Merge branch 'MAINT_4_0_6' into QA_4_0 2013-08-31 07:49:16 -04:00
Kasun Chathuranga
74f363f4b5 Merge branch 'master' into tablePrivs 2013-08-31 14:14:54 +05:30
Kasun Chathuranga
1f86a3496a Fix typo 2013-08-31 14:07:05 +05:30
Kasun Chathuranga
9c14c833d9 Reuse code from table specific privilege table for the db specific privilege table 2013-08-31 14:00:33 +05:30
Kasun Chathuranga
5b18bd044a Use !empty() to avoid empty queries being executed 2013-08-31 13:32:07 +05:30
Kasun Chathuranga
bd29b3ff85 Go to DefaultTabTable 2013-08-31 13:24:34 +05:30
Kasun Chathuranga
d19049cb81 Show sub menus only in Users page 2013-08-31 13:23:24 +05:30
Marc Delisle
1b290df928 Fix typo 2013-08-30 13:35:57 -04:00
Marc Delisle
2a4c8276c2 Merge pull request #660 from scnakandala/refac_tbl_relation.php
Refactoring tbl_relation.php
2013-08-30 10:00:11 -07:00
Spun Nakandala
1014d9fef4 query not shown error corrected 2013-08-30 21:41:58 +05:30
Kasun Chathuranga
99c65f37e7 Table specific privileges 2013-08-30 18:49:03 +05:30
Marc Delisle
24dd2da1a6 Merge branch 'QA_4_0' 2013-08-30 08:27:00 -04:00
Marc Delisle
4a609d5b2e bug Handle the situation where PHP_SELF is not set 2013-08-30 08:25:48 -04:00
Kasun Chathuranga
b43f4c7fed Expand the navigation and highlight the current database or table/view 2013-08-30 12:30:05 +05:30
Spun Nakandala
23d5e798be phpcs errors corrected 2013-08-29 22:07:24 +05:30