gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,721 Commits 12 Branches 481 Tags 2.4 GiB
92aec6922a
Commit Graph

108721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
92aec6922a Merge remote-tracking branch 'origin/master' 2017-01-25 10:03:23 +01:00
Michal Čihař
707accc2f9 Translated using Weblate (Czech) 
Currently translated at 93.7% (2997 of 3198 strings)

[CI skip]
 2017-01-25 10:03:20 +01:00
Michal Čihař
c18d2a9ced Changelog entry for #12923 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:03:08 +01:00
Michal Čihař
23af64dbeb Merge branch 'QA_4_6' 2017-01-25 10:02:31 +01:00
Michal Čihař
20a5e25fe0 Fix navigation panel server side search 
Fixes #12923

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:01:16 +01:00
Michal Čihař
6b85f6f857 Clarify documentation on limits 
- mention max_execution_time
- correctly state that post limit has to be bigger than uploaded file one

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-24 11:03:05 +01:00
Weblate
8eeef007ed Merge remote-tracking branch 'origin/master' 2017-01-24 09:51:44 +01:00
Giovanni Sora
c39ed57ab4 Translated using Weblate (Interlingua) 
Currently translated at 75.7% (2424 of 3198 strings)

[CI skip]
 2017-01-24 09:51:43 +01:00
Michal Čihař
d6b198e3fa Merge branch 'QA_4_6' 2017-01-24 09:51:25 +01:00
Michal Čihař
476649fbdc Merge commit 'c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3' 2017-01-24 09:51:01 +01:00
Michal Čihař
fa7f9f6940 Merge commit '3087a889567ecf547ac98f6c7668c67a1153f3af' 2017-01-24 09:50:06 +01:00
Michal Čihař
20aa51f601 Merge branch 'master-security' 2017-01-24 09:49:49 +01:00
Παναγιώτης Παπάζογλου
d7f28a5e84 Translated using Weblate (Greek) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-01-24 08:05:43 +01:00
Burak Yavuz
60b77eea6e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-01-24 05:16:04 +01:00
Stefano Martinelli
7d004c1ae9 Translated using Weblate (Italian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-01-24 00:58:40 +01:00
Stefano Martinelli
da40b6a757 Translated using Weblate (Italian) 
Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
 2017-01-24 00:51:33 +01:00
Weblate
4938bc223f Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-23 23:54:11 +01:00
Giovanni Sora
8d952350fa Translated using Weblate (Interlingua) 
Currently translated at 76.0% (2454 of 3226 strings)

[CI skip]
 2017-01-23 23:54:09 +01:00
Isaac Bennetch
c812bcd411 Prepare for 4.6.6 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-23 14:19:14 -05:00
Isaac Bennetch
3087a88956 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2017-01-23 14:17:09 -05:00
Domen
18f18af848 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
 2017-01-23 19:41:12 +01:00
Domen
01ba081660 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-01-23 19:40:39 +01:00
Burak Yavuz
d121c69226 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
 2017-01-23 18:33:36 +01:00
Michal Čihař
9a3ec234c5 Merge pull request #12919 from nijel/php-eol 
Replace Util::whichCrlf() with PHP_EOL
 2017-01-23 17:12:22 +01:00
Michal Čihař
55880451eb Always use \r\n as newline when editing fields 
Convert \n to \r\n during inline editing to be consistent with form submitted
value.

The internal browser representation has to be just \n while form submitted
value \r\n, see specification:

https://www.w3.org/TR/html5/forms.html#the-textarea-element

Fixes #12918

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 16:28:13 +01:00
Michal Čihař
75ad097c36 Replace Util::whichCrlf() with PHP_EOL 
It's available since PHP 5.0.2 so it's really time to use it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 15:59:52 +01:00
Michal Čihař
95a049ba39 Merge branch 'QA_4_6-security' into master-security 2017-01-23 14:27:09 +01:00
Michal Čihař
f5f496a8c1 Merge branch 'master' into master-security 2017-01-23 14:27:00 +01:00
Michal Čihař
f4023ee74e Merge branch 'QA_4_6' 2017-01-23 14:26:49 +01:00
Michal Čihař
1db25d6447 Merge branch 'QA_4_6' into QA_4_6-security 2017-01-23 14:26:35 +01:00
Michal Čihař
193323bb7c Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:26:14 +01:00
Michal Čihař
50003dcbfb Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:25:15 +01:00
Michal Čihař
eb1f277af9 Require sql-parser 4.1 to get localized messages from it 
Issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:23:03 +01:00
Michal Čihař
4b8fe37b05 Remove phpmyadmin vendor from being translated here 
Every library should handle localization on it's own.

Fixes #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:21:28 +01:00
Michal Čihař
b6468d9b8a Remove po files from sql-parser on creating tarball 
Issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:21:23 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Michal Čihař
d6adb187b2 Merge branch 'QA_4_6' 2017-01-23 13:48:22 +01:00
Kurt Eilertsen
c654a50d87 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.4% (1851 of 3222 strings)

[CI skip]
 2017-01-23 13:44:46 +01:00
Michal Čihař
b87362b7d2 Update to use shapefile 2.0 
It uses PSR-4 prefix for PhpMyAdmin namespace.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 12:56:24 +01:00
Michal Čihař
92f73acef0 Use ^ operator for motranslator version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 12:55:03 +01:00
Michal Čihař
15909c30bc Update to use motranslator 3.0 
It uses PSR-4 prefix for PhpMyAdmin namespace.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 12:33:22 +01:00
Weblate
6197170df3 Merge remote-tracking branch 'origin/master' 2017-01-23 10:46:19 +01:00
Kurt Eilertsen
47cac05712 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.9% (1846 of 3239 strings)

[CI skip]
 2017-01-23 10:46:18 +01:00
Michal Čihař
989a34dc89 Merge pull request #12914 from MPLew-is/master 
Use correct-case table name in message for successful rename
 2017-01-23 10:46:09 +01:00
Daniel Heße
d06f92de67 Translated using Weblate (German) 
Currently translated at 99.7% (3213 of 3222 strings)

[CI skip]
 2017-01-23 00:45:01 +01:00
Mike Lewis
52fa45e149 Use correct-case table name in message for successful rename 
Previously, the name returned was the name used in the request, rather
than the name after the correcting for the server’s
`lower_case_table_names` setting.

Following up on issue #12901 and @b2e2e77.

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-01-21 15:28:44 -05:00
Michal Čihař
744cf1d463 Merge branch 'QA_4_6-security' into master-security 2017-01-21 16:46:16 +01:00
Michal Čihař
be4eaf5243 Merge branch 'master' into master-security 2017-01-21 16:46:12 +01:00
Michal Čihař
3adb0eb888 Add changelog entries for security fixes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 16:45:59 +01:00