gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,683 Commits 12 Branches 481 Tags 2.4 GiB
319441274c
Commit Graph

105683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
319441274c Share code for getting table status 
This way it correctly respects DisableIS setting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:03:33 +02:00
Michal Čihař
6c712a3c15 Revert "Remove compatibility code with MySQL < 5.0" 
This is still needed

Fixes #12161

This reverts commit edd264c91f.
 2016-04-06 10:55:38 +02:00
Michal Čihař
fdd6d3105d Merge branch 'QA_4_6' 2016-04-06 10:39:17 +02:00
Michal Čihař
96a2e3e35a Avoid using globals for things we have as class attribute 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:39:10 +02:00
Michal Čihař
412af774ba Avoid using superglobal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:36:20 +02:00
Michal Čihař
d99c4f357d Merge branch 'QA_4_6' 2016-04-06 10:32:36 +02:00
Michal Čihař
e009217f43 Fix check for system schema 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:32:28 +02:00
Michal Čihař
298efcf139 Merge branch 'QA_4_6' 2016-04-06 10:19:37 +02:00
Michal Čihař
ec984877d8 Improve performance of database structure page 
There is no need to get full list of tables twice, it's enough to do it
in the controller itself.

Fixes #12129

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:17:56 +02:00
Michal Čihař
f58349481d Avoid destroying already initalized gettext variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:13:40 +02:00
Michal Čihař
d8d9ab421e Always set correct sub_part request 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 09:59:22 +02:00
Michal Čihař
c136a74705 Cache current user information for DBI lifetime 
We query this information quite often, so it makes sense to fetch it
only once from the MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 09:45:53 +02:00
Michal Čihař
354a434838 Merge branch 'QA_4_6' 2016-04-06 08:48:26 +02:00
Michal Čihař
51b5a236c7 Fix check for not set domain 
Fixes #12154

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 08:47:50 +02:00
Michal Čihař
69e59c5987 Fix underline 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:23:44 +02:00
Michal Čihař
c3afee6235 Merge branch 'QA_4_6' 2016-04-05 10:05:46 +02:00
Michal Čihař
1580d2fa4d Fixed SQL quoting in SQL export 
The fix for 4.5 branch was wrongly merged here.

Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:05:22 +02:00
Michal Čihař
d0c6d18bfa Merge branch 'QA_4_6' 2016-04-05 09:48:38 +02:00
Weblate
12489d9e37 Merge remote-tracking branch 'origin/master' 2016-04-05 09:26:09 +02:00
Murodjon Abduvohidov
66e7a13a04 Translated using Weblate (Uzbek) 
Currently translated at 33.1% (1062 of 3208 strings)

[CI skip]
 2016-04-05 09:26:09 +02:00
Anders Jonsson
1ca355900e Translated using Weblate (Swedish) 
Currently translated at 97.6% (3133 of 3208 strings)

[CI skip]
 2016-04-05 09:26:08 +02:00
Weblate
d2a669b832 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-05 09:26:03 +02:00
Murodjon Abduvohidov
a83a1092df Translated using Weblate (Uzbek) 
Currently translated at 33.2% (1067 of 3211 strings)

[CI skip]
 2016-04-05 09:26:03 +02:00
Anders Jonsson
810a5cb9fc Translated using Weblate (Swedish) 
Currently translated at 97.8% (3142 of 3211 strings)

[CI skip]
 2016-04-05 09:26:03 +02:00
Michal Čihař
440e2f215b Merge branch 'QA_4_6' 2016-04-05 09:25:48 +02:00
Michal Čihař
a65a4213d7 Load gettext before autoloader 
This fixes possible PHP error in SQL parser as it tries to define __()
if it's not existing. Later loading of gettext just breaks this.

Fixes #12154

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 09:24:15 +02:00
Weblate
36f744e71f Merge remote-tracking branch 'origin/master' 2016-03-31 12:41:02 +02:00
Krisztián Patai
6d8102098d Translated using Weblate (Hungarian) 
Currently translated at 94.9% (3047 of 3208 strings)

[CI skip]
 2016-03-31 12:40:59 +02:00
Madhura Jayaratne
476d9a5746 Merge branch 'QA_4_6' 2016-03-31 21:39:21 +11:00
Weblate
33e32daf17 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-31 12:37:10 +02:00
Eshin Kunishima
863d2fb4c3 Translated using Weblate (Japanese) 
Currently translated at 67.6% (2173 of 3211 strings)

[CI skip]
 2016-03-31 12:37:09 +02:00
Krisztián Patai
e0a340f107 Translated using Weblate (Hungarian) 
Currently translated at 95.1% (3056 of 3212 strings)

[CI skip]
 2016-03-31 12:37:09 +02:00
Madhura Jayaratne
6d7acf969a Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-31 21:36:58 +11:00
Madhura Jayaratne
413f66f4c2 Fix #12125 Cannot highlight a column if I scroll down from the top of the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-31 21:34:43 +11:00
Weblate
49b3dbb837 Merge remote-tracking branch 'origin/master' 2016-03-30 15:40:06 +02:00
Ricardo Crivelli
43e031aab6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.1% (2955 of 3208 strings)

[CI skip]
 2016-03-30 15:40:05 +02:00
Eshin Kunishima
a9a6a147d3 Translated using Weblate (Japanese) 
Currently translated at 67.5% (2167 of 3208 strings)

[CI skip]
 2016-03-30 15:40:04 +02:00
Isaac Bennetch
18670840c8 Merge branch 'QA_4_6' 
Fix merge conflicts in po/pt_BR.po

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-30 09:39:08 -04:00
Weblate
a1dd261603 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-29 21:32:50 +02:00
Ricardo Crivelli
cb91d94705 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (2964 of 3211 strings)

[CI skip]
 2016-03-29 21:32:49 +02:00
Isaac Bennetch
3c139e5899 Merge pull request #12141 from madhuracj/issue12132 
Fix #12132 Can not open table with JSON field
 2016-03-29 15:32:44 -04:00
Madhura Jayaratne
f4541c8da6 Fix #12132 Can not open table with JSON field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-28 22:50:20 +11:00
Madhura Jayaratne
d2125684fe Merge branch 'QA_4_6' 2016-03-28 22:19:26 +11:00
Madhura Jayaratne
61dbcafa56 JSON data type is not supported in MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-28 22:17:48 +11:00
Madhura Jayaratne
f4907d7857 Merge pull request #12136 from ibennetch/json 
Fix offering JSON datatype in incompatible MySQL versions
 2016-03-28 22:00:39 +11:00
Isaac Bennetch
a6e9314cf3 Fix offering JSON datatype in incompatible MySQL versions 
Fixes #12135

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-27 12:32:51 -04:00
Michal Čihař
686c5fe97c Merge branch 'QA_4_6' 2016-03-25 08:18:50 +01:00
Michal Čihař
43a4a042ce Fixed error in 3NF step of normalization 
Fixes #12121

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-25 08:18:36 +01:00
Michal Čihař
42a852f6b3 Merge branch 'QA_4_6' 2016-03-25 08:14:56 +01:00
Michal Čihař
57d769970e Merge pull request #12126 from ibennetch/faq-maint 
Faq maint
 2016-03-25 08:14:18 +01:00