Commit Graph

114314 Commits

Author SHA1 Message Date
Madhura Jayaratne
ab870bc55f Fix stored XSS in central columns. Thanks to Ashish Kamble for reporting the vulnerability
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-17 23:19:31 +11:00
Madhura Jayaratne
abb690e536 Escape SQL query in copy query functionality. Thanks to Ashish Kamble for reporting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-14 23:23:55 +11:00
Maurício Meneghini Fauth
e27379dee2 Allow failure for OSX on Travis CI
OSX builds are constantly failing. It seems to be a Travis issue.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-13 18:30:32 -02:00
Maurício Meneghini Fauth
5bc4ad64b6 Fix Bootstrap unmet peer dependency on popper.js
Fixes #14779

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-13 18:07:55 -02:00
Maurício Meneghini Fauth
c7ce5e25fd
Merge pull request #14765 from mauriciofauth/bootstrap
Add initial support for Bootstrap 4
2018-12-12 21:48:40 -02:00
Maurício Meneghini Fauth
2dc9f4c1d9 Add initial support for Bootstrap 4
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:46:42 -02:00
Maurício Meneghini Fauth
129086398f Remove unnecessary superglobals declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:17:06 -02:00
Maurício Meneghini Fauth
76d8bfdafa Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:04:19 -02:00
Isaac Bennetch
f5c7c3d58d Slight improvement to release documentation
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-11 09:39:15 -05:00
Isaac Bennetch
09c188497e Prepare for 4.8.5-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-11 09:23:27 -05:00
Isaac Bennetch
a5f6178900 Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-10 21:07:06 -05:00
Isaac Bennetch
56ba19808f Adding composer lock for 4.8.4
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-10 21:03:41 -05:00
Isaac Bennetch
bd0383ee71 Prepare for version 4.8.4
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-10 14:49:35 -05:00
Isaac Bennetch
01c0c9f852 ChangeLog for security issues PMASA-2018-6, PMASA-2018-7, and PMASA-2018-08
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-10 14:46:18 -05:00
Madhura Jayaratne
752d544805
Merge pull request #262 from phpmyadmin/bug260
Fix #260 Stored Cross-Site Scripting (XSS) in navigation tree
2018-12-08 10:45:03 +11:00
Madhura Jayaratne
048670f1a5 Merge branch 'QA_4_8' into QA_4_8-security 2018-12-07 16:33:18 +11:00
Eddie Chang
b293ff5f23 Fix https://github.com/phpmyadmin/phpmyadmin-security/issues/260 Stored Cross-Site Scripting (XSS) in navigation tree
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-07 16:28:48 +11:00
Maurício Meneghini Fauth
2fc8bb133a Merge branch 'QA_4_8' 2018-12-04 17:47:23 -02:00
Maurício Meneghini Fauth
d9e17d0316 Archive 2017 ChangeLog entries to the history repository
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-04 17:45:55 -02:00
Maurício Meneghini Fauth
0764ecb0f3 Move resourses to phpmyadmin/data
2dd22f8956

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-04 17:01:01 -02:00
Madhura Jayaratne
d4ed31339a
Merge pull request #257 from phpmyadmin/bug-245
Fix #245 Remove transformation plugin includes
2018-12-04 19:55:29 +11:00
Madhura Jayaratne
7fe8b4c39c
Merge pull request #253 from phpmyadmin/request_to_post 2018-12-04 19:27:05 +11:00
Madhura Jayaratne
e7f1e2697a Retrieve parameters from $_POST in server variables 2018-12-04 19:08:16 +11:00
William Desportes
61b98cf9cc
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-02 02:04:56 +01:00
William Desportes
6858635d60
Add ChangeLog entry for #14764
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-01 22:22:20 +01:00
William Desportes
b5372b840c
Fix #14764 - left/right icons hidden
Closes: #14764

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-01 22:20:57 +01:00
William Desportes
69fb1d0237
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 23:50:56 +01:00
William Desportes
41e10d1c53
Add ChangeLog entry for #14352
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 23:48:56 +01:00
William Desportes
9885df31fc
Merge pull request #14760 from williamdes/issue-14352-designer-php-error
Fix #14352 - JavaScript errors with Designer

