gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,836 Commits 12 Branches 481 Tags 2.4 GiB
9c56a8d4f1
Commit Graph

90836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
9c56a8d4f1 Merge commit '79fdf8d62f1c1aba31b5603f693ae8f9d8e10dac' 2014-03-24 16:10:19 +01:00
Michal Čihař
ccc195aef1 Merge commit '0850abc8bc9b4fbbf91cf9ef75520163836bbd4f' 2014-03-24 16:10:13 +01:00
Weblate
79fdf8d62f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-24 16:06:13 +01:00
Bohdan
62f2680945 Translated using Weblate (Ukrainian) 
Currently translated at 94.5% (2598 of 2749)
 2014-03-24 16:06:10 +01:00
Michal Čihař
0850abc8bc Merge pull request #1094 from smita786/QA_4_1 
bug fix #4338:Executing queries in SQL tab broken Bug
 2014-03-24 16:06:06 +01:00
Smita Kumari
51d78cbb81 Bug Sqlform:Missing value in the form 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-24 19:54:53 +05:30
Michal Čihař
8dd5df2a7f Merge pull request #1077 from ganeshaditya1/multicolumn 
Multicolumn sorting feature request(1507)
 2014-03-24 15:21:54 +01:00
Michal Čihař
869b17c0f8 Merge pull request #1093 from WhaleWatching/fix_expander_timeout 
Bug fix: Redirect while timeout and expander clicked.
 2014-03-24 15:20:14 +01:00
Edward Cheng
da3f959bf2 Bug fix: Redirect while timeout and expander clicked. 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-03-24 21:42:41 +08:00
Weblate
f1b7735cc7 Merge remote-tracking branch 'origin/master' 2014-03-24 11:59:25 +01:00
Chien Wei Lin
0dd8d8d4ee Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-24 11:59:22 +01:00
Michal Čihař
ce11dff6ef Avoid double checks for direct execution of a script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-24 11:59:14 +01:00
Chien Wei Lin
297dbd54e9 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-24 08:21:33 +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
Marc Delisle
3092e99b87 Merge pull request #1087 from ashutoshdhundhara/bug_datepicker 
Bug: Datepicker icon not showing on "Add Event" dialog.
 2014-03-23 15:46:18 -04:00
Ashutosh Dhundhara
c8da59c75a Bug: Datepicker icon not showing on "Add Event" dialog. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-23 19:01:41 +05:30
Marc Delisle
ac63c94336 Merge branch 'QA_4_1' 2014-03-23 06:56:05 -04:00
Marc Delisle
1e37be98cf Merge commit '704e873' 2014-03-23 06:55:57 -04:00
Marc Delisle
704e87377e Merge pull request #1084 from sampathLiyanage/bugfix4334 
bug fix 4334
 2014-03-23 06:55:07 -04:00
Marc Delisle
b9d161ac8c Merge commit '67d548f' 2014-03-23 06:54:36 -04:00
Marc Delisle
406e722af4 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-23 06:53:50 -04:00
Sampath Liyanage
67d548fea4 bug fix 4334 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-03-23 02:06:16 +05:30
Marc Delisle
997e5e0ddf Merge commit '765284c' 2014-03-22 13:01:56 -04:00
Marc Delisle
5e54582355 4.1.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 13:01:24 -04:00
Marc Delisle
765284c476 4.1.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 12:59:51 -04:00
Weblate
ad9fcbe9fe Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-22 17:53:39 +01:00
Yungu Kim
82e31a9144 Translated using Weblate (Korean) 
Currently translated at 77.3% (2127 of 2749)
 2014-03-22 17:53:36 +01:00
Marc Delisle
84ce44e69c Merge branch 'QA_4_1' 2014-03-22 12:51:19 -04:00
Marc Delisle
cd8554766f Merge commit '20d9329' 2014-03-22 12:51:11 -04:00
Marc Delisle
b9039ee3d9 bug #4335 reCaptcha problem (4.1.10 regression) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 12:50:19 -04:00
Weblate
baaac88363 Merge remote-tracking branch 'origin/master' 2014-03-22 16:34:05 +01:00
Yungu Kim
e7acb2a40e Translated using Weblate (Korean) 
Currently translated at 72.9% (2010 of 2756)
 2014-03-22 16:34:02 +01:00
Madhura Jayaratne
3bea7c584a Add missing space 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-22 21:00:51 +05:30
Weblate
3015016bd5 Merge remote-tracking branch 'origin/master' 2014-03-22 12:00:14 +01:00
Diogo Santos
2283f00e91 Translated using Weblate (Portuguese) 
Currently translated at 52.9% (1458 of 2756)
 2014-03-22 12:00:11 +01:00
Yungu Kim
7baad886e5 Translated using Weblate (Korean) 
Currently translated at 71.7% (1978 of 2756)
 2014-03-22 12:00:08 +01:00
Weblate
20d93299bc Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-22 11:57:52 +01:00
Diogo Santos
9b10cd174f Translated using Weblate (Portuguese) 
Currently translated at 61.2% (1683 of 2749)
 2014-03-22 11:57:50 +01:00
Yungu Kim
5df632fe34 Translated using Weblate (Korean) 
Currently translated at 76.7% (2111 of 2749)
 2014-03-22 11:57:48 +01:00
Marc Delisle
5cc34519b8 4.1.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 06:56:56 -04:00
Marc Delisle
07d41461e5 Merge commit '8978ac5' 2014-03-22 06:55:53 -04:00
Marc Delisle
438df31954 Merge commit '454cc7c' 2014-03-22 06:55:34 -04:00
Marc Delisle
8978ac5bcc 4.1.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 06:54:45 -04:00
Marc Delisle
bab0572c1e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-21 12:42:10 -04:00
Michal Čihař
bc505831ae Try to limit browser set to see if it helps running testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-21 07:26:36 +01:00
Michal Čihař
e2bc0f6aff Merge pull request #1075 from kb-yashodha/refactoring 
Refactor - Move duplicate code to a parent class
 2014-03-21 07:01:31 +01:00
Bimal Yashodha
ae7830985f Correct spelling mistakes 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-21 07:11:27 +05:30
Madhura Jayaratne
a3c63c3c68 Avoid conflicting selectors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-21 00:36:12 +05:30
Bimal Yashodha
b362d0e8b6 Move getTitle() method to parent class 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-20 22:48:22 +05:30
Michal Čihař
2e867368e0 Ignore Ant cache files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 13:05:53 +01:00