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

252 Commits

Author SHA1 Message Date
Madhura Jayaratne
8d9054f732 Use class attribute to select result_query div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 16:49:17 +05:30
Madhura Jayaratne
b1fd49ee6b Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 09:04:32 +05:30
Madhura Jayaratne
b8e13f5b7a Distinguish between options of each result set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:44:07 +05:30
Madhura Jayaratne
f5a943e8a1 Use class attribute to identify correct sql query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:43:30 +05:30
Madhura Jayaratne
201b744650 Remove id from display options slider 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 17:19:53 +05:30
Madhura Jayaratne
aff4046fdd Update getCheckbox to add id field. Remove id field from profiling checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:58:20 +05:30
Madhura Jayaratne
469d6311c5 Remove duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:23:08 +05:30
Madhura Jayaratne
f8d68e6272 Eliminate duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 20:49:11 +05:30
Madhura Jayaratne
63861210d8 Partial fix for bug #4581 Some links in query_result doesn't work 2014-11-10 07:00:59 +05:30
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +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
Ann + J.M
ddbcb5165a Fix unit tests 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-28 11:37:17 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
5687d9792b Improve parameter doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-24 14:11:21 -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
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 08:28:05 +05:30
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
c42beaa705 Merge branch 'QA_4_2' into Bug4552 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:33:47 +05:30
Madhura Jayaratne
380e8940b1 bug #4552 Incorrect routines display for database due to case insensitive checks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:27:09 +05:30
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Marc Delisle
39fe63500d Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-07 08:19:11 -04:00
Madhura Jayaratne
48b97ecd06 bug #4252 Database-level permission bug for db names containing underscores 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 08:03:39 +05:30
Madhura Jayaratne
13155b65a2 Merge branch 'master' into Bug4537 
Conflicts:
	ChangeLog
 2014-10-06 14:25:17 +05:30
Madhura Jayaratne
65f360b33f bug #4551 Wrong test in source code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 10:20:47 +05:30
Hugues Peccatte
f9cd1a1a22 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 11:31:50 +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
Madhura Jayaratne
516f62561b bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-02 10:10:40 +05:30
Marc Delisle
f152146abe [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
 2014-10-01 08:31:07 -04:00
Marc Delisle
6c9c0b5dbf [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:20:23 -04:00
Hugues Peccatte
9f79ac3c73 Revert use of multibytes functions to get compression mime type. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-29 21:14:47 +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
Michal Čihař
e27b287387 Merge remote-tracking branch 'origin/QA_4_2' 
Conflicts:
	libraries/Util.class.php
 2014-09-22 11:39:57 +02:00
Michal Čihař
d2fcf01213 Apply fixup for documentation anchor as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-09-22 11:39:11 +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
Marc Delisle
79896a1c20 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-23 08:07:21 -04:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-12 01:47:20 +05:30
Marc Delisle
f0e1dd8406 Merge pull request #1104 from madhuracj/nav 
Add 'collapse all' and 'link with main panel' buttons to navigation
 2014-08-03 07:37:00 -04:00
Madhura Jayaratne
dfe8dc283a Add 'collapse all' and 'link with main panel' buttons to navigation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-07-28 09:58:24 +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
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Michal Čihař
2d489d3bc7 Add missing space 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:23:46 +02:00
Michal Čihař
564fb8ef93 Wrap long lines 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:14:33 +02:00
Michal Čihař
2e2a667b1d Fix types documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00
Michal Čihař
93c110bdeb If this returns, it returns string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00
Michal Čihař
8c0ba0ceb3 Simplify params passed to pow 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00