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

109680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rajat Sharma
7618ff63b1 Translated using Weblate (Hindi) 
Currently translated at 36.5% (1171 of 3207 strings)

[CI skip]
 2017-05-20 00:36:01 +02:00
Viktar Vauchkevich
cfc6e1979e Translated using Weblate (Belarusian) 
Currently translated at 49.4% (1587 of 3207 strings)

[CI skip]
 2017-05-20 00:35:58 +02:00
dingo thirteen
c9674417bb Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-18 20:01:21 +02:00
Madhura Jayaratne
332b0deeec Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-05-18 09:43:32 +10:00
Madhura Jayaratne
344e6887f8 Use PMA_MAJOR_VERSION as a constant 
Looking at bootstrap-dist.php, it looks like PMA_MAJOR_VERSION was in fact intended to be used as a constant

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-05-18 09:41:24 +10:00
Weblate
dda04abc46 Merge remote-tracking branch 'origin/master' 2017-05-18 01:22:25 +02:00
Giovanni Sora
a25d76698b Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2423 of 3207 strings)

[CI skip]
 2017-05-18 01:22:23 +02:00
Viktar Vauchkevich
af8df3abc8 Translated using Weblate (Belarusian) 
Currently translated at 47.2% (1516 of 3207 strings)

[CI skip]
 2017-05-18 01:22:20 +02:00
Madhura Jayaratne
26403c8447 Fix #13282 Default theme does not load 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-05-18 09:21:49 +10:00
Kristjan Räts
469a7bc5a3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-17 21:21:46 +02:00
Domen
d5f33f1a60 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-17 20:25:00 +02:00
Weblate
de024be558 Merge remote-tracking branch 'origin/master' 2017-05-17 15:44:03 +02:00
Kristjan Räts
0f658ad17d Translated using Weblate (Estonian) 
Currently translated at 98.0% (3143 of 3207 strings)

[CI skip]
 2017-05-17 15:43:59 +02:00
Madhura Jayaratne
ea5640fd9c Merge branch 'QA_4_7' 2017-05-17 23:43:32 +10:00
Madhura Jayaratne
660123d228 Fix #13177 Grid editing repeats action after error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-05-17 23:41:56 +10:00
Michal Čihař
14160afba2 Merge branch 'QA_4_7' 2017-05-17 11:05:51 +02:00
Stefano Martinelli
19bb621154 Translated using Weblate (Italian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-17 11:05:00 +02:00
Michal Čihař
8caaba0b87 Changelog entry for #12386 and #13279 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 11:04:27 +02:00
Weblate
e96b355b5f Merge remote-tracking branch 'origin/master' 2017-05-17 11:03:42 +02:00
Harshana Madusanka
fabd4d0d46 Translated using Weblate (Sinhala) 
Currently translated at 57.9% (1860 of 3207 strings)

[CI skip]
 2017-05-17 11:03:41 +02:00
Stefano Martinelli
f79c1d61b7 Translated using Weblate (Italian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-17 11:03:39 +02:00
Michal Čihař
4e603292af Merge pull request #13279 from nijel/mbstring 
Replace our mbstring polyfills with symfony/polyfill-mbstring
 2017-05-17 11:03:28 +02:00
Stefano Martinelli
35bb1d5395 Translated using Weblate (Italian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-17 10:48:23 +02:00
Stefano Martinelli
fac8b367d2 Translated using Weblate (Italian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-17 10:44:24 +02:00
Burak Yavuz
37b73a2457 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-05-17 10:29:35 +02:00
Burak Yavuz
445677ecd9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-17 10:24:13 +02:00
Michal Čihař
7cea5eb9af Replace our mbstring polyfills with symfony/polyfill-mbstring 
The symfony/polyfill-mbstring is anyway pulled in through Twig, so this
doesn't add additional dependencies.

Fixes #12386

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 10:03:30 +02:00
Michal Čihař
ce78e2f154 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:24:30 +02:00
Michal Čihař
9d1b49ae65 Improve extracting translatable strings from Twig templates 
- use separate (clean) directory to avoid messing up with stale cache
  data or other files in the temporary dir
- restore filenames for twig templates in Gettext files, the lines still
  don't match, but at least the filename is correct
- extract the _gettext function as well

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:23:59 +02:00
Weblate
092e8d5889 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-17 09:10:22 +02:00
Viktar Vauchkevich
550406d636 Translated using Weblate (Belarusian) 
Currently translated at 47.4% (1514 of 3192 strings)

[CI skip]
 2017-05-17 09:10:19 +02:00
Michal Čihař
10099d9942 Merge branch 'QA_4_7' 2017-05-17 09:07:53 +02:00
Michal Čihař
524aeae0a3 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:07:17 +02:00
Michal Čihař
8375fcb0ec Merge branch 'QA_4_7' 2017-05-17 09:06:52 +02:00
Michal Čihař
6675b2d094 The license is actually GPL-2.0 only 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:06:07 +02:00
Michal Čihař
99623673d9 Add alias for master branch for composer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:03:59 +02:00
Weblate
24e57be310 Merge remote-tracking branch 'origin/master' 2017-05-17 08:46:27 +02:00
Viktar Vauchkevich
efca349b89 Translated using Weblate (Belarusian) 
Currently translated at 47.3% (1513 of 3198 strings)

[CI skip]
 2017-05-17 08:46:21 +02:00
Michal Čihař
86e27bc980 Merge pull request #13277 from mauriciofauth/fix/13276 
Fix unwanted escape
 2017-05-17 08:46:13 +02:00
Maurício Meneghini Fauth
f8b29a9788 Fix unwanted escape 
Issue #13276

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-16 21:18:27 -03:00
Michal Čihař
6a48ad77f0 Document changes for #13167 and #6363 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 16:53:42 +02:00
Michal Čihař
0374229d0c Add descripton field to theme.json 
It is needed for the website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 16:51:06 +02:00
Michal Čihař
e788bc2299 Merge pull request #13260 from nijel/advisor-eval 
Replace eval() in Advisor by Symfony\ExpressionLanguage
 2017-05-16 16:50:23 +02:00
Michal Čihař
ae5ca6e756 Merge pull request #13261 from nijel/theme-metadata 
Rewrite theme metadata handling
 2017-05-16 15:15:48 +02:00
Michal Čihař
b8087ce80d Add more complex advisor test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 15:13:40 +02:00
Michal Čihař
262e22613c Complete test coverage for ADVISOR_bytime 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 15:06:53 +02:00
Michal Čihař
54c100f5f3 Merge branch 'QA_4_7' 2017-05-16 14:22:34 +02:00
Michal Čihař
f4408d2d0d Simplify composer installation instructions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 14:22:24 +02:00
Michal Čihař
69f8bd349d Merge branch 'QA_4_7' 2017-05-16 13:52:32 +02:00
Luís Pedro Algarvio
9ea8970c8f Reorder a few keys in the composer.json file (#13199) 
Reorder a few keys to make the composer.json file feel a bit more organized:
- repositories key goes above all the dependencies
- pair homepage with support key and move them to position after name, description and keywords
- pair authors with license key and move them to position just before technical stuff

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
 2017-05-16 13:52:27 +02:00