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

106471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
1412fc14d1 Merge branch 'master' into master-security 2016-07-12 10:47:15 +02:00
Michal Čihař
a6eaffe11c Use https URL for tcpdf 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:46:55 +02:00
Michal Čihař
bd472d5144 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:43:29 +02:00
Michal Čihař
36ba6d9aba Merge branch 'master' into master-security 2016-07-12 10:43:10 +02:00
Michal Čihař
e3cf00b122 Merge branch 'QA_4_6' 2016-07-12 10:43:04 +02:00
Michal Čihař
2090eb57aa Merge branch 'QA_4_6' into QA_4_6-security 2016-07-12 10:42:47 +02:00
Michal Čihař
c0450b2915 Remove allowed failures test from maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:42:41 +02:00
Michal Čihař
27b8005fa0 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:38:34 +02:00
Michal Čihař
8b5cafc9f3 Fix wrong merge resolution 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:38:25 +02:00
Michal Čihař
3434c70a51 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:38:08 +02:00
Michal Čihař
0bf21ebf72 Use whitelist rather than blacklist for URL filtering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:37:25 +02:00
Michal Čihař
a499487974 Merge branch 'master' into master-security 2016-07-12 10:33:42 +02:00
Michal Čihař
5873af7d75 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-12 10:32:52 +02:00
Michal Čihař
0ce8cd7919 Merge branch 'QA_4_6' 2016-07-12 10:28:28 +02:00
Michal Čihař
11e772c46d Merge remote-tracking branch 'origin/QA_4_6' 2016-07-12 10:28:25 +02:00
Michal Čihař
b8b1bdd77e Include X-Robots-Tag header in responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:28:03 +02:00
José Camilo Fernandes Coelho
19dee09c3f Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1722 of 3208 strings)

[CI skip]
 2016-07-12 10:26:16 +02:00
José Camilo Fernandes Coelho
f28925adb0 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1731 of 3209 strings)

[CI skip]
 2016-07-12 10:25:53 +02:00
Madhura Jayaratne
cbba4f4fdb Fix XSS in server_replication.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-07-12 11:49:53 +10:00
Madhura Jayaratne
cc7d01daa7 Fix XSS in tbl_gis_visualization.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-07-12 11:27:36 +10:00
Saulo Castro
64b1f13200 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2997 of 3209 strings)

[CI skip]
 2016-07-11 18:45:29 +02:00
Saulo Castro
8c1c013abf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2988 of 3208 strings)

[CI skip]
 2016-07-11 18:45:23 +02:00
Michal Čihař
152386627a Merge branch 'QA_4_6-security' into master-security 2016-07-11 09:34:05 +02:00
Michal Čihař
660e3a177f Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 09:33:13 +02:00
Michal Čihař
de3181277e Include only relative path in backtrace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 09:18:19 +02:00
Michal Čihař
0f23cac353 Merge branch 'QA_4_6-security' into master-security 2016-07-11 09:04:25 +02:00
Michal Čihař
fc6ef261eb Remove Swekey support 
It is buggy and their servers are no longer working.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 09:02:58 +02:00
Michal Čihař
2b59fa3bf9 Use PMA_getIp instead of REMOTE_ADDR to get user address 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:38:16 +02:00
Michal Čihař
23c011df36 Move PMA_getIp to core 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:36:55 +02:00
Michal Čihař
08864ebc8c Remove not needed include 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:36:04 +02:00
Michal Čihař
8f93d41d64 Merge branch 'QA_4_6-security' into master-security 2016-07-11 08:33:45 +02:00
Michal Čihař
6aacd7dcfe Make proxy IP parsing aware of multiple proxies 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:22:58 +02:00
Isaac Bennetch
c4a595357f Add Secure and HttpOnly flags for session cookie setup in examples 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-07-10 22:35:38 -04:00
Michal Čihař
1ed4007689 Properly escape MySQL status variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-10 18:07:59 +02:00
Phongphan A Bunlom
394f77dc70 Translated using Weblate (Thai) 
Currently translated at 30.7% (986 of 3209 strings)

[CI skip]
 2016-07-09 18:45:52 +02:00
Phongphan A Bunlom
7f6378605f Translated using Weblate (Thai) 
Currently translated at 30.4% (977 of 3208 strings)

[CI skip]
 2016-07-09 18:45:47 +02:00
Michal Čihař
57dd8e6f99 Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-09 09:14:26 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
c0b2d56ac0 Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-09 09:12:43 +02:00
Michal Čihař
a97be3a604 Improve cookie encryption 
- use MAC to validate content before decryption
- create unique IV for every cookie

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-08 17:40:05 +02:00
Franco
68f10806ce Translated using Weblate (Spanish) 
Currently translated at 99.6% (3198 of 3209 strings)

[CI skip]
 2016-07-05 18:45:55 +02:00
Franco
6676433916 Translated using Weblate (Spanish) 
Currently translated at 99.2% (3185 of 3208 strings)

[CI skip]
 2016-07-05 18:45:50 +02:00
Adrien Bertrand
c69b585b82 Translated using Weblate (French) 
Currently translated at 99.7% (3199 of 3208 strings)

[CI skip]
 2016-07-05 18:44:39 +02:00
Arben Çokaj
a879cd8b77 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-07-03 03:44:09 +02:00
Arben Çokaj
b0f65c7420 Translated using Weblate (Albanian) 
Currently translated at 99.6% (3196 of 3208 strings)

[CI skip]
 2016-07-03 03:44:04 +02:00
Bartosz Pazoła
c7fc778fad Translated using Weblate (Polish) 
Currently translated at 82.6% (2652 of 3209 strings)

[CI skip]
 2016-07-02 12:45:16 +02:00
Bartosz Pazoła
92de4ded9b Translated using Weblate (Polish) 
Currently translated at 82.3% (2641 of 3208 strings)

[CI skip]
 2016-07-02 12:45:12 +02:00
Kyeong Su Shin
997a7bb793 Translated using Weblate (Korean) 
Currently translated at 78.1% (2508 of 3209 strings)

[CI skip]
 2016-07-01 00:44:56 +02:00
Kyeong Su Shin
2f290d0d91 Translated using Weblate (Korean) 
Currently translated at 77.8% (2497 of 3208 strings)

[CI skip]
 2016-07-01 00:44:52 +02:00
Michal Čihař
7de139b90c Properly escape generated XML export 
Many fields could contain XML markup, so we need to ensure the generated
XML is valid.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:54:05 +02:00