gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,551 Commits 12 Branches 481 Tags 2.4 GiB
203ce222a2
Commit Graph

111551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
203ce222a2 Escape backslash in table/structure/display_structure 
Fix #13772

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-23 22:43:22 -02:00
Michal Čihař
22d068cdd5 Merge branch 'QA_4_7' 2017-10-23 19:42:14 +02:00
Michal Čihař
0b029c26df Merge commit '4cdf2848eefb56ae2a1178ba7387d3aab11448ab' 2017-10-23 19:41:23 +02:00
Michal Čihař
94a8668a0d Remove composer.lock after release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 19:40:04 +02:00
Scrutinizer Auto-Fixer
40f56c0a95 Remove not needed use statements 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 18:49:37 +02:00
George Bezerra
4cdf2848ee Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 15:36:40 +02:00
Weblate
228f8472d2 Merge remote-tracking branch 'origin/master' 2017-10-23 15:32:48 +02:00
George Bezerra
d91e89e556 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3231 of 3231 strings)

[CI skip]
 2017-10-23 15:32:45 +02:00
Maurício Meneghini Fauth
c244264092 Port table/structure/display_structure to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-23 11:31:58 -02:00
Rafael Campos de Brito
994610b168 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:32:25 +02:00
George Bezerra
06a0a641fb Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:32:01 +02:00
Guilherme Souza Silva
01102f3997 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:25:24 +02:00
anonymous
7481013c08 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:24:46 +02:00
Guilherme Souza Silva
8769bd685c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:23:37 +02:00
George Bezerra
b289f4e0b1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-10-23 13:21:44 +02:00
Michal Čihař
84bce234b0 Use quotes around timezone name 
Otherwise the error message might be confusing.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:39:49 +02:00
Michal Čihař
fa042eda41 Avoid hard failure on not setting timezone 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:38:54 +02:00
Michal Čihař
5d9e124449 Move timezone setup to the DatabaseInterface 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:34:49 +02:00
Michal Čihař
d3be81a8c9 Fix comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-23 11:30:42 +02:00
Michal Čihař
41c55cc42f Merge pull request #13764 from nijel/auth 
Authentication API cleanup
 2017-10-23 11:15:20 +02:00
Maurício Meneghini Fauth
10e27f6d72 Fix typo 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-21 16:01:19 -02:00
Isaac Bennetch
113ccfc8a5 Prepare for 4.7.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-10-21 05:24:23 -04:00
Weblate
0e33ea645f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-10-23 15:36:42 +02:00
Isaac Bennetch
54103592d9 Adding composer lock for 4.7.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-10-21 04:11:53 -04:00
Isaac Bennetch
4a60cbd442 Prepare for release 4.7.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-10-21 04:00:49 -04:00
Maurício Meneghini Fauth
72677a6070 Merge pull request #13767 from skokeers27/master 
Removed inline css in index.inc.php
 2017-10-20 20:08:43 -02:00
Paweł Skokowski
f863a896c1 Removed inline css in index.inc.php 
Signed-off-by: Paweł Skokowski <skokowskipawel@icloud.com>
 2017-10-20 23:40:07 +02:00
Michal Čihař
6619fe9196 Check return value from cookieDecrypt 
This can return false and we should fail early once this happens.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
6cb2963dcf Fix createIV documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
3f8e1f19e0 Add tests for AuthenticationPlugin::checkRules 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
e020dbfe16 Add test for AuthenticationPlugin::authenticate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
c1375f4e84 Remove not needed access through globals 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
8e8f4bd3bb Avoid using PHP_AUTH_USER and PHP_AUTH_PW globals for auth 
Use object attributes to store the actual credentials and avoid
messing up with global variables.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
62535ea5b9 Pass failure reason to showFailure 
This way we can avoid relying on global variables to check it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 19:44:28 +02:00
Michal Čihař
2327dbf3c3 Move allow/deny rules check to AuthenticationPlugin 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 18:14:56 +02:00
Michal Čihař
9bc5bfd74c Move authentication logic to AuthenticationPlugin 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 18:14:56 +02:00
Michal Čihař
026d722178 Rationalize AuthenticationPlugin API 
Make the API more consistent, remove not needed auth prefix and stop
talking about advanced authentication which has been there about 10
years ago.

API changed:

- authCheck is now readCredentials
- authSetUser is now storeCredentials
- auth is now showLoginForm
- authFails is now showFailure
- storeUserCredentials is now rememberCredentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 18:14:56 +02:00
Michal Čihař
13d2ff1f5b Consistely use no return value for AuthenticationPlugin::authFails 
It really does not return in the end, so make the docs consistent
with the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 18:14:56 +02:00
Michal Čihař
56c1c9fc5c Share base code for AuthenticationPlugin::authSetUser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 18:14:56 +02:00
Maurício Meneghini Fauth
01a51330bf Update jQuery Validation Plugin to 1.17.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 13:09:27 -02:00
Maurício Meneghini Fauth
79612e975f Update jQuery Migrate to 3.0.1 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 12:58:13 -02:00
Maurício Meneghini Fauth
2dcecd7c08 Move jquery.md5.js to js/vendor/jquery 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 12:13:58 -02:00
Maurício Meneghini Fauth
dc8866230c Update TraceKit to 0.4.5 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 12:06:54 -02:00
Maurício Meneghini Fauth
bb8e3c3e54 Update CodeMirror to 5.30.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 11:54:18 -02:00
Michal Čihař
d1f98f85f8 Simplify authentication plugin handling 
- rely on autoloader to figure out filename
- directly contruct full class name

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 15:41:56 +02:00
Michal Čihař
b6ab344e6f Move request check to helper method 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 15:41:16 +02:00
Maurício Meneghini Fauth
a8cd41bd40 Merge pull request #13763 from mauriciofauth/yarn-packages 
Add JavaScript dependencies to package.json
 2017-10-20 10:42:07 -02:00
Maurício Meneghini Fauth
84176cb9fe Add JavaScript dependencies to package.json 
Added dependencies on specific versions because we do not use these files
directly which makes updating non-automatic.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-20 10:28:03 -02:00
Michal Čihař
8cf6efcce5 Merge branch 'QA_4_7' 2017-10-20 11:39:00 +02:00
Michal Čihař
e87ca9e954 Removed linking to files in changelog 
The filenames are usually partial, so it really doesn't work well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-20 11:38:40 +02:00