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

112094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michal Čihař
63f5b90ad5 Merge branch 'QA_4_7' 2017-11-29 12:51:31 +01:00
Michal Čihař
7bff1263c8 Revert limitation on phpseclib dependency 
Only 2.0.8 is broken, so conflict with that.

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:50:15 +01:00
Michal Čihař
dd38309300 Include timestamp when creating event in selenium tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:47:41 +01:00
Michal Čihař
14e78f79bb Avoid error when event is not really added 
This can easily happen when it was scheduled in past, MySQL then just ignores it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:44:41 +01:00
Michal Čihař
51a65e022b Avoid using deprecated jQuery functions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:37:18 +01:00
Michal Čihař
843906a827 Ensure navigation does not break on setting invalid width 
This can be result of failed request, so fallback to defaults.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:09:32 +01:00
Michal Čihař
8b511acd95 Use PMA_Config to get configuration value 2017-11-29 11:32:11 +01:00
Weblate
9bea690aa9 Merge remote-tracking branch 'origin/master' 2017-11-29 10:32:07 +01:00
Giovanni Sora
7036a2713d Translated using Weblate (Interlingua) 
Currently translated at 75.2% (2474 of 3287 strings)

[CI skip]
 2017-11-29 10:32:01 +01:00
Michal Čihař
fe493f6d46 Avoid horizontal scrolling 
It would have to subtract width of navigation and is not needed in most cases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 10:31:34 +01:00
Burak Yavuz
5479fe57b3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3287 of 3287 strings)

[CI skip]
 2017-11-29 09:54:05 +01:00
Weblate
cef7ca5d37 Merge remote-tracking branch 'origin/master' 2017-11-29 09:45:11 +01:00
Burak Yavuz
597ad1fc18 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3286 of 3287 strings)

[CI skip]
 2017-11-29 09:45:10 +01:00
Michal Čihař
6aeae463d1 Merge branch 'QA_4_7' 2017-11-29 09:44:46 +01:00
Michal Čihař
f8ccc4db13 Stick with phpseclib < 2.0.8 in 4.7 branch 
We can not remove PHP 5.5 support from maintenance branch, so there is
no other way than sticking with older phpseclib.

See https://github.com/phpseclib/phpseclib/issues/1218

Issue #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:35:39 +01:00