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

109120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
524aeae0a3 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 09:07:17 +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ř
f4408d2d0d Simplify composer installation instructions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-16 14:22:24 +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ř
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ř
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ř
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
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
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
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
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ř
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ř
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ř
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ř
915bcdab5b Changelog entry for #13256 and #13257 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:40:16 +02:00
Weblate
9988611a17 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-09 11:39:36 +02:00
Codrin
88e2610296 Translated using Weblate (Romanian) 
Currently translated at 54.0% (1724 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
b723df0b86 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
a3987b2654 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-09 11:39:34 +02:00
Viktar Vauchkevich
5d3f1be1d4 Translated using Weblate (Belarusian) 
Currently translated at 38.5% (1229 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
a70025eee2 Translated using Weblate (Arabic) 
Currently translated at 34.6% (1107 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
cb717611e9 Merge pull request #13257 from udan11/fix_13256 
zxcvbn dependency was missing.
 2017-05-09 11:39:24 +02:00
Joelso Dias
35c6d9c66d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 03:46:14 +02:00
Cindy Dallaire
97d2c07e24 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-05-09 00:45:05 +02:00
Dan Ungureanu
41683f3553 zxcvbn dependency was missing. 
Fixes #13256.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-08 21:37:36 +03:00
Dan Ungureanu
c2761f6135 Fixed tooltip not showing up. 
Fixes #13252.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-08 19:45:39 +03:00
Justas Vilimas
d70e87b1b5 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-08 10:32:11 +02:00
Viktar Vauchkevich
c9efa661e1 Translated using Weblate (Belarusian) 
Currently translated at 32.0% (1023 of 3192 strings)

[CI skip]
 2017-05-07 00:44:14 +02:00
Michal Čihař
0647138e7e Properly report not working sessions 
If saved session no longer contains variable we have just saved to it,
there is some problem. It's better to warn user right now than failing
later.

Fixes #13234

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 13:56:17 +02:00
Michal Čihař
436b68258d Changelog entries for #13216 and #13218 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 12:42:59 +02:00
Michal Čihař
c419aad2b9 Merge pull request #13224 from nijel/collations 
Rewite collation naming code
 2017-05-04 12:41:33 +02:00
Weblate
aa1171f24f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-04 12:25:17 +02:00
Isuru Udana Palihawadana
2bef0598c7 Translated using Weblate (Sinhala) 
Currently translated at 59.8% (1912 of 3192 strings)

[CI skip]
 2017-05-04 12:25:16 +02:00
Muḥend Belqasem
bb2373e445 Translated using Weblate (Kabyle) 
Currently translated at 2.5% (80 of 3192 strings)

[CI skip]
 2017-05-04 12:25:15 +02:00
Viktar Vauchkevich
e8c67d3c09 Translated using Weblate (Belarusian) 
Currently translated at 28.7% (917 of 3192 strings)

[CI skip]
 2017-05-04 12:25:14 +02:00
Michal Čihař
cfb66a5b9f Merge pull request #13223 from nijel/logo 
Update logo images
 2017-05-04 12:25:07 +02:00
Viktar Vauchkevich
298b431b4b Translated using Weblate (Belarusian) 
Currently translated at 25.4% (812 of 3192 strings)

[CI skip]
 2017-05-01 00:44:18 +02:00
Michal Čihař
2227f33c74 Merge pull request #13191 from udan11/fix_designer 
Fix designer
 2017-04-28 16:27:31 +02:00