gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,021 Commits 12 Branches 481 Tags 2.4 GiB
900315e4a3
Commit Graph

103021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
900315e4a3 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-28 10:11:11 +01:00
Michal Čihař
8b83e0de27 Use changelog from release notes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 10:10:41 +01:00
Michal Čihař
48cd56d8bf Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-28 09:31:40 +01:00
Michal Čihař
0fe7438a05 Document last release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 09:31:14 +01:00
Isaac Bennetch
1d6efadaea Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-28 00:42:03 -05:00
Isaac Bennetch
2870a797f3 Release 4.5.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-27 22:52:02 -05:00
Madhura Jayaratne
77922b22e4 fix #11881 Full processlist lost on refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-27 21:40:20 +11:00
Michal Čihař
c9536a88e9 Move security check behind namespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 11:10:13 +01:00
Michal Čihař
5a3de108f2 Avoid execution outside phpMyAdmin 
This is hacky, but avoids path disclossure on direct access to the
scripts.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 09:01:29 +01:00
Michal Čihař
d4b9c22c1f Enable localization before redirect 
This is needed in case of IIS which needs full HTML response.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 08:56:24 +01:00
Michal Čihař
60530a1df9 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-26 18:27:05 +01:00
Weblate
428b74d297 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-26 18:24:36 +01:00
Stefano Martinelli
df61ec1992 Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-26 18:24:35 +01:00
Michal Čihař
9ca4b34446 Add back hhvm, it should work 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:24:11 +01:00
Michal Čihař
d21ce68c60 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-26 18:23:54 +01:00
Michal Čihař
6e6b922ee8 Do not run tests with allowed failures on maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:23:34 +01:00
Michal Čihař
0cade5712a Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:19:07 +01:00
Michal Čihař
c57d3cc7b9 Avoid invalid invocation of SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:10:18 +01:00
Michal Čihař
76b10187c3 Fallback to default collation connection 
If user supplied wrong string we should gracefully fallback.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:00:19 +01:00
Michal Čihař
f83b52737e Do not process subforms with PMA_MINIMUM_COMMON 
In such case needed infrastructure is not loaded, so related code won't
work anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:35:08 +01:00
Michal Čihař
447c88f488 Can not use PMA_fatalError when including fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:30:57 +01:00
Michal Čihař
85ccdbb5b9 Include common libraries in setup 
We use PMA_fatalError which in turn needs Response and related objects.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:27:38 +01:00
Michal Čihař
7ffd8d69a1 Merge pull request #5 from phpmyadmin/hash_equals 
Use hash_equals for comparing token
 2016-01-26 09:55:05 +01:00
Madhura Jayaratne
1d885f90bc Merge pull request #8 from phpmyadmin/js-password 
Improve JS password generating
 2016-01-26 12:05:25 +11:00
Madhura Jayaratne
c8615de52a Merge pull request #7 from phpmyadmin/iis-escape 
Escape javascript variable content
 2016-01-26 11:53:51 +11:00
Madhura Jayaratne
8aa28962f1 Merge pull request #6 from phpmyadmin/json-header 
Set correct content type for JSON responses
 2016-01-26 10:57:12 +11:00
Madhura Jayaratne
3bb784045b Merge pull request #4 from phpmyadmin/random 
Improve token generation
 2016-01-26 10:32:51 +11:00
Michal Čihař
912856b432 Use full alphabet to generate random passwords 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:44:16 +01:00
Michal Čihař
8dedcc1a17 Use secure RNG if available 
Recent browsers come with better RNG, so let's use it for generating
password instead of Math.random if available.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:43:03 +01:00
Michal Čihař
671d618304 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-25 12:23:23 +01:00
Michal Čihař
aca42efa01 Escape javascript variable content 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:21:48 +01:00
Weblate
3aba9bc6c1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-25 12:19:49 +01:00
Daniel Iltanen
cd90c6ed13 Translated using Weblate (Finnish) 
Currently translated at 67.5% (2168 of 3210 strings)

[CI skip]
 2016-01-25 12:19:48 +01:00
Michal Čihař
1e6da495e1 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-25 12:18:42 +01:00
Michal Čihař
316792bf4a Move databse check to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:18:37 +01:00
Weblate
da29e3ba2b Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-25 08:38:55 +01:00
Burak Yavuz
a8a9fa9032 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Arturs Nikolajevs
25bcee4035 Translated using Weblate (Latvian) 
Currently translated at 19.0% (611 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Adam Magnier
975e87d392 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:53 +01:00
Michal Čihař
c048a519d4 Merge branch 'MAINT_4_4_15' into QA_4_5 2016-01-25 08:38:36 +01:00
Michal Čihař
78cea78ab7 Backport safety checks on version check 
Backported from master/QA_4_5

Issue #11713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 08:36:19 +01:00
Weblate
b51a55d6e5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 15:27:51 +01:00
Masahiro Nishi
ac9b89b7af Translated using Weblate (Japanese) 
Currently translated at 67.6% (2170 of 3210 strings)

[CI skip]
 2016-01-22 15:27:50 +01:00
Michal Čihař
3d61936b8b Translated using Weblate (Czech) 
Currently translated at 95.8% (3077 of 3210 strings)

[CI skip]
 2016-01-22 15:27:49 +01:00
Michal Čihař
655de3d994 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-22 15:27:22 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:27:15 +01:00
Michal Čihař
0a7fc9770e Remove trailing space from a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:19:11 +01:00
Michal Čihař
3307d1b5f7 Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
 2016-01-22 10:18:57 +01:00
Weblate
fdb4cd81e2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 09:44:08 +01:00
Martin Lacina
38e511dc47 Translated using Weblate (Slovak) 
Currently translated at 84.1% (2701 of 3210 strings)

[CI skip]
 2016-01-22 09:44:07 +01:00