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

112109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleksej Jovanović
d3ad268f2c Translated using Weblate (Serbian (latin)) 
Currently translated at 42.8% (1409 of 3287 strings)

[CI skip]
 2017-12-02 17:49:42 +01:00
Michal Čihař
8dd8d43787 Merge branch 'QA_4_7' 2017-12-01 08:09:55 +01:00
Michal Čihař
fed1d1d567 Merge remote-tracking branch 'origin/QA_4_7' 2017-12-01 08:09:52 +01:00
Michal Čihař
6221f72738 Merge commit 'ead65616938f88c4150bec15017e04eb91e78dd1' 2017-12-01 08:09:45 +01:00
Michal Čihař
5edb56b2ee Merge commit '1737e8f036ff5ff1fb995814a2bec0524b8c2952' 2017-12-01 08:08:43 +01:00
Michal Čihař
0ddb3aab05 Document PHP 7.2 support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 08:08:15 +01:00
Michal Čihař
10808a2497 Revert "Add PMD images to original theme" 
This reverts commit c7a33031b3.

The images should be used from the default theme if they are not
present.
 2017-12-01 07:59:40 +01:00
Weblate
f4631d1905 Merge remote-tracking branch 'origin/master' 2017-12-01 07:57:55 +01:00
Viktar Vauchkevich
1c7facd467 Translated using Weblate (Belarusian) 
Currently translated at 63.0% (2073 of 3287 strings)

[CI skip]
 2017-12-01 07:57:50 +01:00
Michal Čihař
df96bb0fb1 Document why there are two loops are needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 07:57:18 +01:00
Michal Čihař
b5029f8191 Declare i variable just once 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-01 07:57:18 +01:00
Weblate
bb0132f456 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-12-01 04:24:53 +01:00
RD WebDesign
a5731bdadd Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3204 of 3207 strings)

[CI skip]
 2017-12-01 04:24:52 +01:00
dingo thirteen
9f00d003cd Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-12-01 04:24:46 +01:00
Isaac Bennetch
ead6561693 Prepare for 4.7.7-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:24:25 -05:00
Isaac Bennetch
0e3c308b28 Remove composer.lock after release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:23:11 -05:00
Isaac Bennetch
39a20c0815 Adding composer lock for 4.7.6 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:23:11 -05:00
Isaac Bennetch
b58d0b5ae9 Prepare for 4.7.6 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-30 22:23:11 -05:00
BennyBeat
1737e8f036 Translated using Weblate (Catalan) 
Currently translated at 99.9% (3204 of 3207 strings)

[CI skip]
 2017-12-01 01:44:48 +01:00
Weblate
c1d37cbc9a Merge remote-tracking branch 'origin/master' 2017-12-01 01:44:20 +01:00
dingo thirteen
c4ef4c26ac Translated using Weblate (Dutch) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-12-01 01:44:10 +01:00
Maurício Meneghini Fauth
c7a33031b3 Add PMD images to original theme 
Fix #13586

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-30 22:40:44 -02:00
Dr. Nagy Elemér Károly
4bf4c6294f Translated using Weblate (Hungarian) 
Currently translated at 99.5% (3193 of 3207 strings)

[CI skip]
 2017-12-01 00:46:54 +01:00
dingo thirteen
f6903673b7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-11-30 20:53:50 +01:00
Weblate
ac1211fc67 Merge remote-tracking branch 'origin/master' 2017-11-30 19:36:58 +01:00
RD WebDesign
22efe8800f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.8% (3282 of 3287 strings)

[CI skip]
 2017-11-30 19:36:56 +01:00
Dr. Nagy Elemér Károly
64b211a21f Translated using Weblate (Hungarian) 
Currently translated at 96.4% (3169 of 3287 strings)

[CI skip]
 2017-11-30 19:36:45 +01:00
Olivier Macchioni
9c65363a25 Translated using Weblate (French) 
Currently translated at 99.7% (3279 of 3287 strings)

[CI skip]
 2017-11-30 19:36:44 +01:00
BennyBeat
1f2af04b6a Translated using Weblate (Catalan) 
Currently translated at 97.0% (3190 of 3287 strings)

[CI skip]
 2017-11-30 19:36:42 +01:00
Maurício Meneghini Fauth
fe62e84062 Use PSR-4 for Twig classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-30 16:33:26 -02:00
Maurício Meneghini Fauth
531d82b980 Move hidden_inputs.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:49:50 -02:00
Maurício Meneghini Fauth
c5dfe379eb Move options.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:48:26 -02:00
Maurício Meneghini Fauth
55641774f6 Move file_option.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:47:23 -02:00
Maurício Meneghini Fauth
3202480c7b Move partial_import_option.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:45:58 -02:00
Maurício Meneghini Fauth
f3010659ed Move other_option.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:44:20 -02:00
Maurício Meneghini Fauth
a8cc3ec829 Move format_option.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:43:13 -02:00
Maurício Meneghini Fauth
6e15e838f4 Move submit_option.twig into import.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:40:52 -02:00
Maurício Meneghini Fauth
647c626ae4 Move with_plugin.twig into javascript.twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 20:35:21 -02:00
Maurício Meneghini Fauth
c84f612f2a Move compressions template into file_option template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-29 17:01:18 -02:00
Michal Čihař
7ec4059dbb
Merge pull request #13839 from nijel/scripts 
Remove get_scripts wrapper to download javascript
 2017-11-29 17:05:44 +01:00
Michal Čihař
bb60b9d53b Merge branch 'QA_4_7' 2017-11-29 15:19:04 +01:00
Michal Čihař
a957f26947 Changelog entries for #11688 and #13466 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:16:59 +01:00
Michal Čihař
5346416625 Simplify Scripts::addFile API 
Removed unused parameter to define ordering of scripts.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
77f0d50bea Add missing dependency on jquery.validate.js 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
8ef504da91 Remove line counts logic from the error reporting component 
We no longer need this as we download js files directly, so the client
has correct filename and line immediatelly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
8fbe46f3e8 Remove usage of get_scripts.js.php wrapper 
- this adds significant overhead in sending static files from the server
- the benefit of joining requests is minimal since introduction of HTTP/2
- the onload handlers are now fired directly by individual scripts, what
  makes them really execute when the script is loaded (it could be
  previously executed earlier in case of chunked loading)

Fixes #13840

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 15:09:43 +01:00
Michal Čihař
6a0345b10e
Merge pull request #13847 from nijel/collation 
Move collation connection setting to user preferences
 2017-11-29 15:07:39 +01:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences 
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 14:16:31 +01:00
Weblate
c6f3c4002c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-11-29 12:52:07 +01:00
Giovanni Sora
5ec4a107d0 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2424 of 3207 strings)

[CI skip]
 2017-11-29 12:52:04 +01:00