Commit Graph

107557 Commits

Author SHA1 Message Date
Deven Bansod
7aad858dfb Merge branch 'QA_4_6'
Conflicts:
	po/el.po
	po/ko.po
2016-10-19 15:28:08 +05:30
Deven Bansod
5dbc286cd8 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-19 15:25:10 +05:30
Deven Bansod
7d0e0b3163 Add tests for validation of tablenames
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-19 15:22:06 +05:30
Deven Bansod
1eac9c5ec2 Proper initialization of $_message variable according to value of $result
While calling getDisplay, $_message should be an instance of PMA\libraries\Message.

Fix #12650

Also, spaces at the beginning of a table name are allowed if used inside backquotes.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-19 15:22:05 +05:30
Burak Yavuz
b0113ea9fa Translated using Weblate (Turkish)
Currently translated at 100.0% (3229 of 3229 strings)

[CI skip]
2016-10-19 07:31:50 +02:00
Παναγιώτης Παπάζογλου
587309a4b2 Translated using Weblate (Greek)
Currently translated at 100.0% (3218 of 3218 strings)

[CI skip]
2016-10-18 21:52:30 +02:00
Domen
916e05dca5 Translated using Weblate (Slovenian)
Currently translated at 100.0% (3229 of 3229 strings)

[CI skip]
2016-10-18 21:40:42 +02:00
Stefano Martinelli
c6453edaf7 Translated using Weblate (Italian)
Currently translated at 100.0% (3229 of 3229 strings)

[CI skip]
2016-10-18 21:33:59 +02:00
SDSkyKlouD
7c712f8f15 Translated using Weblate (Korean)
Currently translated at 79.2% (2559 of 3229 strings)

[CI skip]
2016-10-18 15:03:11 +02:00
SDSkyKlouD
9e5a1e95fe Translated using Weblate (Korean)
Currently translated at 79.8% (2561 of 3206 strings)

[CI skip]

Deleted wrong language translation ;(
2016-10-18 15:03:04 +02:00
SDSkyKlouD
34ca139578 Translated using Weblate (Korean)
Currently translated at 80.0% (2565 of 3206 strings)

[CI skip]
2016-10-18 13:59:18 +02:00
Michal Čihař
883c86aff9 Translated using Weblate (Korean)
Currently translated at 79.3% (2562 of 3229 strings)

[CI skip]
2016-10-18 13:58:02 +02:00
Michal Čihař
c35072dc71 Translated using Weblate (Korean)
Currently translated at 79.9% (2564 of 3206 strings)

[CI skip]
2016-10-18 13:57:55 +02:00
Michal Čihař
372c61527d Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 13:44:30 +02:00
Michal Čihař
6cb2b653da Merge branch 'QA_4_6' 2016-10-18 13:43:15 +02:00
Michal Čihař
610cec5495 Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 13:42:41 +02:00
Weblate
a575a90614 Merge remote-tracking branch 'origin/master' 2016-10-18 13:41:04 +02:00
Burak Yavuz
66d51962ce Translated using Weblate (Turkish)
Currently translated at 99.6% (3219 of 3229 strings)

[CI skip]
2016-10-18 13:41:04 +02:00
SDSkyKlouD
2426dfb167 Translated using Weblate (Korean)
Currently translated at 79.3% (2563 of 3229 strings)

[CI skip]
2016-10-18 13:41:03 +02:00
Giovanni Sora
972fc27021 Translated using Weblate (Interlingua)
Currently translated at 74.5% (2406 of 3229 strings)

[CI skip]
2016-10-18 13:41:02 +02:00
Weblate
b28aba3ef5 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-18 13:41:00 +02:00
SDSkyKlouD
27e7993ff3 Translated using Weblate (Korean)
Currently translated at 80.0% (2565 of 3206 strings)

[CI skip]
2016-10-18 13:40:58 +02:00
Giovanni Sora
8318d99fbc Translated using Weblate (Interlingua)
Currently translated at 74.5% (2390 of 3206 strings)

[CI skip]
2016-10-18 13:40:58 +02:00
Michal Čihař
17f0af836f Merge branch 'QA_4_6' 2016-10-18 13:40:47 +02:00
Michal Čihař
ca15fc0195 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-18 13:40:44 +02:00
Michal Čihař
19dbe4d3c9 Merge remote-tracking branch 'origin/QA_4_6' 2016-10-18 13:40:39 +02:00
Michal Čihař
4c52592fe3 Correctly localize message
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 13:40:25 +02:00
Weblate
e4878fe831 Merge remote-tracking branch 'origin/master' 2016-10-18 13:19:42 +02:00
Burak Yavuz
76f125ddca Translated using Weblate (Turkish)
Currently translated at 99.6% (3218 of 3229 strings)

[CI skip]
2016-10-18 13:19:41 +02:00
Giovanni Sora
e5c59512fa Translated using Weblate (Interlingua)
Currently translated at 73.8% (2384 of 3229 strings)

[CI skip]
2016-10-18 13:19:39 +02:00
Weblate
5b316001fe Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-18 13:19:36 +02:00
Giovanni Sora
f093e34c6c Translated using Weblate (Interlingua)
Currently translated at 73.9% (2372 of 3206 strings)

[CI skip]
2016-10-18 13:19:35 +02:00
Michal Čihař
8d52f32db9 Merge branch 'QA_4_6' 2016-10-18 13:19:26 +02:00
Michal Čihař
f05a8006ee Document Docker volumes
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 13:19:20 +02:00
Michal Čihař
8d6dec4703 Merge branch 'QA_4_6' 2016-10-18 13:16:46 +02:00
Weblate
238dbc4df6 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-18 13:12:46 +02:00
Paul Polidoro
bf5052c60e Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.3% (2993 of 3206 strings)

[CI skip]
2016-10-18 13:12:45 +02:00
Paul Polidoro
203dd98797 Translated using Weblate (Korean)
Currently translated at 80.0% (2565 of 3206 strings)

[CI skip]
2016-10-18 13:12:44 +02:00
Michal Čihař
7e2a2b457a Merge branch 'QA_4_6' 2016-10-18 13:12:30 +02:00
Michal Čihař
191bbd9575 Adjust documentation to match current Docker container
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 13:12:21 +02:00
Weblate
c7bc718511 Merge remote-tracking branch 'origin/master' 2016-10-18 12:17:32 +02:00
Paul Polidoro
07cdc14a3f Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.5% (2988 of 3229 strings)

[CI skip]
2016-10-18 12:17:31 +02:00
Paul Polidoro
79f8a418ec Translated using Weblate (Korean)
Currently translated at 79.3% (2563 of 3229 strings)

[CI skip]
2016-10-18 12:17:31 +02:00
Michal Čihař
cd56aabf80 Merge branch 'QA_4_6' 2016-10-18 12:17:20 +02:00
Michal Čihař
0c213a2a34 Fix test expectations for php.net URLs
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 12:17:06 +02:00
SDSkyKlouD
4d4d31774d Translated using Weblate (Korean)
Currently translated at 79.8% (2561 of 3206 strings)

[CI skip]
2016-10-18 11:33:39 +02:00
SDSkyKlouD
95a4dd8fe2 Translated using Weblate (Korean)
Currently translated at 79.2% (2558 of 3229 strings)

[CI skip]
2016-10-18 11:33:29 +02:00
Michal Čihař
ff607034a0 Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 11:15:02 +02:00
Michal Čihař
b675ef07eb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-18 11:14:28 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 11:13:24 +02:00