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

111576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
246769a979 Port columns_definitions/transformation to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-25 09:52:30 -02:00
Michal Čihař
701a8855fd Merge pull request #13770 from nijel/dbi 
Database interface cleanups
 2017-10-25 12:05:54 +02:00
Michal Čihař
125aa9ab8e Merge branch 'QA_4_7' 2017-10-25 10:44:00 +02:00
Michal Čihař
784e9e9b87 Ignore php-myadmin.ru from linkcheck in docs 
The site works, it's just missing intermediate certificate, what makes
it fail in the linkcheck, but usually works in the browser as it has
already seen the intermediate cert before elsewhere.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:41:53 +02:00
Michal Čihař
1f968ce29b Fix setting variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:24:45 +02:00
Michal Čihař
99e47a90d9 Always define correct connection type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
2c248fa83d Fix documentation for DatabaseInterface::getDefinition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
ae0a259bac Move link parameter as last in getTablesFull 
It is currently not used here, so move it to the end.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
feb56e7f49 Correctly define connection type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
33cfe75e9f Return calculated value from isUserType 
There is no need to hit the cache again to read the value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
398e7b8e58 Avoid poluting user cache without database connection 
Returning false is obviously faster than dealing with the cache.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
5f29ace249 Simplify DatabaseInterface link parameter handling 
- check validy only when invoking low level calls
- avoid too early array usage

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
4fe87fb592 Remove usage of $GLOBALS['controllink'] 
This is now stored internally inside DatabaseInterface instance.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
deed987f15 Always define PMA_Config in tests 
It is needed for template rendering, so most tests need it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
afa5aa1328 Simplify condition for checking link existence 
As the control link is same as user link if none is defined
we can check only if user is logged in.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
329ce22b73 Correctly handle fallback control user connection using user parameters 
Remember it as CONNECT_CONTROL and avoid running post connect handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
60c1b32472 Remove usage of $GLOBALS['userlink'] 
The links are internal to DatabaseInterface and user link is default.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
dfc6f7bf8e Remember MySQL links internally in the database interface 
This should replace $GLOBALS['userlink']/$GLOBALS['controllink'].

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Weblate
ad178f248c Merge remote-tracking branch 'origin/master' 2017-10-25 03:35:57 +02:00
Steven WdV
9a3cfda36c Translated using Weblate (Dutch) 
Currently translated at 99.7% (3222 of 3231 strings)

[CI skip]
 2017-10-25 03:35:52 +02:00
Maurício Meneghini Fauth
f9dd640c1a Port privileges/initials_row template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-24 23:32:52 -02:00
Maurício Meneghini Fauth
a75010c8b9 Port database/structure/table_header to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-24 22:27:02 -02:00
Michal Čihař
0c44d41e5e Remove unused code 
This has no use since 03d37b45f1
(for more than 7 years).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-24 14:13:45 +02:00
Maurício Meneghini Fauth
a13fd4835a Port database/structure/body_for_table_summary to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-24 00:54:16 -02:00
Maurício Meneghini Fauth
d70433bd62 Port server/engines/engine template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-23 23:38:42 -02:00
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