Commit Graph

115750 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
f51806bcfa Merge branch 'QA_4_9'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-08 15:24:21 -03:00
Maurício Meneghini Fauth
338cfb31cc Add ChangeLog entry for #15313
Add support for Twig 2

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-08 15:22:03 -03:00
Maurício Meneghini Fauth
665e385fac
Merge pull request #15313 from mauriciofauth/twig2-4.9
Add support for Twig 2
2019-06-08 15:20:42 -03:00
Maurício Meneghini Fauth
3f0ef0f288 Add support for Twig 2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-08 14:40:27 -03:00
Maurício Meneghini Fauth
efe77cdf06 Rename js/tbl_*.js to js/table/*.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 04:09:05 -03:00
Maurício Meneghini Fauth
05ce6ffed4 Rename js/server_*.js to js/server/*.js
Rename js/server_status_*.js to js/server/status/*.js

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 03:56:22 -03:00
Maurício Meneghini Fauth
c8e98dea2f Rename js/db_*.js to js/database/*.js
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 03:37:42 -03:00
Maurício Meneghini Fauth
472d65690d Update u2f-api-polyfill to version 0.4.4
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 03:11:33 -03:00
Maurício Meneghini Fauth
4fd359e1a3 Add eslint-plugin-no-jquery and fix jQuery deprecated functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 02:29:31 -03:00
Maurício Meneghini Fauth
c0fb5fe1a9 Disallow case statement fallthrough in JS files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 00:24:31 -03:00
Maurício Meneghini Fauth
c63356d61a Disallow the use of console in JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-07 00:03:58 -03:00
Maurício Meneghini Fauth
0a16b56ace Disallow variable redeclaration in JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 23:58:48 -03:00
Maurício Meneghini Fauth
4260eb0a73 Remove empty blocks in JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 23:33:30 -03:00
Maurício Meneghini Fauth
aad0430be8 Add writable flag to some JavaScript globals
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 23:23:05 -03:00
Maurício Meneghini Fauth
771cdde8df Extend ESLint recommended configuration
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 22:52:06 -03:00
Maurício Meneghini Fauth
3b50a194e7 Remove unused variables in JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 22:31:33 -03:00
Maurício Meneghini Fauth
9aab9251d6 Merge branch 'QA_4_9'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 16:18:14 -03:00
Maurício Meneghini Fauth
2fe5150548 Change version to 4.9.1-dev in package.json
Related to e7b73831e5

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 16:14:57 -03:00
Maurício Meneghini Fauth
62539145ad Fix coding standard error
Remove blank line in libraries/classes/Plugins/Auth/AuthenticationCookie.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 16:10:49 -03:00
Maurício Meneghini Fauth
f7e2918f5a Fix undefined variables in JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-06 16:09:23 -03:00
Isaac Bennetch
3d0f481555 Finish fixing theme tests for 4.9
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-05 21:56:52 -04:00
Maurício Meneghini Fauth
c4e4d30300 Fix undefined variables in some JavaScript files
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-05 22:53:29 -03:00
Isaac Bennetch
69e1011ae6 Improve create-release script to handle QA branches higher than QA_4_8.
When we first added this bit, we intended to make QA_4_8 the LTS branch,
but have added QA_4_9 since then.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-05 21:50:13 -04:00
Isaac Bennetch
5bece6b081 Fix theme tests for 4.9
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-05 21:46:19 -04:00
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