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

108617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
a2295f51d9 Merge commit 'c4bd5dfab45afe1aaf6edcede6108770a76fcc05' 2017-01-18 18:06:29 +01:00
Michal Čihař
71575e3d49 Changelog entry for #12876 and #12885 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 18:05:46 +01:00
Michal Čihař
82ae5abef3 Merge pull request #12885 from slimtim/issue_12876_v4 
Fix PHP notices and warning related to dbs_to_test global
 2017-01-18 18:04:49 +01:00
Michal Čihař
930086f438 Document more export configuration options 
Fixes #12903

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 17:20:33 +01:00
Michal Čihař
09d69e9f05 Changelog entry for #12834 and #12896 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 16:42:30 +01:00
Michal Čihař
bf3ba05df2 Merge pull request #12896 from MightyCupcakes/12834-central-column 
Add margin to the "add new column" text in central columns page
 2017-01-18 16:41:46 +01:00
Michal Čihař
815149c3f9 Share more of response mocking 
Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 16:32:19 +01:00
Michal Čihař
028f32da5f Share more code for reponse mocking 
Issue #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 16:14:25 +01:00
Michal Čihař
ce9f84e477 Use shared mock for response without any header 
Fixes #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 16:05:32 +01:00
Michal Čihař
ffb28560c7 Merge pull request #12879 from ragnerok/patch 
use shared response mock
 2017-01-18 10:03:39 +01:00
Michal Čihař
9b490f797f Merge pull request #12882 from CViniciusSDias/patch-1 
$param was not being used in mockResponse()
 2017-01-18 10:02:27 +01:00
Weblate
c4bd5dfab4 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-18 10:00:12 +01:00
Giovanni Sora
9b96ff3b17 Translated using Weblate (Interlingua) 
Currently translated at 75.9% (2447 of 3222 strings)

[CI skip]
 2017-01-18 10:00:10 +01:00
Michal Čihař
a4a262c52a Merge branch 'QA_4_6' 2017-01-18 09:59:55 +01:00
Michal Čihař
f1aefb1fa5 Changelog entry for #12861 and #12891 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:59:12 +01:00
Michal Čihař
89357ee0f1 Share code for getting lower_case_table_names value 
Issue #12861

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:58:29 +01:00
Mike Lewis
3bf78afeca Only convert table name to lower-case when installation forces it 
Issue #12861

A `lower_case_table_names` setting of `2` does not mean that the table needs to be forced to lower-case
This preserves case unless the `lower_case_table_names` setting is `1`, implying that lower-case should be forced

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-01-18 09:55:25 +01:00
Michal Čihař
1f8621dbb0 Merge pull request #12892 from ibennetch/12536 
Rename Relations to Relationships in many places; Fixes issue #12536
 2017-01-18 09:51:20 +01:00
Michal Čihař
2de8a2d476 Merge branch 'master' into 12536 2017-01-18 09:51:06 +01:00
Michal Čihař
eafd5a5d93 Simplify mysqli database connection 
- there is no need for _realConnect here as we call just one
  function in all cases (compared to mysql) backend
- properly pass connection flags (see #12898)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:47:47 +01:00
Michal Čihař
bda844474b Merge pull request #12902 from ibennetch/old-xls-master 
Remove dead code and strings relating to xls/xlsx import and export.
 2017-01-18 09:38:02 +01:00
Michal Čihař
9503e0f6aa Store query data in data attribute instead of HTML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:35:54 +01:00
Michal Čihař
9b4642af62 Merge remote-tracking branch 'origin/pull/12823' 2017-01-18 09:33:08 +01:00