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

88717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carles Mata
a2070cd195 Translated using Weblate (Catalan) 
Currently translated at 93.9% (2584 of 2749)
 2014-03-18 17:57:21 +01:00
Weblate
beb62dbd7f Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-16 15:00:35 +01:00
Burak Yavuz
4b0de85a8f Translated using Weblate (Turkish) 
Currently translated at 100.0% (2749 of 2749)
 2014-03-16 15:00:32 +01:00
Yungu Kim
31f550167f Translated using Weblate (Korean) 
Currently translated at 76.6% (2108 of 2749)
 2014-03-16 15:00:28 +01:00
Marc Delisle
ae235662e8 Translated using Weblate (French) 
Currently translated at 100.0% (2749 of 2749)
 2014-03-16 15:00:26 +01:00
Pl
b8587c1d9b Translated using Weblate (Bulgarian) 
Currently translated at 71.5% (1966 of 2749)
 2014-03-16 15:00:24 +01:00
Marc Delisle
b2900f12af bug #4323 QueryWindow ignores CodeMirror 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-16 09:56:22 -04:00
Michal Čihař
9fbabd6202 Backport Advisor cleanups from master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:24:03 +01:00
Weblate
99b7b74040 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-14 13:06:08 +01:00
Erik Hepsø
c8c77db608 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.8% (1837 of 2749)
 2014-03-14 13:06:04 +01:00
Michal Čihař
53cc186591 Fixed ob_start/eval problems in phpunit 
When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:55 +01:00
Michal Čihař
3d0f237031 Fix expected message to match code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:48 +01:00
Michal Čihař
3e83565cf2 Fix order of params to assertEquals 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:41 +01:00
Nicholas Arnesen
199d560e8e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.5% (1829 of 2749)
 2014-03-13 18:38:40 +01:00
Erik Hepsø
8b2d5c4cec Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.4% (1828 of 2749)
 2014-03-13 18:37:05 +01:00
Marc Delisle
8eff2e52ef ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-13 10:24:04 -04:00
Aayush Anand
baecb782e5 Fix bug #3991 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-13 10:19:59 -04:00
Atul Pratap Singh
8ca233d511 Fix bug#4324: Insert page datepicker not showing up 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-13 00:44:21 +05:30
Yungu Kim
056b40b0ae Translated using Weblate (Korean) 
Currently translated at 75.9% (2088 of 2749)
 2014-03-11 18:44:06 +01:00
Marc Delisle
5fdb93de0a Fix comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-09 07:40:33 -04:00
Madhura Jayaratne
45606abccb bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-09 14:51:29 +05:30
Marc Delisle
eb7cb82b4a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-08 17:29:37 -05:00
Marc Delisle
e8be0639c0 Merge pull request #1020 from krtin/Bug_FIX#4301 
Bugfix4301
 2014-03-08 17:29:58 -05:00
Krtin Kumar
32edccc541 Bugfix4301 
Signed-off-by: Krtin Kumar <krtinkumar@gmail.com>
 2014-03-07 20:52:58 +05:30
Marc Delisle
50442a2cd8 4.1.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-06 12:47:47 -05:00
Weblate
3093f0f0bc Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-06 09:18:17 +01:00
Burak Yavuz
89c0d37903 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2749 of 2749)
 2014-03-06 09:18:15 +01:00
Chien Wei Lin
090e3f45c9 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2749 of 2749)
 2014-03-06 09:18:12 +01:00
Domen
c803238717 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2749 of 2749)
 2014-03-06 09:18:10 +01:00
Giovanni Sora
511da4270a Translated using Weblate (Interlingua) 
Currently translated at 41.5% (1142 of 2749)
 2014-03-06 09:18:07 +01:00
Michal Čihař
73cdd13a83 Merge pull request #994 from mebjas/QA_4_1 
Correcting test for Config.class.php
 2014-03-06 09:18:03 +01:00
minhaz
06e7aa4c26 Test case for Config.class.php fixed 
Testcases modified:
Two test cases - one for no config file , other with config file

Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-06 12:08:48 +05:30
minhaz
13baf4ea18 testing permission for test object 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-06 00:44:37 +05:30
minhaz
5868049867 Update PMA_Config_test.php 
As per discussion in mailing list, another object is used to check for file permission while global object remains same!
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-05 23:01:05 +05:30
Atul Pratap Singh
1101b21568 changelog entry for 4307 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-04 17:50:12 +05:30
Atul Pratap Singh
fb070815b2 Merge pull request #997 from smita786/bugfix-4307 
bug fix #4307
 2014-03-04 12:15:07 +05:30
Smita Kumari
5e2023ce77 Fix bug#4307 Nav: "Columns" wont expand with specific schema 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-04 12:10:24 +05:30
Marc Delisle
ef959d182f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 15:04:24 -05:00
Marc Delisle
239c1b3296 Merge pull request #993 from omerjerk/QA_4_1 
#4308 Stop edit routine form being submitted with enter
 2014-03-03 15:03:10 -05:00
minhaz
f580c8fb94 Correcting test for Config.class.php 
The constant used to load config file i.e CONFIG_FILE was config.inc.php while it did not exist in code base, which was causing two similar test-case with no config-file.
CONFIG_FILE has been replaced with "config.sample.inc.php" which can be tested for.
 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-04 00:49:57 +05:30
Umair Khan
a0429a872c #4308 Stop edit routine form being submitted with enter 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-03-03 23:41:41 +05:30
Marc Delisle
834dab485e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:26:28 -05:00
Marc Delisle
be06786420 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:19:04 -05:00
Marc Delisle
54220a34b3 Merge pull request #992 from smita786/QA_4_1 
bug fix #4040
 2014-03-03 08:18:15 -05:00
Smita Kumari
cc7f1bf1f9 bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-03 18:38:36 +05:30
Michal Čihař
908df2a243 Merge pull request #986 from omerjerk/QA_4_1 
BugFix #4305
 2014-03-03 09:33:51 +01:00
Michal Čihař
f319824b54 Fix regexp to match 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 09:30:51 +01:00
Michal Čihař
6cbde74c25 Test encoded binary output 
Otherwise PHP sometimes refuses to match binary content using PCRE.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 09:30:44 +01:00
Michal Čihař
f95010d9c2 Merge pull request #981 from mebjas/QA_4_1 
Testcases for PMA_ConfigTest modified
 2014-03-03 09:28:00 +01:00
Umair Khan
3e5fb52959 BugFix #4305 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-03-02 22:22:58 +05:30