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

108598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
70c3918a6e Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:30:55 +01:00
Weblate
c6d6924016 Merge remote-tracking branch 'origin/master' 2017-01-18 04:30:20 +01:00
Giovanni Sora
c99e070642 Translated using Weblate (Interlingua) 
Currently translated at 76.1% (2465 of 3239 strings)

[CI skip]
 2017-01-18 04:30:17 +01:00
Isaac Bennetch
9356565840 Archive 2016 ChangeLog entries to the history repository 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 22:28:04 -05:00
Isaac Bennetch
583e5e660a Remove dead code and strings relating to xls/xlsx import and export. 
This code was removed in 3.4.5.0 but some strings and tests remained.

Fixes #12742

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 22:01:45 -05:00
Weblate
179a86b2d3 Merge remote-tracking branch 'origin/master' 2017-01-17 20:14:15 +01:00
Sevdimali İsa
ca2b056229 Translated using Weblate (Azerbaijani) 
Currently translated at 52.8% (1711 of 3239 strings)

[CI skip]
 2017-01-17 20:14:11 +01:00
Isaac Bennetch
e1276e8eb4 Fix merge conflicts removing dead code 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:13:07 -05:00
Weblate
f4c620bcf2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-17 20:12:08 +01:00
Sevdimali İsa
575f34953d Translated using Weblate (Azerbaijani) 
Currently translated at 53.3% (1718 of 3222 strings)

[CI skip]
 2017-01-17 20:12:05 +01:00
Isaac Bennetch
f1375a26a3 Remove dead code related to 4a2695c 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:10:24 -05:00
Tim McLaughlin
18d48bb20f Merge branch 'QA_4_6' into issue_12876_v4 2017-01-17 12:00:38 -05:00
Michal Čihař
5c3f74d875 Merge branch 'QA_4_6' 2017-01-17 17:22:53 +01:00
Michal Čihař
dfa8b7e9d8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-01-17 17:22:42 +01:00
Michal Čihař
eb2898527f Changelog entry for #12495 and #12875 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-17 17:22:21 +01:00
Michal Čihař
e21b4f998e Merge remote-tracking branch 'origin/pull/12875' into QA_4_6 2017-01-17 17:21:52 +01:00
Isaac Bennetch
9f2b39258a Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 11:06:52 -05:00
Isaac Bennetch
5fe0010c4e Merge commit 'a0e0eea' 2017-01-17 11:05:26 -05:00
Isaac Bennetch
986035a716 Add ChangeLog entry for issue 12831 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 10:51:47 -05:00