gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,559 Commits 12 Branches 481 Tags 2.4 GiB
4effdfd026
Commit Graph

242 Commits

Author SHA1 Message Date
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637 
RFE-637: Custom field handlers (input transformations)
 2014-07-12 09:45:35 -04:00
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
Michal Čihař
f912e090e2 Merge commit 'b0a91accd88c875403cbfea2a5d50d46a3345fc6' 2014-07-08 16:30:25 +02:00
Atul Pratap Singh
b0a91accd8 Fix bug#4485 Sorting breaks the copy column feature 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 17:40:10 +05:30
Marc Delisle
e8d837b8b0 Merge branch 'QA_4_2' 2014-07-07 06:50:33 -04:00
Marc Delisle
621a19ae16 Fix punctuation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-07 06:49:34 -04:00
Atul Pratap Singh
dc7bdf48c6 Merge commit 'b756cc6' 
Conflicts:
	js/makegrid.js
	js/multi_column_sort.js
 2014-07-02 14:11:11 +05:30
Atul Pratap Singh
b756cc66de update js for add/remove modify columns in multi sort 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 00:37:14 +05:30
Hugues Peccatte
40def1a7a2 Fix 'function declaration in loop' scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 21:42:59 +02:00
Michal Čihař
2e20a01abe Fixed indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:14:57 +02:00
Madhura Jayaratne
d99088e794 Merge branch 'QA_4_2' 2014-06-08 23:55:22 +05:30
Madhura Jayaratne
8926c80837 Add a comment to explain the scenario 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-08 23:48:24 +05:30
Madhura Jayaratne
55e87fe8fe bug #4434 Unchecking 'Show SQL queries' results NaN 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-08 23:44:39 +05:30
Hugues Peccatte
aa2bb1ce9d Add possibility to add new line with shift + enter. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:49 +02:00
Hugues Peccatte
df0d48ec6c Fix replace of all new lines. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:18 +02:00
Hugues Peccatte
dec3e0df15 Fix datepicker issue in grid edition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:32:28 +02:00
Hugues Peccatte
d8bb18916c Fix display of text after edit. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:58:16 +02:00
Hugues Peccatte
b7b7e25fe0 Replace edit input for text fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:33:56 +02:00
Ann + J.M
43d1239583 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-24 16:48:53 +02:00
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
Hugues Peccatte
81c3916485 Fix scrutinizer JS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-18 13:57:41 +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
77d1cb5185 Merge commit '3e4561f' 2014-05-10 16:17:07 +02:00
Chirayu Chiripal
3e4561fc93 bug-4389 Null checkbox covering data input when editing 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-10 00:00:26 +05:30
Michal Čihař
4ff140c5be Correct spacing before javascript operators 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 12:03:34 +02:00
Michal Čihař
8dd5df2a7f Merge pull request #1077 from ganeshaditya1/multicolumn 
Multicolumn sorting feature request(1507)
 2014-03-24 15:21:54 +01:00
Aditya Sastry
a05ab9640b Multicolumn sorting feature request(1507) 
This patch completely implements the feature requested and it modifies 4
existing files and adds one extra Javascript file. The existing system for
one column sorting has been refactored to be used for multicolumn sort.

Files messages.php and makegrid.js where modified to add the tool tip.

File sql.php was modified to add the import statement for the newly added JS
file.

The newly added columndelete.js is responsible for shift deleting the columns.
It gets the url of the link that was shift clicked and removes the name of the
column which we want to remove from the order by clause.

Finally, most of the crux of this feature request is implemented through
changes to the DisplayResult.class.php. 4 methods of this class have been
refactored to accomodate the required change. getsortparams() which process
the order by clause text remains the same, just the output parameters have
been turned into a array for each order by clause column. isInSort() has been
modified to check multiple order by clauses. The smart ordering feature in
to form a new function makeURL, which makes the url for multiple sorted table's
header's button's targets.

Signed-off-by: Aditya Sastry <ganeshaditya1@gmail.com>
 2014-03-24 02:17:54 +05:30
Hugues Peccatte
418a7a8813 JSLint updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 17:43:29 +01:00
Atul Pratap Singh
9b0e021c44 Fix bug#4316 Grid edit: can't change month on date fields 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-12 23:30:03 +05:30
Marc Delisle
b0dfbb9256 Merge commit '32edccc' 2014-03-08 17:32:09 -05:00
Krtin Kumar
32edccc541 Bugfix4301 
Signed-off-by: Krtin Kumar <krtinkumar@gmail.com>
 2014-03-07 20:52:58 +05:30
Viduranga Wijesooriya
820bd6ad6e fixed #4300 Grid edit textfield: can't place cursor or select text with mouse 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-03-02 14:48:50 +05:30
Viduranga Wijesooriya
1c732b783b re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-25 19:35:02 +05:30
Viduranga Wijesooriya
07dd92c5be bug-#4281 reset the position of the edit_area div after closing datetime picker 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-25 19:29:38 +05:30
Viduranga Wijesooriya
6c22b4d4b9 re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-25 19:16:42 +05:30
Viduranga Wijesooriya
7dae314aa3 fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-24 22:39:21 +05:30
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Viduranga Wijesooriya
2453a15174 #1498 Add timepicker for 'TIME' type 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-03 09:28:20 +05:30
Marc Delisle
82a549714e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:22:29 -05:00
Viduranga Wijesooriya
efa453a8a0 fixed bug #4257 Hide fractional seconds #2 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-30 19:04:04 +05:30
Viduranga Wijesooriya
d483b9f03a fixed bug #4257 Hide fractional seconds 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-30 16:09:55 +05:30
Marc Delisle
ec8284984f Merge commit 'c78c4f0' 2014-01-15 15:20:23 -05:00
Meir Goldstein
1a9efd7c7d bug #4231 DATE columns quick edit decrement by one day 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 15:14:47 -05:00
Marc Delisle
50914ab27e Merge branch 'QA_4_1' 2014-01-05 06:18:29 -05:00
Marc Delisle
86104e8666 bug #4213 Datetime Quick Edit decrements by one day 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-05 06:06:46 -05:00
Atul Pratap Singh
7b8dff2550 [Backporting to QA_4_1 from master] Turn off user select while rearranging columns 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 16:58:22 +05:30
Atul Pratap Singh
2850e9f484 On resizing and rearranging columns, update sticky header 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:22:08 +05:30
Madhura Jayaratne
74a7e1c0a4 Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:07:50 +05:30
Madhura Jayaratne
9ab62d5e17 bug #4200 Missing syntax highlighting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:03:17 +05:30
Marc Delisle
220a67f6c3 Merge branch 'QA_4_1' 2013-12-20 06:27:35 -05:00