Commit Graph

115726 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
1b9ce90aa8 Merge branch 'QA_4_9'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-04 15:51:11 -03:00
Maurício Meneghini Fauth
06ee362fbf Change branch-alias to 4.9.x-dev in composer.json
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-04 15:49:10 -03:00
Isaac Bennetch
465005fe75 Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 12:23:26 -04:00
Isaac Bennetch
e7b73831e5 Prepare for version 4.9.1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 12:21:25 -04:00
Isaac Bennetch
a5f19ea80d Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 12:08:48 -04:00
Isaac Bennetch
c60a750764 Adding composer lock for 4.9.0.1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 12:06:12 -04:00
Isaac Bennetch
004848d93f Prepare version 4.9.0.1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 12:05:18 -04:00
Isaac Bennetch
7cb6e69186 Merge remote-tracking branch 'security/security/designer/save-page' into QA_4_8 2019-06-04 12:03:17 -04:00
Isaac Bennetch
e73c92d92d Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 11:47:25 -04:00
Isaac Bennetch
712e4a2d98 Prepare for 4.9.1-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 11:34:38 -04:00
Isaac Bennetch
114bc0f0bf Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 11:29:32 -04:00
Isaac Bennetch
4ab33481be Adding composer lock for 4.9.0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 11:27:19 -04:00
Isaac Bennetch
10a2b2e01f Make themes compatible with 4.9
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 11:19:49 -04:00
Isaac Bennetch
519c32bc08 Prepare for release 4.9.0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 10:45:01 -04:00
Isaac Bennetch
5fba017127 ChangeLog for security issues
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-04 10:43:07 -04:00
Isaac Bennetch
8108eb7ded Merge remote-tracking branch 'security/QA_4_8-security' into QA_4_8 2019-06-04 10:41:26 -04:00
Isaac Bennetch
4b5e04d0a1
Merge pull request #277 from phpmyadmin/security/issue-276
Fix CSRF Vulnerability in login form
2019-06-04 10:31:16 -04:00
Isaac Bennetch
034538e0c6 Update FAQ 4.8 to reflect removing pma_username and pma_password due to the security flaw reported in PMASA-2019-4
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-03 21:43:21 -04:00
Maurício Meneghini Fauth
6af66cf763 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-03 20:18:12 -03:00
Maurício Meneghini Fauth
914212f617 Update sql-parser to version 4.3.2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-03 20:16:04 -03:00
William Desportes
96fc4d45af
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-03 21:29:07 +02:00
William Desportes
3a48b985f7
Add ChangeLog entry for #10846
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-03 21:03:09 +02:00
William Desportes
69e08d8503
Fix #10846 - TypeError: Cannot read property 'substring' of undefined
Fixes: #10846
Pull-request: #15284
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-03 21:00:31 +02:00
Maurício Meneghini Fauth
b1f6c422e8 Fix undefined variables in js/designer/ files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-02 18:09:07 -03:00
Maurício Meneghini Fauth
1510ddcb67 Move Setup JavaScript files to js/setup/ directory
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-02 17:39:44 -03:00
Maurício Meneghini Fauth
e20601571b Fix ESLint errors in setup/scripts.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-02 17:39:44 -03:00
Joshua PowellNishiyama
159e60c741
Translated using Weblate (Japanese)
Currently translated at 99.9% (3320 of 3321 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
2019-06-02 22:29:46 +02:00
Alexander Anzorena
812ad24b1c
Translated using Weblate (Spanish)
Currently translated at 98.3% (3265 of 3321 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/es/
Signed-off-by: Alexander Anzorena <linkana2016@gmail.com>
2019-06-02 22:11:39 +02:00
suhaibsliman
6b3601bf0c
Translated using Weblate (Sorani)
Currently translated at 29.8% (988 of 3321 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ckb/
Signed-off-by: suhaibsliman <swhaebs@gmail.com>
2019-06-02 22:04:23 +02:00
Maurício Meneghini Fauth
4d865da783 Fix undeclared variables in some JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-02 16:21:36 -03:00
Maurício Meneghini Fauth
015c404038 Retrieve parameters from $_POST in AuthenticationCookie plugin
Retrieves pma_username and pma_password parameters from $_POST instead of $_REQUEST

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-01 15:50:33 -03:00
Maurício Meneghini Fauth
01e59cf1c9 Add ChangeLog entry for #15266
External dependency injection system

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-01 15:18:30 -03:00
Hugues Peccatte
9abd308837 Inject dependencies (#15271)
Inject dependencies instead of building them.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-06-01 15:13:41 -03:00
Maurício Meneghini Fauth
c8dd8660a0 Replace jQuery .bind() with .on()
As of jQuery 3.0, .bind() has been deprecated.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 14:46:23 -03:00
Maurício Meneghini Fauth
3dbbd279af Upgrade CodeMirror to version 5.47.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 14:03:11 -03:00
Maurício Meneghini Fauth
e4ef61c760 Upgrade jQuery to version 3.4.1
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 13:56:58 -03:00
Maurício Meneghini Fauth
7a3064f1f0 Upgrade Sass and Stylelint
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 13:50:58 -03:00
Maurício Meneghini Fauth
e29fae4b31 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 13:33:45 -03:00
Maurício Meneghini Fauth
7923567d5b Add ChangeLog entry for #15079
Responsive behaviour of instruction dialog box

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-31 13:30:37 -03:00
Apoorv Khare
499f552794 Fixes #15079 Responsive behaviour of instruction dialog box (#15089)
Signed-off-by: Apoorv Khare <apoorvkhare007@gmail.com>
2019-05-31 13:24:22 -03:00
Eugene Kazakov
9edcc5e43a Bug #10846 TypeError: Cannot read property 'substring' of undefined
Signed-off-by: Eugene Kazakov <ekazakov@plesk.com>
2019-05-31 18:21:30 +02:00
Maurício Meneghini Fauth
db3a59b6f1 Fix undefined variables in some JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 23:14:25 -03:00
Maurício Meneghini Fauth
17facf6603 Remove unreachable code in js/functions.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 18:15:00 -03:00
Maurício Meneghini Fauth
44c93c03a6 Fix ESLint errors
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 17:48:46 -03:00
Maurício Meneghini Fauth
dfd49d16b8 Fix ESLint warnings in js/functions.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 17:30:16 -03:00
Maurício Meneghini Fauth
9ad59dc272 Fix ESLint warnings in js/console.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 16:59:16 -03:00
Maurício Meneghini Fauth
6ed803588a Fix ESLint warnings in js/ajax.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 02:00:51 -03:00
Maurício Meneghini Fauth
4fc95582bf Rename JS variables to camel case in some files
- js/cross_framing_protection.js
- js/db_central_columns.js
- js/db_operations.js
- js/db_search.js

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 01:25:23 -03:00
Maurício Meneghini Fauth
bc74213a7d Rename error_report.js variables to camel case
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 01:19:01 -03:00
Maurício Meneghini Fauth
fe40a5d06d Rename db_multi_table_query.js vars to use camel case
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-30 00:58:32 -03:00