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

88739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
704e87377e Merge pull request #1084 from sampathLiyanage/bugfix4334 
bug fix 4334
 2014-03-23 06:55:07 -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
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
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
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
8978ac5bcc 4.1.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 06:54:45 -04:00
Weblate
454cc7ca72 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-20 10:18:54 +01:00
Anawin Wongsadit
f92b4afbbd Translated using Weblate (Thai) 
Currently translated at 42.0% (1157 of 2749)
 2014-03-20 10:18:51 +01:00
Peter Sone Koldkjær
23c4f3eea2 Translated using Weblate (Danish) 
Currently translated at 99.8% (2746 of 2749)
 2014-03-20 10:18:48 +01:00
Michal Čihař
c56523bebd Allow styles from ourselves in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 10:18:42 +01:00
Michal Čihař
eab5d68b9d Fix typo in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:39:23 +01:00
Michal Čihař
5cb584b963 Allow inline styles in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:36:53 +01:00
Michal Čihař
5199ad8dc2 Add Content-Security-Policy header 
This is standard and obsoletes X-Content-Security-Policy and
X-Webkit-CSP, but we still keep the old ones to provide headers for old
browsers.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Michal Čihař
786256469c Allow www.google.com only in case we are using reCAPTCHA 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Weblate
2db6d499c6 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-18 17:57:25 +01:00
Giovanni Sora
8abc3f1d8d Translated using Weblate (Interlingua) 
Currently translated at 41.6% (1144 of 2749)
 2014-03-18 17:57:23 +01:00
Carles Mata
a2070cd195 Translated using Weblate (Catalan) 
Currently translated at 93.9% (2584 of 2749)
 2014-03-18 17:57:21 +01:00
Marc Delisle
70ffeaacf3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-18 12:56:58 -04:00
Ashutosh Dhundhara
09108aedda Bug: None of the live charts shown on "Status -> Monitor" page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-18 12:55:23 -04: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