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

105208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
e04585df5b Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-08 16:04:31 +11:00
Madhura Jayaratne
ff743830ff Fix #12073 Hide edit and delete buttons when the results are not related to a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-08 16:02:05 +11:00
Michal Čihař
f76ddbe7ab Update SQL parser to ad0e75faa6f6943d013f23d0d1ca31b4781e7b79 
- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT

Fixes #12041

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:50:21 +01:00
Michal Čihař
fe4a3e8727 Fixed processing of queries with escaped quotes 
Imported SQL parser d2e37de1dbec251556f35712bddcd61d24baaee6

Fixes #12054

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:04:00 +01:00
Isaac Bennetch
5125fc3bc0 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-03-01 14:43:17 -05:00
Michal Čihař
9eee3353a6 Merge branch 'QA_4_5' into QA_4_6 2016-03-01 15:43:18 +01:00
Michal Čihař
12bf06e016 Add changelog for issue #12055 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:41:19 +01:00
Michal Čihař
02aa0729dc Make PMA_fatalError work even early 
The messaging framework can not make assumptions about available objects
as this doesn't have to be satisfied in early PMA_fatalError case.

Issue #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:36:05 +01:00
Michal Čihař
a6b3a9ce51 Fix error when we can not generate random string 
Fixes #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:35:53 +01:00
Isaac Bennetch
0fc00c0ab8 4.6.0-rc2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:32:07 -05:00
Isaac Bennetch
ebaeaf9a5b 4.5.5.1 release date in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:30:30 -05:00
Michal Čihař
8eee22be3a Lint templates as well 
This will help us spotting syntax errors even in files which are not
covered by tests.

Fixes #12055

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:48 +01:00
Michal Čihař
35becb00ee Fix duplicate function call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:06 +01:00
Michal Čihař
ed5a8307c7 Fix wrong merge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:00:54 +01:00
Weblate
d280e53aaa Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-29 21:36:45 +01:00
Kenzo Martins Matuzawa
8563303004 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.2% (2963 of 3211 strings)

[CI skip]
 2016-02-29 21:36:44 +01:00
Isaac Bennetch
73fd0dc2a8 4.6.0-rc1 pre-release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:56:32 -05:00
Michal Čihař
ed17d3c450 Merge branch 'QA_4_6' into QA_4_6-security 2016-02-29 19:06:23 +01:00
Isaac Bennetch
51a0d2f25a 4.5.5.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:45:21 -05:00
Michal Čihař
2ebabd11fd Merge branch 'QA_4_5' into QA_4_6 2016-02-29 12:13:45 +01:00
Michal Čihař
3c583b86d4 Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security 2016-02-29 12:13:02 +01:00
Michal Čihař
88e0944cfd Honor vendor configuration for gettext inclusion 
Fixes #12048

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 12:12:34 +01:00
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
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
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
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
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ř
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