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

121 Commits

Author SHA1 Message Date
Jason
fb2fb18dcd Fixes issue #11399. 
- Also some changes were made to prevent same kind of bug from occuring again

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-21 07:23:27 -04:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
ad49ae971e These checks are redundant. <feature>work variables should always be defined unless in an upgrade 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-15 19:31:37 +05:30
Madhura Jayaratne
3160799df6 Use phpmyadmin's secondary tabs instead of jQuery tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-10 19:38:20 +05:30
Madhura Jayaratne
b0ae16fcd6 These are also internal directives. Remove underscore to match with other similar ones 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:15:10 +05:30
Marc Delisle
21eb98a9df Terminology: user accounts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-08 13:23:07 -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
a54da2052b Preserve tab order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 18:06:17 +05:30
Madhura Jayaratne
7f359cee8a Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:49:42 +05:30
Madhura Jayaratne
a06dc4f7a9 Simplify checking for Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 11:06:37 +05:30
Madhura Jayaratne
245e730f56 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:53:42 +05:30
Madhura Jayaratne
99aad2c118 bug #4685 Call to a member function isUserType() on a non-object 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-07 10:49:33 +05:30
Marc Delisle
56baec6160 Merge branch 'QA_4_3' 2015-01-04 07:35:26 -05:00
Madhura Jayaratne
dfae4d2f08 Bug #4676 - Auto configuration issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-02 09:49:03 +05:30
Marc Delisle
c15d3f8051 Merge branch 'QA_4_3' 2014-12-09 13:06:42 -05:00
Marc Delisle
7deba11168 Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:05:14 -05:00
Hugues Peccatte
603498a6fc Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:01:55 +01:00
Hugues Peccatte
eda24da12e Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 00:57:38 +01:00
Madhura Jayaratne
5fd35f82e0 Make Structure tab active for table relations page as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 18:31:10 +05:30
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-29 06:49:24 -05:00
Madhura Jayaratne
a1c1590254 Cache binary_logs variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 14:31:45 +05:30
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Marc Delisle
e7598d7cc9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 12:57:35 -04:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
460b71fc8d Status menu should be active for server_status_processes.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 12:00:42 +05:30
Hugues Peccatte
95f4ed1558 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 12:48:25 +02:00
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 10:42:44 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Bimal Yashodha
285c18acdd Use db_desginer.php as a route for all designer operation. Combine pmd_general.lib.php and designer.lib.php into db_designer.lib.php 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-14 07:22:32 +05:30
Bimal Yashodha
39d4fc1023 Check whether the db is not system schema 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 15:36:48 +05:30
Bimal Yashodha
be1cd209f5 Merge branch 'master' into indexdb 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 15:27:26 +05:30
Bimal Yashodha
7ec0f098db Use designer without configuring tables 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 14:37:38 +05:30
Chirayu Chiripal
04a3a7073b RFE-1488/781: User privilege tab not shown in all relevant cases 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-18 00:13:08 +05:30
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Marc Delisle
232a03a4bd Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-27 08:23:12 -04:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 11:39:39 +05:30
Marc Delisle
36d2c402fa Merge branch 'QA_4_2' 2014-06-07 09:03:10 -04:00
Marc Delisle
9342cc6709 Incorrect menu tab generation from usergroups 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 09:02:10 -04:00
Marc Delisle
673fce8145 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:33:25 -04:00
Smita Kumari
175b69b72b central columns management page basic 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

central columns management page edit/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added column length to central columns table

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix edit issu

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove logging and alert statement

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

delete an entry fixed

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

col_length default to 0 + filter rows

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix menu tab test case

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix col_length datatype plus menu tst case fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added cancel button

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprite regenerate for adding cntral columns icon

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing default value from col_length of type text

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

message format

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

search fix plus uitablfilter plugin modify to take elements to limit search to

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring db_cntral_columns.php plus file description in db_cntral_columns.js

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added table sorting

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix js error for empty central columns

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring of code plus adding option to add a column to central list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing trailing white spaces

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

handle condition if central list is empty

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-02 01:57:50 +05:30
Michal Čihař
790a2c2bee Rename variable to match current meaning 
There is not only INFORMATION_SCHEMA now, so the variable should have
more generic name.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-01-06 11:11:34 +01:00
Hugues Peccatte
2fc0ca777d Update PHPDoc. 2013-11-10 10:28:05 +01:00