webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

318 Commits

Author SHA1 Message Date
flash1452
0d8085c070 Fix #11864 Move noSelect mehthod to makegrid.js 
Signed-off-by: Vishal Pandey <vishpandey2014@gmail.com>
 2016-02-03 14:06:51 +01:00
Michal Čihař
cd1d926a57 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:58 +01:00
Michal Čihař
c3e057b942 Remove unused parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:15 +01:00
Madhura Jayaratne
723b4bdfbe Fix #11846 Grid editing window is disabled the second time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-12 20:21:12 +11:00
Michal Čihař
7dd415776a Remove unused parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-22 09:17:51 +01:00
Deven Bansod
393f0cfc21 Merge branch 'QA_4_5' 2015-12-21 18:28:44 +05:30
Deven Bansod
fe5f69c401 Prevent unnecessary update when nothing is changed 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 18:27:03 +05:30
Michal Čihař
5abdf6886b Merge remote-tracking branch 'origin/QA_4_5' 2015-12-21 11:16:39 +01:00
Deven Bansod
0b64ff7f72 Fix #11724 : live data edit of big sets is not working 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 13:53:03 +05:30
Hugues Peccatte
ff4517ca60 Remove useless variables and simplify code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:36:54 +01:00
Madhura Jayaratne
000d679d63 Merge branch 'QA_4_5' 2015-12-10 07:07:28 +11:00
Madhura Jayaratne
269fcd2a54 issue #11724 Temporary fix for live data edit of big sets is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-10 07:01:42 +11:00
Nisarg Jhaveri
296caced73 Add grid-edit update query only to last query result box 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-30 01:07:34 +05:30
Marc Delisle
db19812acf Merge branch 'QA_4_4' 2015-08-05 09:46:18 -04:00
Dan Ungureanu
bbd581a906 Fixes #11320. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 09:43:14 -04:00
Madhura Jayaratne
805b0d7860 Fix #11322 Missing null checkbox when grid editing a null cell 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 12:29:26 +05:30
Marc Delisle
7f7e45de6b Merge branch 'QA_4_4' 2015-07-13 06:54:21 -04:00
Jack Smith
e88f290d44 Remove confusing second inline edit window (bug #4826) 
When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it.

Signed-off-by: Jack Smith <devjacksmith@gmail.com>
 2015-07-13 06:52:07 -04:00
Madhura Jayaratne
42a4088943 More local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 22:52:09 +05:30
Madhura Jayaratne
81bd7f38af More local variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 20:55:42 +05:30
Nisarg Jhaveri
befe89ad4e Make Scrutinizer Happy 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 21:58:21 +05:30
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
4354049fde Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 19:04:49 +05:30
Madhura Jayaratne
6c7ee747b7 #4918 Date field popup dialog position bug 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 14:55:25 +05:30
Marc Delisle
bb7a254ce4 rfe #1146 Show original size of truncated columns 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-30 09:42:24 -04:00
Madhura Jayaratne
d1b77a2949 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 09:00:32 +05:30
Madhura Jayaratne
91da1a8f38 Fix issues related to number of decimal places in time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:55:44 +05:30
Marc Delisle
77542d0b5a Merge branch 'QA_4_4' 2015-04-02 09:00:14 -04:00
Dan Ungureanu
502b91d861 BUG #4827. TEXT formatting does not work after inline editing. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-02 08:58:05 -04:00
Madhura Jayaratne
d8784a3889 Another bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:59:32 +05:30
Madhura Jayaratne
6b1d977e33 Fix bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:58:18 +05:30
Atul Pratap Singh
3fe1604b7f Merge commit 'c085d0d' 2015-03-13 23:24:28 +05:30
Atul Pratap Singh
4e8ac3c796 Merge branch 'QA_4_3' into QA_4_4 2015-03-13 22:45:23 +05:30
Atul Pratap Singh
17d9d82c41 Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:

	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:44:37 +05:30
Atul Pratap Singh
c085d0d56a datepicker: correct position on clicking on icon and prevent closing on outside click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:22:36 +05:30
Atul Pratap Singh
5b1eb0752f Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 17:52:34 +05:30
Atul Pratap Singh
45fbe0bc2a Fix bug#4797 Inline edit of DATETIME fields, can't change month nor time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-12 23:52:18 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Atul Pratap Singh
cea9aa9688 Revert c9c280e992 and b39933c37b 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-06 18:20:35 +05:30
Marc Delisle
c3410b3e21 Merge branch 'QA_4_3' into QA_4_4 2015-03-05 15:16:55 -05:00
Daniyal Shahid
b39933c37b Fix for #4788 
Signed-off-by: Daniyal Shahid daniyal36@gmail.com

Added a top margin to the datepicker after a certain window height so that null checkbox is visible
 2015-03-06 00:34:37 +05:00
Madhura Jayaratne
7a95986644 Show milliseconds as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:17:39 +05:30
Madhura Jayaratne
2970056de6 Display actual datetime and pad the value with zeros when using calendar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 16:20:05 +05:30
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:53:54 +05:30
Madhura Jayaratne
e9c9bcc72a Fix persisting column visibility to permanent storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 19:04:11 +05:30
Madhura Jayaratne
5ae7e60a76 Define variable first 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 13:28:18 +05:30
Madhura Jayaratne
7a9d9f4f14 rfe #1241 Browse Field -> Search. Also includes cleaning up of code related to the previous implementation at ade942bb09 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 16:08:19 +05:30
Marc Delisle
3039087487 jQuery.browser() has been removed in 1.9 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-04 08:52:09 -05:00
Marc Delisle
0744c5961f Merge branch 'QA_4_3' 2015-02-04 08:37:31 -05:00
Marc Delisle
f14766def9 Merge commit '0768e38' 2015-02-04 08:36:58 -05:00