Commit Graph

196 Commits

Author SHA1 Message Date
Hugues Peccatte
ebda4090db Coding style modifications.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-14 15:47:14 +02:00
Marc Delisle
2b7ef3f31f Merge branch 'QA_4_2' 2014-09-11 08:12:32 -04:00
Marc Delisle
1ef714febe bug #4529 Undefined index: pos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-11 08:12:06 -04:00
Marc Delisle
f8742726a6 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-10 19:19:14 -04:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 13:56:42 +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
8c89232f1d Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-27 08:26:59 -04:00
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-08-26 21:44:05 +05:30
Marc Delisle
8c234c1b49 Fix parameter type
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-24 07:55:29 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 18:33:59 +05:30
Marc Delisle
1703705c7a Fix execution path notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-29 12:03:52 -04:00
chanaka
237b00cc00 Fixed some codesniffer errors
Signed-off-by: chanaka <chanaka@oneit.com.au>
2014-07-28 21:49:11 +05:30
Marc Delisle
5aee521030 Merge branch 'QA_4_2' 2014-07-07 06:36:11 -04:00
Marc Delisle
ca9ad6015a Undefined variable when grid editing a foreign key column
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-07 06:35:30 -04:00
Ann + J.M
64fddc4c6e Fix PHPDoc param types for PMA_executeQueryAndSendQueryResponse
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-07-02 21:28:39 +02:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
5b1fe4e55f Add comments and todo for the justBrowsing logic
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:22:53 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:14:39 -04:00
Marc Delisle
e1b598ff1e Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-25 13:05:57 -04:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-25 14:24:57 +05:30
Marc Delisle
3c84487ca0 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-22 14:56:54 -04:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables.
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-06-22 22:41:23 +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
Marc Delisle
8ea7d15c16 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-16 12:44:27 -04:00
Marc Delisle
9b1a29131a Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-16 12:34:10 -04:00
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-15 10:07:38 -04:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-12 13:45:03 +02:00
Madhura Jayaratne
9a12fe5d0b Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-06 18:23:56 +05:30
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-21 21:42:21 +05:30
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:04:22 +02:00
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-14 17:30:11 +05:30
Marc Delisle
e57088ef79 Remove unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-08 16:16:52 +02:00
Marc Delisle
d2c527890c Clarify variable name and its description
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-01 08:41:36 -04:00
Marc Delisle
002e22f0e9 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-01 07:56:55 -04:00
Marc Delisle
89f7dffecc Merge commit 'bd9e66f' 2014-04-26 17:59:39 -04:00
Ashutosh Dhundhara
bd9e66f4bc Bug Fix: #4366 Creating Index doesn't update index-list.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-04-27 01:00:10 +05:30
Marc Delisle
9a1099eaee Merge commit 'd542180' 2014-04-11 13:17:46 -04:00
Marc Delisle
72f0507841 Merge commit 'f220ef2' 2014-04-11 13:17:15 -04:00
Marc Delisle
d542180fb1 Remove unneeded test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-11 13:16:28 -04:00
Ashutosh Dhundhara
f220ef2c72 Bug Fix: #4356 GROUPed selects show number of rows as if not grouped.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix for group_by_clause condition.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-04-11 22:08:31 +05:30
Atul Pratap Singh
9718b7ba52 Merge branch 'QA_4_1' 2014-04-06 13:38:42 +05:30
Atul Pratap Singh
deb8075db4 Fix bug#4353 makeProfilingChart is not defined
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-04-06 13:17:58 +05:30
Michal Čihař
7233657d4d Remove support for SQL validator
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-02 12:10:52 +02:00
Edward Cheng
9ba932077e Fix jqplot display
Add clearfloat before jqplot element.
Fix bug: legend overflow.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-02-27 22:28:05 +08:00
Marc Delisle
1029776df1 Merge commit 'ac80367' 2014-02-16 06:49:53 -05:00
Sampath Liyanage
ac80367c8c bug fix 4286
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-02-14 17:18:46 +05:30
Marc Delisle
3b76a7549a Merge commit 'b6cd8cd' 2014-02-11 12:31:28 -05:00
Sampath Liyanage
b6cd8cdb33 bug fix 4249
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-02-08 22:24:03 +05:30