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

105311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b4267b2fac Add backlinks to configuration options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:39:11 +02:00
Michal Čihař
4e0ca4601d Document setup with Google Cloud SQL 
Document what needs to be done to connect to Google Cloud SQL.

Fixes #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:29:46 +02:00
Michal Čihař
9e2ae0c6ac Merge pull request #12193 from nijel/connect-error 
Do not hide errors from database connection attempts
 2016-04-18 16:29:26 +02:00
Michal Čihař
cfbc31bfa6 Better reporting of connection errors 
We really do not care about traceback or parameters in this case, all we
need is to display the message coming from PHP.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
951f1fed5f Add method to slice errors from the handler 
This can be useful to pop n-last errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
ea428dc860 Make ErrorHandler test more complete 
Actually test handling of stored errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
fa1d452e03 Do not hide errors from database connection attempts 
Without these errors it's impossible to figure out what went wrong in
the SSL negotiation. All you get is error 2002 without any means to
diagnose and all important information is issued as PHP warnings.

Issue #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
b204a2daa5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2970 of 3211 strings)

[CI skip]
 2016-04-18 12:46:59 +02:00
Michal Čihař
8a764f1a6e Do not hide errors from our code 
This should not emit any PHP warnings at all.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 12:16:05 +02:00
Weblate
65052df07f Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-18 11:13:51 +02:00
Rogerio Marques
1132c66eb8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2970 of 3211 strings)

[CI skip]
 2016-04-18 11:13:50 +02:00
Michal Čihař
fdec3afe1b Fix disabling SSL client verification 
Issue #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 11:12:48 +02:00
Szász Attila
1867c094d7 Translated using Weblate (Hungarian) 
Currently translated at 95.9% (3081 of 3212 strings)

[CI skip]
 2016-04-17 18:44:44 +02:00
Petr Kadlec
5480e57c4d Translated using Weblate (Czech) 
Currently translated at 94.4% (3033 of 3211 strings)

[CI skip]
 2016-04-16 12:44:19 +02:00
Guilherme
23d507af54 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2967 of 3211 strings)

[CI skip]
 2016-04-15 21:45:12 +02:00
Burak Yavuz
ac0ff3ab20 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-15 18:45:31 +02:00
Weblate
5b1759ff68 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-13 14:47:02 +02:00
Stefano Martinelli
1769091848 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-13 14:47:01 +02:00
Giovanni Sora
0e084c3486 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2364 of 3213 strings)

[CI skip]
 2016-04-13 14:47:00 +02:00
Michal Čihař
9ff296f841 Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-13 14:46:30 +02:00
Michal Čihař
e234747f67 Merge branch 'QA_4_5' into QA_4_6 2016-04-13 14:46:11 +02:00
Michal Čihař
3a981d165a Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-13 14:45:19 +02:00
Ming Tsay
45395a6eee Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.1% (3153 of 3211 strings)

[CI skip]
 2016-04-12 11:22:38 +02:00
Burak Yavuz
5ad6f3825d Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-11 21:45:28 +02:00
Isaac Bennetch
141c455d8f Minor grammar fix 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-04-07 14:59:30 -04:00
Michal Čihař
5e965bedf3 Make upgrade warning a bit more descriptive 
Issue #12164

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:55:49 +02:00
Michal Čihař
16dc45bb9d Make warning a bit stronger 
Obviously users are doing this for ages and are surprised that the old
script doesn't work with new code.

Issue #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:54:32 +02:00
Michal Čihař
0db84175b3 Update SQL parser to 95118e6db10c642a1d518e666c2aaed1b4991492 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:47:52 +02:00
Michal Čihař
659c89e464 Update SQL Parser to 8de4749d803858859fcf7a39b1bbf058745920f0 
See #12165

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 16:04:35 +02:00
Michal Čihař
7de636d826 Fix PHP error if user did unpack new version over old one 
By doing stricter check on filename, we avoid old classes which break
autoloader.

Fixes #12159

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 14:05:49 +02:00
Michal Čihař
7413208ce7 Merge pull request #12157 from nijel/ssl 
Simplify SSL setup
 2016-04-06 13:51:24 +02:00
Michal Čihař
73278068a9 Adjust tests to simplified DatabaseStructureController 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 11:29:43 +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ř
e009217f43 Fix check for system schema 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-06 10:32:28 +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ř
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ř
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ř
66c0fbd631 Simplify SSL setup 
Simplify setup to follow current PHP documentation:

- the MYSQLI_CLIENT_SSL flag should not be needed
- there is mysqli_option flag to turn of certificate verification
- remove check for defined constants, all should be there in PHP
  versions we support

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 09:57:52 +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ř
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
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
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