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

13188 Commits

Author SHA1 Message Date
Madhura Jayaratne
6642772f43 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:59:37 +05:30
Madhura Jayaratne
55dccb6138 bug #4777 Some images are missing in Designer for original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:58:26 +05:30
Madhura Jayaratne
a43c9b2df0 Activate/deactivate tracking with a single parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 08:45:33 +05:30
Hugues Peccatte
05ebf9a3a7 Fix typos. 
Minor PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:54:09 +01:00
Hugues Peccatte
e669cb4708 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-22 22:52:35 +01:00
Hugues Peccatte
4846ef6bf7 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:51:12 +01:00
Marc Delisle
17c9592f3c Use standard backquote method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:08 -05:00
Marc Delisle
d2de03ebbe Use shorter operator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:58:25 -05:00
Marc Delisle
e71496dc84 Merge pull request #1508 from devenbansod/feat-req-1606 
Adding Filter Process List | Feature #1606
 2015-02-22 15:52:31 -05:00
Hugues Peccatte
52bfc94d74 Update PHPDoc. 
Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 20:03:32 +01:00
Deven Bansod
42d5a90f2f Add Filter to Process List | Feature #1606 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-22 22:52:47 +05:30
Marc Delisle
3e8ed57470 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 07:52:26 -05:00
Marc Delisle
06d6158104 4.3.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-20 07:44:57 -05:00
Madhura Jayaratne
a54da2052b Preserve tab order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 18:06:17 +05:30
Madhura Jayaratne
c35373e8aa Track view link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:53:49 +05:30
Madhura Jayaratne
2970056de6 Display actual datetime and pad the value with zeros when using calendar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 16:20:05 +05:30
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:53:54 +05:30
Madhura Jayaratne
805679626a rfe #685 Editor for HTML content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:41:56 +05:30
Madhura Jayaratne
de8da9da5f More sub package corrections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:16:47 +05:30
Madhura Jayaratne
e262ca22a2 Use proper sub packages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:15:18 +05:30
Madhura Jayaratne
06a95a425c Escape special chars 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:56:55 +05:30
Madhura Jayaratne
a3e3508e42 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-20 10:42:42 +05:30
Madhura Jayaratne
b7b865a248 Simplify editors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:41:49 +05:30
Smita Kumari
daf6d1e7d8 fix bug #4772 and other similar issues 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-02-20 00:23:07 +05:30
Marc Delisle
0ea06dc2b5 Merge branch 'QA_4_3' 2015-02-19 08:00:25 -05:00
Marc Delisle
88d3aafef1 bug #4771 Central Columns not working, showing error 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-19 07:59:46 -05:00
Madhura Jayaratne
f334064cc4 Add javascript mode file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:58:49 +05:30
Madhura Jayaratne
3d3c672545 rfe #1275 CodeMirror based JSON editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:54:57 +05:30
Madhura Jayaratne
6ee59b7eec rfe CodeMirror based SQL editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:20:32 +05:30
Marc Delisle
4d425e8cf8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-17 12:48:00 -05:00
Chirayu Chiripal
8de1f89922 bugfix 4770: Multiple delete on table browse ignoring foreign key checkbox 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2015-02-17 01:46:19 +05:30
Marc Delisle
3a34d0e2e8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-16 14:27:16 -05:00
Madhura Jayaratne
7bc50e5f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:34:07 +05:30
Madhura Jayaratne
0aac18fcda Missed file from commit 1d73964695 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:28:24 +05:30
Marc Delisle
2a7f1ed42e Remove code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-14 06:12:53 -05:00
Atul Pratap Singh
6866e39ac0 Simply if else logic 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-14 00:15:05 +05:30
Marc Delisle
bb7c805de9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-13 10:48:20 -05:00
Marc Delisle
762d7572cb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-13 10:38:40 -05:00
Marc Delisle
9ef49d83bd Merge remote-tracking branch 'gzzhanghao/master' 2015-02-13 09:27:08 -05:00
Madhura Jayaratne
78e2f60d45 Use local variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 17:42:43 +05:30
Madhura Jayaratne
7a41a35b78 Update parameter type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 17:37:20 +05:30
Zhang Hao
3007c6a6ef Save unfinished work 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-13 18:46:09 +08:00
Madhura Jayaratne
9585fd614d Disable grid-edit for all other cases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:48:47 +05:30
Madhura Jayaratne
07c8211f73 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:43:55 +05:30
Madhura Jayaratne
dbf53d7dba This is global variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:41:00 +05:30
Madhura Jayaratne
2e0167b079 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:16:13 +05:30
Madhura Jayaratne
8a2b870b04 Empty string makes more sense as the default value for table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:05:31 +05:30
Madhura Jayaratne
1cc497e7f0 Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 14:39:08 +05:30
Madhura Jayaratne
320e9dfdde Update doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 14:36:21 +05:30
Madhura Jayaratne
5bde548a29 Update parameter types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 14:32:16 +05:30