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

108707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michal Čihař
1e2c24474e Merge branch 'QA_4_6' into QA_4_6-security 2017-01-21 16:45:06 +01:00
Michal Čihař
b2e2e770d9 Use server returned table name on renaming table 
Fixes #12901

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 14:57:00 +01:00
Michal Čihař
9105cff3d5 The readlink -f is not working on OS X, use pwd instead 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 13:42:44 +01:00
Michal Čihař
1361b4eac5 Do not rely on fixed build path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 13:00:42 +01:00
Michal Čihař
838419957d Merge pull request #12909 from nijel/osx 
Run Travis CI tests on OS X as well
 2017-01-21 12:57:20 +01:00
Michal Čihař
d2ade81788 Assert for language selection only in case locales are available 
Fixes #12911

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 12:46:42 +01:00
Michal Čihař
3934024061 Handle AM/PM marks in date on our own 
This is same as with months and days in week - we can not rely on the
PHP providing sane result. Also this way we can properly translate it to
all supported languages.

For example on OS X, the strftime function does not seem to respect PHP
locales and always use system ones.

Fixes #12913

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 12:33:05 +01:00
Michal Čihař
9ecda4175b Run Travis CI tests on OS X as well 
- install dependencies using brew
- manuall start MariaDB server

Issue #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 12:25:29 +01:00
Michal Čihař
9d24e4649b Do not create database if exits 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 11:40:59 +01:00
Michal Čihař
9484413e3d Specify we are using MySQL service 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 11:14:10 +01:00
Weblate
8fbe81576b Merge remote-tracking branch 'origin/master' 2017-01-21 11:06:09 +01:00
Daniel Heße
b2a19c5be9 Translated using Weblate (German) 
Currently translated at 99.4% (3221 of 3239 strings)

[CI skip]
 2017-01-21 11:06:06 +01:00
Michal Čihař
ad665e2c4b Simplify data parsing, it seems that JSON is automatically parsed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-21 11:05:44 +01:00
Michal Čihař
005a5fe6f8 Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 18:11:54 +01:00