Commit Graph

161 Commits

Author SHA1 Message Date
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
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
Michal Čihař
9d17a602f5 Better messasge after creating a bookmark
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:32:15 +01:00
Madhura Jayaratne
510b3fd7be Wrap a long line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:56:42 +05:30
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1'
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
2014-01-29 23:30:33 +05:30
Madhura Jayaratne
212a7e5a7e Fix bug #4245
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:15:58 +05:30
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:06:43 +05:30
Marc Delisle
8cdb92be5a Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-29 08:10:23 -05:00
Marc Delisle
f36fbfd4c6 Bug #4258 Grid editing broken
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-29 07:58:19 -05:00
Michal Čihař
177308f134 Consistent message with other location 2014-01-29 13:32:16 +01:00
Marc Delisle
8ba4548146 Merge commit 'e8fa9e5' 2014-01-27 12:45:29 -05:00
Sampath Liyanage
e8fa9e5335 bug 4245 fix with minimum changes
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-01-27 21:29:27 +05:30
Marc Delisle
3d72b1cc87 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-24 08:24:14 -05:00
Marc Delisle
2fac99a707 Merge commit 'cd46fbe' 2014-01-21 05:54:07 -05:00
Marc Delisle
cd46fbef11 Another case for bug #4239
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-21 05:52:25 -05:00
Marc Delisle
764c2cb5a9 Merge branch 'QA_4_1' 2014-01-20 12:52:10 -05:00
Marc Delisle
3091d6c4ee bug #4239 Missing LIMIT clause for some queries
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-20 12:46:42 -05:00
Madhura Jayaratne
6335b10574 Fix coding style
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 14:35:15 +05:30
Madhura Jayaratne
aecd5f7072 Merge branch 'QA_4_1'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-01 18:45:40 +05:30
Madhura Jayaratne
0ae77814a7 bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-01 18:41:09 +05:30
Hugues Peccatte
f8b9f66a5e Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 23:09:43 +01:00
Marc Delisle
b3cf4dc89f Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-13 05:43:36 -05:00
Smita Kumari
72f422b157 fix bug #3903 and retaing ORDER BY preference when query having ORDER BY clause without backquoting
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2013-12-13 14:38:03 +05:30
Marc Delisle
6720751744 Fix undefined variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-08 09:28:58 -05:00
lakshit
274943c0c5 Fixed bug 4154
Signed-off-by: lakshit <lakshitarora26@gmail.com>
2013-12-08 06:38:20 -05:00
Madhura Jayaratne
5bf243b8e6 Specify types 2013-11-11 07:14:37 +05:30
Hugues Peccatte
d7df8b8185 Update types in PHPDoc. 2013-11-08 19:28:18 +01:00
Marc Delisle
5cb21ef969 Fix coding style 2013-11-05 12:25:54 -05:00
Hugues Peccatte
12f1627656 Fix repositioning after delete.
Fix test related to repositioning.
2013-11-03 19:19:15 +01:00
Hugues Peccatte
d3adbcaf05 Fix calculation of pos after delete. 2013-11-03 16:02:50 +01:00
Hugues Peccatte
1aedeefc43 Update start position after a delete. 2013-11-03 15:29:44 +01:00
Marc Delisle
6a082ec77e Clarify parameter name 2013-10-28 06:21:18 -04:00
Marc Delisle
b7180be8d5 Bug #4136 2013-10-17 06:16:09 -04:00
Marc Delisle
88da7eeba0 Fixes many coding style "line too long" 2013-10-17 05:41:51 -04:00
Marc Delisle
effa00f209 Bug #4135 When searching, error "No database selected" 2013-10-15 15:36:13 -04:00
Madhura Jayaratne
71950aaf08 Make these long parameter lists a bit easier to read 2013-10-15 07:03:14 +05:30
Atul Pratap Singh
ec6f20fac9 Database was being set at wrong place 2013-10-15 00:08:50 +05:30