gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,534 Commits 12 Branches 481 Tags 2.4 GiB
3ca72e9c73
Commit Graph

106534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
3ca72e9c73 Merge branch 'QA_4_6-security' into master-security 2016-07-18 15:56:58 +02:00
Michal Čihař
7913196d21 Merge branch 'master' into master-security 2016-07-18 15:56:50 +02:00
Michal Čihař
3a4172525f Merge branch 'QA_4_6' into QA_4_6-security 2016-07-18 15:56:38 +02:00
Michal Čihař
c1c7fb794b Merge branch 'QA_4_6' 2016-07-18 15:56:27 +02:00
Michal Čihař
1e1d0ed069 Merge remote-tracking branch 'origin/QA_4_6' 2016-07-18 15:55:37 +02:00
Michal Čihař
ff9291964c Update TCPDF to 6.2.12 
Changelog:

6.2.12 (2015-09-12)
	- fix composer package name to tecnickcom/tcpdf

6.2.11 (2015-08-02)
	- "PNG regression in 6.2.9 (they appear as their alpha channel)" was fixed.
	- "Encoded SRC URLs in <img> tags don't work anymore" was fixed.

6.2.10 (2015-07-28)
	- Minor mod to PNG parsing.
	- Make dependency on mcrypt optional.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 15:54:39 +02:00
Michal Čihař
d35c3d9ed5 Update ReCaptcha library to 1.1.2 
There should be no functional changes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 15:51:44 +02:00
‫حمودي الجيلاني‬‎
0f1d629043 Translated using Weblate (Arabic) 
Currently translated at 34.2% (1098 of 3209 strings)

[CI skip]
 2016-07-16 18:44:09 +02:00
‫حمودي الجيلاني‬‎
14e55164a9 Translated using Weblate (Arabic) 
Currently translated at 34.0% (1092 of 3208 strings)

[CI skip]
 2016-07-16 18:44:06 +02:00
Michal Čihař
aa3c3452d4 Skip anchors verification for now 
Skip until new Sphinx will be released as it better handles HTTP thanks
to requests library.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-14 09:24:52 +02:00
Michal Čihař
f0100b81ec Merge branch 'QA_4_6-security' into master-security 2016-07-13 12:17:21 +02:00
Michal Čihař
205694982b Fix exporting multiline comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:16:50 +02:00
Michal Čihař
af8385dc87 Fix tests for transformations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:16:45 +02:00
Michal Čihař
7b3dc673d2 Fix exporting multiline comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:12:26 +02:00
Michal Čihař
97ff98bc62 Fix tests for transformations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:12:10 +02:00
Michal Čihař
52978a57ad Merge branch 'QA_4_6-security' into master-security 2016-07-13 11:33:53 +02:00
Michal Čihař
42c868b691 HML encode embedded JSON data 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 11:33:35 +02:00
Michal Čihař
a7333d7cc7 Merge branch 'QA_4_6-security' into master-security 2016-07-13 11:12:48 +02:00
Michal Čihař
987cce0bcf Properly escape foreign key selection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 11:10:44 +02:00
Michal Čihař
e4be768781 Ensure widht and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:55:07 +02:00
Michal Čihař
dc899d8e75 Ensure widht and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:52:28 +02:00
Michal Čihař
c3310536b2 Ensure widht and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:49:47 +02:00
Michal Čihař
cc6853538c Properly escape error input in the message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:46:14 +02:00
Michal Čihař
9f11a0e811 Add missing escaping in user group queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:40:13 +02:00
Michal Čihař
f0ad030460 Merge branch 'QA_4_6-security' into master-security 2016-07-13 10:34:31 +02:00
Michal Čihař
c3a3531b61 Escape HTML markup in transformation wrapper 
...in case content type is html.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:32:55 +02:00
Michal Čihař
9e3492730e Do not use empty MIME type 
This will turn on content sniffing in browser leading to unwanted
results.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:28:38 +02:00
Michal Čihař
7e510e8e92 Properly escape partition removal query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:21:24 +02:00
Michal Čihař
dc52930bba Properly handle newlines in SQL comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:59:39 +02:00
Michal Čihař
6b9197d7df Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:49:06 +02:00
Michal Čihař
dd732134f2 Do not try to create non existing classes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:47:09 +02:00
Michal Čihař
ceeef53748 Add missing escaping to the export type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:43:07 +02:00
Michal Čihař
71ccd06aa9 Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:38:56 +02:00
Michal Čihař
dee23704ee Merge branch 'master' into master-security 2016-07-13 09:38:52 +02:00
Michal Čihař
551031da09 Validate image scaling dimensions 
Ensure we pass only integers and they are not too big.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:38:33 +02:00
Michal Čihař
0966c7f105 Link to github issue tracker rather than old sf.net one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 08:25:19 +02:00
Michal Čihař
e9d5efd69d Merge branch 'QA_4_6-security' into master-security 2016-07-12 22:24:19 +02:00
Michal Čihař
1290f9895b Fix merge error in po file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 20:33:54 +02:00
Michal Čihař
24246115f5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 17:43:52 +02:00
Michal Čihař
7ef96c5cdc Correctly escape MySQL username in queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 17:42:45 +02:00
Michal Čihař
c2ca1c8c22 Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:58:46 +02:00
Michal Čihař
80b03a4f16 Ensure page number is integer 
Even if somebody decides to change configuration storage structure.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:57:35 +02:00
Michal Čihař
bde4ef735b Escape suggested database name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:42:50 +02:00
Michal Čihař
dfa389aa5a Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:29:26 +02:00
Michal Čihař
ba072e42dc Validate serialized data before unserializing 
We need only strings, integers or arrays, so there is no need to
unserialize strings containing any complex types.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:29:11 +02:00
Michal Čihař
5299b36983 Merge branch 'QA_4_6-security' into master-security 2016-07-12 15:15:15 +02:00
Michal Čihař
767195e197 Sanitize MySQL host name before connecting 
It can contain p: prefix which we don't want to honor.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 15:14:57 +02:00
Michal Čihař
3d628c7fa5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 14:41:02 +02:00
Michal Čihař
e749214b16 Prefer curl over file_get_contents 
Curl is better in SSL certificate verification.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 14:39:03 +02:00
Michal Čihař
f00b258749 Merge branch 'QA_4_6-security' into master-security 2016-07-12 14:16:11 +02:00