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

109649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luís Pedro Algarvio
af7f8d6cc3 Change composer package type to project (#13198) 
Composer doesn't seem to support packages of type application.
Package type library (the default) or project seem to be the most appropriate.

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
 2017-05-16 13:52:19 +02:00
Michal Čihař
26e39f9d82 Merge branch 'QA_4_7' 2017-05-16 12:52:38 +02:00
Michal Čihař
e52a71592a Fix error in query builder 
Fixes #13274

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 12:51:42 +02:00
Michal Čihař
6479c830c4 Make sure that daily snapshots are from latest update 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 10:58:28 +02:00
Michal Čihař
3e8333e306 Merge branch 'QA_4_7' 2017-05-15 10:38:41 +02:00
Michal Čihař
6390541ecc Fix active tab detection 
Issue #13266

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 10:38:23 +02:00
Michal Čihař
089e93d2ce Merge branch 'QA_4_7' 2017-05-15 10:26:26 +02:00
Michal Čihař
e6f88fdcfc Fix link to User accounts overview page 
Fixes #13266

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 10:25:58 +02:00
Michal Čihař
452f6210dc Merge branch 'QA_4_7' 2017-05-15 09:51:23 +02:00
Michal Čihař
17c1e99ee4 Merge commit '8674361e46d990236306a9da43196cac653d3ecb' 2017-05-15 09:51:16 +02:00
Michal Čihař
be92c4ef5e Merge commit '3bd4e38d9b9645a520e0b78ce090d7580825c455' 2017-05-15 09:51:08 +02:00
Michal Čihař
6513497e88 Merge pull request #13265 from mauriciofauth/templates 
Port templates to Twig
 2017-05-15 09:50:04 +02:00
Weblate
51b5258510 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-15 09:48:45 +02:00
Balázs Úr
a4286252a8 Translated using Weblate (Hungarian) 
Currently translated at 99.4% (3174 of 3192 strings)

[CI skip]
 2017-05-15 09:48:43 +02:00
Michal Čihař
8674361e46 Merge pull request #13262 from udan11/fix_13241 
Redirect user to last page that has any tables to display.
 2017-05-15 09:48:35 +02:00
Weblate
96641035d8 Merge remote-tracking branch 'origin/master' 2017-05-15 09:47:19 +02:00
Balázs Úr
a315cfa3af Translated using Weblate (Hungarian) 
Currently translated at 99.2% (3175 of 3198 strings)

[CI skip]
 2017-05-15 09:47:17 +02:00
Michal Čihař
d568c25921 Use JSON for theme metadata 
- it allows processing without need to interpret PHP code
- it makes it easier to structure the information
- include supported version info (fixes #13167)
- include author name and URL (fixes https://github.com/phpmyadmin/website/issues/57)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
833f40496c Create separate document for themes 
This will make it more visible and can provide more detailed
instructions than FAQ entry.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
941e861aba Define major version 
This will be later used as compatiblity check for themes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
bb26e2e0d9 Remove deprecated variables 
These should not be used for few years.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:47:15 +02:00
Michal Čihař
1095829d9f Avoid linting removed files 
We can not lint files which have been removed in the commit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:46:45 +02:00
Michal Čihař
93d1924179 Fix name of Advisor::byTime 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:44:58 +02:00
Michal Čihař
1c70ed49cb Move advisor helpers to the Advisor class 
They no longer need to pollute global namespace as they are used only in
context of ExpressionLanguage.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:44:01 +02:00
Michal Čihař
f13476f454 Replace eval() by Symfony\ExpressionLanguage 
This is already used by motranslator, so it doed not bring extra
dependency and we get rid of the eval() call.

Fixes #6363

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:44:01 +02:00
Michal Čihař
b8c4ca9cdd Add tests for advisor functions 
We need to ensure these work correctly when refactoring the code.

Issue #6363

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-15 09:44:01 +02:00
Viktar Vauchkevich
3bd4e38d9b Translated using Weblate (Belarusian) 
Currently translated at 46.8% (1494 of 3192 strings)

[CI skip]
 2017-05-15 00:44:19 +02:00
Viktar Vauchkevich
47a695824b Translated using Weblate (Belarusian) 
Currently translated at 46.6% (1493 of 3198 strings)

[CI skip]
 2017-05-15 00:44:13 +02:00
Takumi Hamamoto
47ba7df312 Translated using Weblate (Japanese) 
Currently translated at 71.3% (2277 of 3192 strings)

[CI skip]
 2017-05-13 09:45:51 +02:00
Takumi Hamamoto
d3b5669276 Translated using Weblate (Japanese) 
Currently translated at 71.0% (2272 of 3198 strings)

[CI skip]
 2017-05-13 09:45:43 +02:00
Maurício Meneghini Fauth
496abb869f Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-12 23:43:57 -03:00