gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,336 Commits 12 Branches 481 Tags 2.4 GiB
ef1727cb06
Commit Graph

109336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
ef1727cb06 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-21 11:43:18 +02:00
Bo Anderson
13c5179068 Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (3077 of 3077 strings)

[CI skip]
 2017-07-21 11:43:16 +02:00
Michal Čihař
014e706374 Remove shadow from the logo 
Fixes #13415

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 11:42:51 +02:00
Guilherme Libardi
6e5e9264ec Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-21 05:23:56 +02:00
Bo Anderson
d0a2286bc2 Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (3077 of 3077 strings)

[CI skip]
 2017-07-21 01:45:11 +02:00
Weblate
4812591896 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-20 22:40:11 +02:00
Bo Anderson
28f6b29dfc Translated using Weblate (English (United Kingdom)) 
Currently translated at 77.6% (2488 of 3205 strings)

[CI skip]
 2017-07-20 22:40:05 +02:00
zhangmiao
f5ea75f0fd Translated using Weblate (Chinese (Simplified)) 
Currently translated at 86.1% (2761 of 3205 strings)

[CI skip]
 2017-07-20 22:40:04 +02:00
Isaac Bennetch
0b5063999d Prepare for 4.7.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 16:39:27 -04:00
Isaac Bennetch
2483774e86 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 15:30:55 -04:00
Isaac Bennetch
d66590b3fa Adding composer lock for 4.7.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 14:35:47 -04:00
Isaac Bennetch
633b5e72ad Prepare for release 4.7.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 14:32:10 -04:00
Vladimir G
3bb0e0bdc3 Translated using Weblate (Russian) 
Currently translated at 94.4% (3026 of 3205 strings)

[CI skip]
 2017-07-20 18:46:22 +02:00
Erik V
76d5b49508 Translated using Weblate (German) 
Currently translated at 99.9% (3203 of 3205 strings)

[CI skip]
 2017-07-20 12:45:18 +02:00
Burak Yavuz
efeda3d386 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-19 21:46:57 +02:00
Domen
19669c9692 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-19 21:46:32 +02:00
Giovanni Sora
cd1b943f19 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2422 of 3205 strings)

[CI skip]
 2017-07-19 18:45:43 +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ř
8dd0381043 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:29:19 +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ř
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ř
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ř
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ř
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ř
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ř
c73f451cde Always cleanup composer file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 10:05:09 +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
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ř
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
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ř
5f34bb20a8 Update sql-parser dependency 
Needed for fixing #13385, #13483, #13485, #13486, #13487

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-12 16:56:08 +02:00
Michal Čihař
58ad1c90b8 Improved handling of uploaded files with open_basedir 
Check whether configured directory is writable as it might be subject to
open_basedir restrictions.

Fixes #13482

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-12 13:44:33 +02:00
Michal Čihař
f0ba6576f8 Use correct constant name 
Fixes #13475

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-11 16:37:33 +02:00
Michal Čihař
59d0a9fe86 Add sanity checking for max_count 
We use it later for division, so make sure it's good for it.

Fixes #13470

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 15:26:47 +02:00
Michal Čihař
bd2a0ec307 Wrap file_exists calls with @ 
It can produce warnings in case open_basedir is enabled.

Fixes #13467

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:59:43 +02:00
Weblate
91d3d0953e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-10 14:35:57 +02:00
test
18c7e718ed Translated using Weblate (Croatian) 
Currently translated at 27.7% (888 of 3203 strings)

[CI skip]
 2017-07-10 14:35:54 +02:00
Michal Čihař
85747b9ae9 Use usort() instead of natsort() 
The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.

Fixes #13465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:34:12 +02:00
Michal Čihař
36ea981bdd Fix format string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:18:55 +02:00
Michal Čihař
ee1ce07970 Fixed version check when not connected to a database 
Fixes #13437

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:15:47 +02:00
Michal Čihař
10b04f175a Fix website URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:14:05 +02:00
Michal Čihař
a4ec378179 Move spacing around buttons to Util::getMessage 
We really do not want to add spacing around all buttons, just the ones
in the SQL message.

Fixes #13445

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 10:50:22 +02:00
Weblate
67b0180ba9 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-08 12:48:15 +02:00
zhangmiao
57fc8e8cf7 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.8% (2751 of 3203 strings)

[CI skip]
 2017-07-08 12:48:12 +02:00
yagoub fadel
b9314f1d80 Translated using Weblate (Arabic) 
Currently translated at 49.3% (1581 of 3203 strings)

[CI skip]
 2017-07-08 12:48:11 +02:00
Madhura Jayaratne
d8f11a84a4 Fix #13447 Large multi-line query removes Export operation and blanks query box options 
This is not a guaranteed method of detecting image upload into a BLOB field

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-07-08 20:47:45 +10:00