Closes: #14352
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 23:46:23 +01:00
William Desportes
cc2b1c8b99
Fix #14352 - JavaScript errors with Designer
Closes: #14352

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-30 11:29:31 +01:00
William Desportes
003da01c61
Merge branch 'QA_4_8'
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 21:22:39 +01:00
Michael Keck
25d20cde94 Add SVG Icons and Logos (#14318)
Signed-off-by: Michael Keck <github@michaelkeck.de>
2018-11-29 18:17:34 -02:00
William Desportes
8027a762b5
Merge pull request #14759 from williamdes/fix/scrutinizer-bugs
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 20:39:30 +01:00
William Desportes
84e99092ee
Add ChangeLog entry for #14617 and #13032
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 20:28:01 +01:00
William Desportes
3f8305f10b
Merge pull request #14753 from williamdes/fix/designer-13032-QA_4_8
Fixes designer errors when database is empty.
Fixes designer errors when database contains special chars.

Closes: #13032
Closes: #14744
Closes: #14617

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 20:23:35 +01:00
William Desportes
18c23df20f
Issue #13032 - fix designer on QA_4_8
Used cherry-pick : Merge pull request #14376 from williamdes/issue-13032-designer

Cherry-picked-from: cb2dae58be

Issue #13032 - fix designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 20:19:02 +01:00
William Desportes
4a7ab3a1cb
Merge pull request #14750 from williamdes/type-error-routine-definition
Fix #14749 - Uncaught TypeError in routines

Closes: #14749
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 19:49:12 +01:00
William Desportes
f0b51c144f
Remove unused code in tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-29 19:15:41 +01:00
Kurt Eilertsen
8b106a44f9
Translated using Weblate (Norwegian Bokmål)
Currently translated at 60.7% (2002 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/nb_NO/
Signed-off-by: Kurt Eilertsen <kurt@kheds.com>
2018-11-29 06:08:58 +01:00
Walter Cheuk
7d843bccd1
Translated using Weblate (Chinese (Traditional))
Currently translated at 98.5% (3248 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
2018-11-29 06:08:46 +01:00
Maurício Meneghini Fauth
81f58880bd Add ChangeLog entry for #14053
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-28 20:54:48 -02:00
Mohammad Reza Mansouri
95167e6893 Fix missed padding on query results (#14730)
Solves missed paddings on query results.

Fixes #14053 

Signed-off-by: Mohammad Reza Mansouri <beekalam@gmail.com>
2018-11-28 20:52:36 -02:00
Maurício Meneghini Fauth
be7464b60e Remove duplicate explicit target name in doc/setup
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-28 16:03:22 -02:00
Walter Cheuk
a4d68653c0
Translated using Weblate (Chinese (Traditional))
Currently translated at 98.3% (3251 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
2018-11-28 12:12:52 +01:00
Hosted Weblate
21dc07c656
Merge branch 'origin/master' into Weblate 2018-11-28 02:56:57 +01:00
Kurt Eilertsen
4672620ebf
Translated using Weblate (Norwegian Bokmål)
Currently translated at 60.6% (2003 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nb_NO/
Signed-off-by: Kurt Eilertsen <kurt@kheds.com>
2018-11-28 02:56:55 +01:00
Isaac Bennetch
c51a3bab63
Merge pull request #14754 from ibennetch/gitdoc
Update requirements and improve documentation when installing from Git source
2018-11-27 19:56:42 -06:00
Isaac Bennetch
8ffa4838a6 Update requirements and improve documentation when installing from Git source
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-11-27 20:18:32 -05:00
Maurício Meneghini Fauth
6a1ba61e29 Remove transformation plugin includes
Tranformation plugins should be loaded by the autoloader.

Fixes https://github.com/phpmyadmin/phpmyadmin-security/issues/245

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-27 18:44:30 -02:00
William Desportes
ca072c96d9
fix #14749 - Uncaught TypeError in routines
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-27 11:57:38 +01:00