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

108640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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
Michal Čihař
bc1048a580 Ensure expected global variables are set 
This probably happens only in tests in some specific setup.

Fixes #12910

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 17:40:08 +01:00
Michal Čihař
28406154ab Revert "Do not try to unset not set array" 
This reverts commit 1a72482ec4.
 2017-01-20 17:40:08 +01:00
Michal Čihař
278836ea69 Merge pull request #12907 from ShreyasSinha/refactorcreateelement 
Using CreateElement for adding HTML
 2017-01-20 17:36:12 +01:00
Shreyas Sinha
3c2c39267c
Requested Changes 
Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-01-20 21:45:17 +05:30
Michal Čihař
3d056bc49f Do not execute tearDown if not configured 
Apparently the tearDown method can be executed for skipped tests in some
cases and it will fail due to failed initilization.

Fixes #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 16:29:55 +01:00
Michal Čihař
c2fbfc148b Merge branch 'QA_4_6' 2017-01-20 16:25:34 +01:00
Michal Čihař
593f71dd23 Fixed filtering for active processes 
There are dozen of process states when executing the query, we can't
filter just for one of them. Let's rather exclude those without state
and are idling.

See also http://dev.mysql.com/doc/refman/5.7/en/general-thread-states.html

Fixes #12732

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 16:24:34 +01:00
Michal Čihař
1a72482ec4 Do not try to unset not set array 
Issue #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 14:18:27 +01:00
Michal Čihař
c61d5d8f60 Merge branch 'QA_4_6' 2017-01-20 14:06:21 +01:00
Michal Čihař
e7928e58cc Update SQL parser to 3.4.17 
Fixes #12894

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 14:06:06 +01:00
Michal Čihař
1d732ed4b0 Use consistent numeric format for table overhead 
Using 4 digits is not really consistent with rest of the UI.

Basically this reverts 0f74231.

Fixes #12897

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 13:35:56 +01:00
Michal Čihař
c81a10f528 Merge branch 'QA_4_6' 2017-01-20 13:19:54 +01:00
Michal Čihař
827ff5715a Fix database search with newer php-gettext 
We really need integer from count query.

Fixes #12881

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 13:19:24 +01:00
Shreyas Sinha
756c6552c2 Using CreateElement for adding HTML 
Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-01-20 11:17:03 +05:30
Isaac Bennetch
8a805fde91 Be more direct about syslog documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-19 22:38:35 -05:00
Weblate
a0b0d0e94a Merge remote-tracking branch 'origin/master' 2017-01-20 04:05:23 +01:00
Flavio Coelho
728fc18c2b Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1737 of 3239 strings)

[CI skip]
 2017-01-20 04:05:21 +01:00
Isaac Bennetch
611a644243 Merge commit '9d3c265' 2017-01-19 22:04:30 -05:00
Isaac Bennetch
8bfd773248 Merge and fix conflicts from 3b07b39 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-19 22:03:05 -05:00
Weblate
9d3c265adc Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-20 03:47:53 +01:00
Flavio Coelho
206a59007a Translated using Weblate (Portuguese) 
Currently translated at 54.0% (1740 of 3222 strings)

[CI skip]
 2017-01-20 03:47:52 +01:00
Isaac Bennetch
f2cdfc5d00 Merge pull request #12884 from slimtim/issue_12840_v2 
Fix PHP Notice 'Undefined index: row_format' when altering table options
 2017-01-19 21:47:42 -05:00
Michal Čihař
ac660eacc4 Merge branch 'QA_4_6' 2017-01-18 18:06:41 +01:00