gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,609 Commits 12 Branches 481 Tags 2.4 GiB
ded2aa96ec
Commit Graph

3158 Commits

Author SHA1 Message Date
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
Michal Čihař
767fc8c997 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:38:49 +01:00
Michal Čihař
6ec65071fd Use sprintf instead of concatenating for translated message 2014-02-02 11:34:25 +01:00
Michal Čihař
8593a5a497 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:33:52 +01:00
Marc Delisle
2bb7740c0a Merge branch 'QA_4_1' 2014-02-01 06:25:29 -05:00
Marc Delisle
d5de274d32 bug #4264 Uncheck "Ignore" while inserting, upon leaving a textarea 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-01 06:24:52 -05:00
Marc Delisle
82a549714e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:22:29 -05:00
Marc Delisle
2bca34d2f8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:10:08 -05:00
Atul Pratap Singh
27143a758c Merge branch 'QA_4_1' 2014-01-31 15:25:27 +05:30
Atul Pratap Singh
b7dfae03b9 Fix bug#4266: error_reporting: cannot call methods on widget(tooltip) prior to initialization 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-31 15:18:23 +05:30
Atul Pratap Singh
393402dca6 Merge branch 'QA_4_1' 2014-01-31 13:12:09 +05:30
Atul Pratap Singh
ac530e7755 Fix error reports 204/711/1285: Cannot read property 'top' of undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-31 12:51:45 +05:30
Viduranga Wijesooriya
8cc01b38ae bug#4257 - fixed test failures 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 12:09:46 +05:30
Viduranga Wijesooriya
2f2dd3b548 bug#4257 - refixed datetimepicker view of record edit page 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 01:58:33 +05:30
Viduranga Wijesooriya
b93e426998 bug#4257 - fixed datetimepicker view of record edit page 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 01:52:52 +05:30
Viduranga Wijesooriya
fc4ad4b6ac fixed bug #4257 Hide fractional seconds #3 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-30 21:55:46 +05:30
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
Michal Čihař
c3bcdf2b5d Remove no longer used javascript messages 2014-01-29 13:23:03 +01:00
Marc Delisle
dfb7538c86 Merge commit '733318f' 2014-01-25 10:33:17 -05:00
Umair Khan
733318f7c3 bugfix #4248 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-01-25 16:23:25 +05:30
Michal Čihař
0097ba0b58 End sentences with punctuation 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-23 10:59:27 +01:00
Atul Pratap Singh
5886bc412c version info was being added multiple times 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-21 16:58:00 +05:30
Atul Pratap Singh
14a031cee7 version info was being added multiple times 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-20 10:38:17 +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
Atul Pratap Singh
d3bd91eaaf Merge branch 'QA_4_1' 
Conflicts:
	js/navigation.js
 2014-01-10 00:06:29 +05:30
Atul Pratap Singh
bdd53902f4 Merge commit 'ad415fe' 
Conflicts:
	js/navigation.js
 2014-01-10 00:01:18 +05:30
Atul Pratap Singh
0577539109 Remove redundant function and rename variable: auto-expand table/view 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-09 21:01:19 +05:30
Atul Pratap Singh
eef7c3ddba Rewrite simply and generalize table/view part and fix bug#4219 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-09 21:00:23 +05:30
Atul Pratap Singh
ad415feb09 Remove redundant code and simplify: auto-expand/highlight 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-08 22:45:11 +05:30
Madhura Jayaratne
b079b18e79 Merge branch 'QA_4_1' 2014-01-08 10:02:37 +05:30
Atul Pratap Singh
43f250096e Fix bug#3780: Allow aborting ajax request if user clicks on new link in time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-07 22:59:33 +05:30
J.M
61bae3f227 [interface] Break "Edit privileges" with sub-menus 
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-01-06 21:22:31 +01: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
Marc Delisle
e4ff92dc0a Improve variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-04 19:10:51 -05:00
Marc Delisle
7c7edc1f67 Improve variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-04 19:08:20 -05:00
Atul Pratap Singh
31016c023c Fix error_reports 9,16,77: Remove unused highcarts code 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-05 00:52:19 +05:30
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
e499344194 Enable hovering, marking of columns via sticky header also 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:45:40 +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
Michal Čihař
effa897aa2 Merge remote-tracking branch 'origin/QA_4_1' 
Conflicts:
	libraries/structure.lib.php
 2014-01-03 10:43:08 +01:00
Michal Čihař
0ef64c9d17 Merge branch 'bug-#4184' of git://github.com/lakshit/phpmyadmin into integration 2014-01-03 10:38:27 +01:00
Lakshit Arora
c86dec0378 Fixed Bug #4184 2014-01-03 02:16:26 +05:30
J.M
3b8bfb97ac Prevent initials_table from ajax-appearing twice 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:11:34 +01:00
Marc Delisle
e663061102 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-30 11:39:28 -05:00
Marc Delisle
c1d8d80f75 bug #3920 Lost space in navigation area 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-30 11:05:03 -05:00
Atul Pratap Singh
f370b425f4 Fix bug#4203 on refreshing designer, FullScreen is undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-29 00:45:17 +05:30