Commit Graph

4223 Commits

Author SHA1 Message Date
Madhura Jayaratne
ac0d22638d Merge branch 'QA_4_4' 2015-06-16 17:15:59 +05:30
Madhura Jayaratne
1d0de9881a bug #4962 Insert by foreign key scrolls page to top
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 17:10:13 +05:30
Madhura Jayaratne
29e68ddccf Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 12:10:24 +05:30
Madhura Jayaratne
a701f6e084 bug #4961 Javascript error when Designer is opened
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 12:08:57 +05:30
Madhura Jayaratne
fdb114b8a0 Wrap a long line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 11:07:28 +05:30
Madhura Jayaratne
359f7586df Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 11:06:20 +05:30
Madhura Jayaratne
7c236e1abd bug #4960 Table creation results in GET request with missing server parameter that invalidates the session
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 11:02:01 +05:30
Madhura Jayaratne
c2e91186d2 Allow specifying resize direction
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-15 15:19:27 +05:30
Madhura Jayaratne
e3449c9372 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-15 08:55:08 +05:30
Madhura Jayaratne
72cc1f9f51 bug #4958 Designer Javascript error with specially crafted table name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-15 08:53:16 +05:30
Marc Delisle
84fa181135 Bug #4933 INSERT validation issues with MySQL functions
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-14 17:09:27 -04:00
Hugues Peccatte
60dd86ad70 Merge pull request #1730 from Tithugues/b4957_master
Fix #4957 "With selected" links doesn't work in table browse
2015-06-14 13:53:09 +02:00
Hugues Peccatte
ac620cc224 Fix #4957 "With selected" links doesn't work in table browse
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-06-14 12:54:04 +02:00
Marc Delisle
10437a807c Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-14 06:47:00 -04:00
Nisarg Jhaveri
8f242871dc Foreign key checkbox for empty/drop in table operation
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-13 19:51:28 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-12 19:40:23 +05:30
Madhura Jayaratne
d3d3aac92b Merge branch 'QA_4_4' 2015-06-10 20:11:25 +05:30
Madhura Jayaratne
b47e1ce456 #4953 cant drag sql.gz file onto import input
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-10 20:09:25 +05:30
Isaac Bennetch
0a868fb4ba Merge pull request #1699 from devenbansod/rfe726
RFE#726 - Batch changing column collations
2015-06-09 08:31:02 -04:00
Madhura Jayaratne
abc9434cf2 Merge branch 'QA_4_4' 2015-06-09 15:23:28 +05:30
Madhura Jayaratne
f2fd95405c #4951 Trying to save chart as image crashes the browser
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-09 15:21:39 +05:30
Deven Bansod
30c9b2d066 RFE#726 - Batch changing column collations
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-09 12:24:34 +05:30
Madhura Jayaratne
31d29835e9 Add select all to database selector in replication gui
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-09 10:53:55 +05:30
Madhura Jayaratne
c468076031 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-09 10:46:29 +05:30
Madhura Jayaratne
7902535a12 bug #4950 Issues in database selection for replication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-09 10:43:46 +05:30
Madhura Jayaratne
380cd38ed1 bug #4946 When hide table structure actions is false, action should be in a row
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-08 13:34:02 +05:30
Madhura Jayaratne
1369057141 Fix indentation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-04 21:09:40 +05:30
Madhura Jayaratne
6235c3d8c5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-04 20:56:03 +05:30
Madhura Jayaratne
4e937d9918 Remove support for Shift + Click on function name to apply to all rows in insert/edit page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-04 20:54:13 +05:30
Isaac Bennetch
b5c946fdb1 Merge pull request #1713 from devenbansod/rfe1359
RFE#1359 - Ctrl (and alt) Navigation in Grid Editor
2015-06-04 09:42:11 -04:00
Deven Bansod
1ef602ccfd RFE#1359 - Ctrl Navigation in Grid Editor
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-04 12:18:13 +05:30
Madhura Jayaratne
40da17ab72 rfe #1677 Support spatial indexes in table create form
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-03 17:41:15 +05:30
Madhura Jayaratne
36f4a22e13 #4941 Table structure multi submit is broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-03 12:02:31 +05:30
Atul Pratap Singh
14f9cca19f Fix bug#4938: on print, +Indexes link and .sticky_columns remain visible
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-06-02 13:04:24 +05:30
Isaac Bennetch
af658d27ee Merge pull request #1708 from devenbansod/rfe701_using_css
RFE#701 - Print View using CSS - Rewrite
2015-06-01 14:50:04 -04:00
Madhura Jayaratne
0ff83aa019 Coding style improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 17:11:40 +05:30
Madhura Jayaratne
234e72a582 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 10:04:18 +05:30
Madhura Jayaratne
38c0177b3a Remove the anchor if total row count is not approximate
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 09:59:46 +05:30
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-01 03:57:50 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-05-31 12:28:41 +05:30
Marc Delisle
20db71b940 Merge commit '0bbd8b9' 2015-05-30 07:21:06 -04:00
Smita Kumari
0bbd8b9223 fix bug #4909
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2015-05-30 00:11:50 +05:30
Madhura Jayaratne
f4b12e5cbd Align
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 10:52:35 +05:30
Madhura Jayaratne
323482bcea Merge branch 'QA_4_4' 2015-05-29 10:52:02 +05:30
Madhura Jayaratne
d5371be455 bug #4920 relation view doesn't list fields of table in other database
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 10:49:11 +05:30
Madhura Jayaratne
ce79e5fe9f Simplify jQuery object iteration
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-27 12:55:40 +05:30
Madhura Jayaratne
a3225dc1ed Fix height issue for SQL editor input transformations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-27 12:48:10 +05:30
Hugues Peccatte
1f0d3bde63 Make PHPcs happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-05-23 13:16:06 +02:00
Isaac Bennetch
b09cc73b49 Merge pull request #1686 from devenbansod/rfe946
RFE#946 : Change Collation w/o changing data and Confirm before changing
2015-05-23 00:40:39 -04:00
Deven Bansod
487c3266fc RFE#946 : Change Collation w/o changing data and Confirm before changing
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-05-23 04:10:27 +05:30