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

109624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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
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
Maurício Meneghini Fauth
113c120088 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-12 01:26:49 -03:00
Maurício Meneghini Fauth
cb881daea2 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-10 21:05:26 -03:00
Maurício Meneghini Fauth
0a80a0ce57 Refactor variable names in Twig templates 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-09 23:39:41 -03:00
Michal Čihař
b0c138e0da Merge branch 'QA_4_7' 2017-05-09 23:44:13 +02:00
Michal Čihař
d10cf08393 Avoid duplicating $response 
We need to get it just once, see
https://github.com/phpmyadmin/phpmyadmin/issues/13154#issuecomment-300301726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 23:43:39 +02:00
Dan Ungureanu
4dd2226ef2 Redirect user to last page that has any tables to display. 
Fixes #13241.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-09 23:29:06 +03:00
Michal Čihař
5797113b25 Remove hhvm 3.19 for now 
The packages aren't ready yet.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 16:33:16 +02:00
Michal Čihař
0df1a22deb Adjust hhvm test matrix 
- remove ancient 3.3
- add current 3.19

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 16:27:46 +02:00
Michal Čihař
6b45f57e45 Merge branch 'QA_4_7' 2017-05-09 15:05:06 +02:00
Michal Čihař
dbcbee5336 Remove composer.lock from maintenance branch 
It should be there only for releases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:03:22 +02:00
Michal Čihař
61b9418f67 Add tests for Amazon RDS 
Issue #13258

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:02:13 +02:00
Michal Čihař
17599c3387 Simplify Amazon RDS detection 
Issue #13258

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:01:58 +02:00
Michal Čihař
fba8a51e3e Changelog entry for #13258 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:56:28 +02:00
Craig Duncan
ac3a35bc97 Correct the check for Amazon RDS 
Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2017-05-09 14:55:52 +02:00
Michal Čihař
71fdc68827 Merge branch 'QA_4_7' 2017-05-09 14:32:26 +02:00
Michal Čihař
0f0247f46b Remove author on request 
Fixes #13259

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:32:01 +02:00
Michal Čihař
6e9fc50304 Run tests during daily builds 
To ensure we will not ship something broken.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:11:37 +02:00
Michal Čihař
688fbc0d19 Remove build results if not running in CI mode 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:11:11 +02:00
Michal Čihař
b3ee1e56f8 Do not use ant for invoking testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:10:55 +02:00
Michal Čihař
a743cb084e Store metadata on daily release 
Store timestamp and git commit, so that this can be later used by
website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 12:53:09 +02:00
Michal Čihař
a226011717 Merge branch 'QA_4_7' 2017-05-09 11:50:33 +02:00
Michal Čihař
1784f4a64e Changelog entry for #13252 and #13255 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:50:10 +02:00
Michal Čihař
c36d0001f9 Use htmlspecialchars instead of urlencode 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:49:52 +02:00
Michal Čihař
4193d20334 Merge pull request #13255 from udan11/fix_13252 
Fixed tooltip not showing up.
 2017-05-09 11:49:14 +02:00
Michal Čihař
887a241c6d Merge pull request #13248 from CommanderRoot/patch-1 
Fix unwanted escaping
 2017-05-09 11:48:14 +02:00