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

106400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Michal Čihař
2925d6468b Merge pull request #29 from phpmyadmin/escape 
A better way of escaping
 2016-02-29 10:32:56 +01:00
Atul Pratap Singh
027d5d963a Merge pull request #12022 from 007durgesh219/Issue#12007 
Templating Console.php, Issue#12007
 2016-02-29 12:50:59 +05:30
Durgesh
3c56e4b9af Templating Console.php, Issue #12007 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-29 12:24:02 +05:30
Atul Pratap Singh
4d09f855bb Rename some templates, formatting changes 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-29 12:03:47 +05:30
Atul Pratap Singh
386cbc8f6c Merge pull request #12009 from poush/fix_#12005 
Templating toggleButton() and getDivForSliderEffect() (Fix #12005)
 2016-02-29 10:21:45 +05:30
Madhura Jayaratne
41c4e0214c Fix XSS in zoom search 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 12:26:44 +11:00
Madhura Jayaratne
4650ad7fbd A better way of escaping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 12:14:46 +11:00
Madhura Jayaratne
cc55f44a4a Fix XSS in Central columns page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 11:12:07 +11:00
Madhura Jayaratne
ab1283e836 Fix XSS in User accounts page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 11:08:38 +11:00
Nisarg Jhaveri
bf6349212f Fix example in test/README.rst 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2016-02-28 17:30:01 +05:30
Madhura Jayaratne
bcd4ce8cba Fix XSS in normalization.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-27 09:56:12 +11:00
Madhura Jayaratne
d799a9a997 Merge branch 'QA_4_6' 2016-02-26 13:28:43 +11:00
Weblate
19c7a069c7 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-26 03:28:05 +01:00
Ray Santos
19308231b3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.2% (2962 of 3211 strings)

[CI skip]
 2016-02-26 03:28:05 +01:00
Andre Evertz
f825abc8a7 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-26 13:26:35 +11:00
Weblate
78be1555c0 Merge remote-tracking branch 'origin/master' 2016-02-26 03:21:47 +01:00
Ray Santos
7adf86472e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.8% (2953 of 3214 strings)

[CI skip]
 2016-02-26 03:21:46 +01:00
Madhura Jayaratne
4fb120f78d Merge pull request #12036 from KeldorDE/percona_server 
Fix for wrong mysql_upgrade message on Users tab with Percona Server 5.7
 2016-02-26 13:21:40 +11:00
Andre Evertz
10e9a91c12 Fix for wrong mysql_upgrade message on Users tab with Percona Server >= 5.7 
Signed-off-by: Andre Evertz <andre.evertz@devil-coding.de>
 2016-02-25 23:35:11 +01:00
Chintan Zaveri
6735f33297 Icons added and code changed to display icons 
Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>

icons added:wq
 2016-02-25 18:56:24 +05:30
Michal Čihař
1d99372688 Add extension dependencies to composer.json 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 14:16:19 +01:00
Michal Čihař
9bce7dafaf Add changes for security issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 13:34:02 +01:00
Madhura Jayaratne
37c34d089a Escape selectors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-25 13:09:32 +01:00
Madhura Jayaratne
f33a42f1da Fix XSS in normalization.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-25 13:08:43 +01:00
Michal Čihař
b3d36dc836 Merge pull request #23 from phpmyadmin/ssl-cert 
Bring back SSL certificate validation
 2016-02-25 13:03:30 +01:00
Michal Čihař
c842a0de92 Use correct headers for json data 
It was previously not marked as such what could potentially lead to
browsers doing some autodetection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:33:56 +01:00
Michal Čihař
e65f375918 Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security 2016-02-25 12:31:50 +01:00
Michal Čihař
0d3cac9e04 Merge branch 'QA_4_6' 2016-02-25 12:31:13 +01:00
Michal Čihař
33f0b947db Merge branch 'QA_4_5' into QA_4_6 2016-02-25 12:30:42 +01:00
Michal Čihař
1297747a65 Fixed incorrect usage of SQL parser context in SQL export 
Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:29:34 +01:00
Michal Čihař
57607e062b Add changelog for SQL parser update 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:28:24 +01:00
Michal Čihař
5fb33a7af4 Merge commit '2b1a68cc4eb935ef3df5c7401d0d1338df09bc72' into MAINT_4_5_5 2016-02-25 12:25:07 +01:00
Madhura Jayaratne
746240bd13 Fix XSS in normalization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-25 12:19:26 +01:00
Michal Čihař
38fa119104 Urlencode hostname 
This can come from the HTTP header, so we need to be sure to sanitize
it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:09:56 +01:00
Michal Čihař
983faa94f1 Fix XSS in database structure page 
Forward ported commit 90df124797

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 11:30:14 +01:00
Michal Čihař
e42b7e3aed Bring back SSL certificate validation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 11:08:44 +01:00
Michal Čihař
16a6a02fca Avoid skipping the SSL certificate check in TCPDF 
This code is never used in phpMyAdmin, but we fix it just to avoid
potential security reports.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 10:34:01 +01:00
Michal Čihař
7877a9c008 Escape SQL query for inline editing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 09:14:32 +01:00
Michal Čihař
3a6a9a807d Escape query when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 09:06:52 +01:00
Michal Čihař
9702259f81 Merge remote-tracking branch 'security/MAINT_4_5_4-security' into MAINT_4_5_5 2016-02-25 08:55:45 +01:00
Michal Čihař
67c5514e65 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-02-25 08:53:52 +01:00
Piyush Agrawal
2e64aec16e Templating toggleButton() and getDivForSliderEffect() 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2016-02-25 10:42:33 +05:30
Atul Pratap Singh
ec38e05267 Merge pull request #12003 from ujjwalwahi/issue_11991 
Refactor TableSearchController
 2016-02-25 04:38:25 +05:30
Atul Pratap Singh
0370f382c2 Merge pull request #12008 from 007durgesh219/Issue#12004 
Templating getWithSelected() and getCheckbox(), Issue #12004
 2016-02-25 04:21:24 +05:30
Dan Ungureanu
70e326deb9 Added changelog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:56:33 +02:00
Dan Ungureanu
90605cc9a8 Merge branch 'QA_4_5' into QA_4_6 2016-02-24 20:48:14 +02:00
Dan Ungureanu
2b1a68cc4e Updates sql-parser to phpmyadmin/sql-parser@5c489d91f5 (v3.4.0). 
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser.
Fixes #11982. Row count wrong when grouping joined tables.
Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty.
Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-24 20:41:54 +02:00
Michal Čihař
132dcfc1de Merge branch 'QA_4_6' 2016-02-24 14:46:40 +01:00
Michal Čihař
0f525e3ae4 Document how we ship embedded PHP libraries now. 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:46:06 +01:00