gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,354 Commits 12 Branches 481 Tags 2.4 GiB
54466d68c6
Commit Graph

110354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
54466d68c6 Use Message to avoid need to specify namespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:55:24 +02:00
Weblate
5db9a3eed2 Merge remote-tracking branch 'origin/master' 2017-07-18 14:21:19 +02:00
Giovanni Sora
7d90ecfe4f Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2426 of 3213 strings)

[CI skip]
 2017-07-18 14:21:16 +02:00
Michal Čihař
0da9acc657 Merge branch 'QA_4_7' 2017-07-18 14:20:33 +02:00
Michal Čihař
b7788850a9 Fixed usage of some browser transformations 
Fixes #13478

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:18:02 +02:00
Michal Čihař
300cc8b8b2 Factor out code for MIME tranformations mapping 
Issue #1347

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:07:55 +02:00
Michal Čihař
632eea08fa Merge branch 'QA_4_7' 2017-07-18 13:32:41 +02:00
Michal Čihař
3ff7cf52e7 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:32:14 +02:00
Michal Čihař
5d9056367c Fix path to Config.php in master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:31:50 +02:00
Michal Čihař
8dd0381043 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:29:19 +02:00
Michal Čihař
7cc0ae9acb Merge branch 'QA_4_7' 2017-07-18 13:28:11 +02:00
Michal Čihař
b2a902de4d Switch to SSL connection if server tells us to do so 
Fixes #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:26:35 +02:00
Michal Čihař
471b341d2e Allow SSL connection even when the certs are not set 
Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:00:06 +02:00
Michal Čihař
7244330aa0 Add missing server version definition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 12:36:57 +02:00
Michal Čihař
85f5fd4bd6 Merge branch 'QA_4_7' 2017-07-18 12:05:42 +02:00
Michal Čihař
b2b3886e22 Fail if ini_set/ini_get are disabled 
We might support operation without these two later, but it's quite a lot
of work and nobody was really requesting this.

Fixes #13471

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 12:04:38 +02:00
Michal Čihař
d15da74eda Merge branch 'QA_4_7' 2017-07-18 12:00:02 +02:00
Michal Čihař
6e7c6aed7d Avoid breakage if set_time_limit is disabled 
Fixs #13468

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:57:59 +02:00
Michal Čihař
9eb7287b72 Merge branch 'QA_4_7' 2017-07-18 11:47:02 +02:00
Michal Čihař
4b4403aeef Update to current lint plugin 
Our patch has been integrated.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:46:43 +02:00
Michal Čihař
0cd143f274 Merge branch 'QA_4_7' 2017-07-18 11:26:36 +02:00
Michal Čihař
0971a91698 Change variable name to match upstream 
See https://github.com/codemirror/CodeMirror/pull/4861

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:26:11 +02:00
Michal Čihař
cc954750bb Merge branch 'QA_4_7' 2017-07-18 11:07:03 +02:00
Michal Čihař
639c2b8c4b Fixed rendering SQL lint errors 
- add patch to CodeMirror to render HTML, it's submitted upstream as
  https://github.com/codemirror/CodeMirror/pull/4861
- properly escape html output of Linter, now when we use full HTML

Fixes #13489

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:05:37 +02:00
Michal Čihař
1a90f97231 Bring back CSS customization for CodeMirror 
Originally it was done by patching upstream sources in 4c24db0, but that
was lost when upgrading.

Issue #13489

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 10:45:02 +02:00
Michal Čihař
d463309502 Merge branch 'QA_4_7' 2017-07-18 10:05:13 +02:00
Michal Čihař
c73f451cde Always cleanup composer file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 10:05:09 +02:00
Michal Čihař
22b27fa3e3 Merge branch 'QA_4_7' 2017-07-18 09:50:04 +02:00
NMilchev
c592ba6a0e Translated using Weblate (Bulgarian) 
Currently translated at 60.4% (1937 of 3203 strings)

[CI skip]
 2017-07-18 09:49:35 +02:00
Weblate
41e8a3db43 Merge remote-tracking branch 'origin/master' 2017-07-18 09:45:27 +02:00
NMilchev
dc4a1a2213 Translated using Weblate (Bulgarian) 
Currently translated at 60.1% (1930 of 3211 strings)

[CI skip]
 2017-07-18 09:45:22 +02:00
Michal Čihař
942e44afe7 Merge pull request #13499 from nijel/theme 
Move Theme object out of session
 2017-07-18 09:45:11 +02:00
Michal Čihař
964f3d8963 Merge branch 'QA_4_7' 2017-07-17 17:09:33 +02:00
Michal Čihař
8841a26788 Fixed size of index edit dialog 
Fixes #13382

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 17:09:10 +02:00
Michal Čihař
ff84a36e09 Merge branch 'QA_4_7' 2017-07-17 16:57:23 +02:00
Michal Čihař
d0ab548f76 Fixed inline editing of hex values 
Fixes #13387

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 16:56:43 +02:00
Michal Čihař
6a3d51e084 Make hex inline editor accept 0x at the begining 
Issue #13387

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 16:52:49 +02:00
Michal Čihař
3755046e5e Merge branch 'QA_4_7' 2017-07-17 16:27:03 +02:00
Xavier Navarro
b0123cdc9f Translated using Weblate (Catalan) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-07-17 16:22:51 +02:00
Michal Čihař
366a8f9410 Simplify condition for showing comment 
It can be unset as well.

Fixes #13469

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:30:02 +02:00
Michal Čihař
8b00b90372 Remove last uses of PMA_MYSQL_INT_VERSION define 
It is only kept as name in Advisor for now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:27:27 +02:00
Michal Čihař
e471d6b5eb Remove PMA_MYSQL_INT_VERSION from privileges code 
This allows us to get rid of runkit dependency on testing this.

Fixes #13484

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:17:41 +02:00
Michal Čihař
e05d5f4bf4 Remove PMA_MYSQL_STR_VERSION 
Replace it by DatabaseInterface::getVersionString.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:06:30 +02:00
Michal Čihař
339d42ca5d Remove no longer used PMA_MARIADB define 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:02:49 +02:00
Michal Čihař
88881572be Convert Types to use new API for getting server version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:02:00 +02:00
Michal Čihař
91ce11809d Make fallback value consistent with what we use in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 15:01:42 +02:00
Michal Čihař
302a10e43b Remove no longer used PMA_MYSQL_VERSION_COMMENT define 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 14:55:57 +02:00
Michal Čihař
0effb3012c Use new API to report version and comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 14:55:18 +02:00
Michal Čihař
8512442a7b Use existing detection for showing server type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 14:53:17 +02:00
Michal Čihař
89fb42f99b Add version and type properties to the DatabaseInterface 
This will allow us to better handle versions in certain cases:

* Having different server version for control user and regular connection
* Mocking version for the tests (see #13484)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 14:45:59 +02:00