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

106004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
44a6ae9b50 Use https when linking to php.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:13:16 +02:00
Michal Čihař
95f2d15b4f Merge branch 'QA_4_6' 2016-05-17 10:12:04 +02:00
Michal Čihař
3771852471 Use https when linking to php.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:10:13 +02:00
Michal Čihař
56b683b32d Remove session data before calling destroy 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 09:56:47 +02:00
Isaac Bennetch
4585c1785b Fix trailing spaces; this probably doesn't matter at all in the scheme of things 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-16 15:04:40 -04:00
Michal Čihař
fba1469969 Merge pull request #12250 from nijel/thememanager-singleton 
Make ThemeManager a singleton instead of storing it in the session
 2016-05-16 17:27:26 +02:00
Michal Čihař
1cd936e7b3 Remove Weblate configuration on release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:39:16 +02:00
Michal Čihař
087b54b253 Adjust Weblate setup to master branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:38:08 +02:00
Michal Čihař
b27c24064c Merge branch 'QA_4_6' 2016-05-16 11:37:49 +02:00
Michal Čihař
870a063062 Merge commit 'a57027fcd81e14283aaa8079b4af48333fc1a174' 2016-05-16 11:37:46 +02:00
Michal Čihař
90b126beed Add Weblate (wlc) configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:37:21 +02:00
Tiago França EJessica
a57027fcd8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.4% (3002 of 3211 strings)

[CI skip]
 2016-05-16 11:36:57 +02:00
Michal Čihař
fe7c881745 Add multi server example to the docs (from wiki) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:36:10 +02:00
Weblate
9404518c39 Merge remote-tracking branch 'origin/master' 2016-05-16 11:17:33 +02:00
Tiago França EJessica
ac1730a285 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2990 of 3210 strings)

[CI skip]
 2016-05-16 11:17:31 +02:00
Michal Čihař
89fc8796cd Improve docs on Debian packaging 
Based on content from the wiki.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:17:01 +02:00
Michal Čihař
a8f15e4133 Adjust test to new code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 13:15:49 +02:00
Michal Čihař
5b00ec0b05 Adjust checkbox template to generate simpler output 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 13:12:29 +02:00
Michal Čihař
62b7c2e8f7 Merge branch 'QA_4_6' 2016-05-13 13:08:48 +02:00
Michal Čihař
3686263f1d Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 13:08:38 +02:00
Michal Čihař
cb41491f44 Adjust test to no stripping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-13 11:55:52 +02:00
Michal Čihař
8deed657a2 Merge branch 'QA_4_6' 2016-05-12 15:43:24 +02:00
Michal Čihař
aa6b320f49 Remove trim parameter from Template::render 
It no longer does anything.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:43:08 +02:00
Michal Čihař
57a1d3a7ca Adjust tests to template doing no stripping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:42:57 +02:00
Michal Čihař
f904df8698 Merge branch 'QA_4_6' 2016-05-12 15:36:49 +02:00
Michal Čihař
288995ba18 Remove trimming from template renderere 
This relies on preg_replace correctly handles multibyte chars what is
not true on Windows and it then corrupts the content as it removers
parts of UTF-8 chars. Removal fixes occassional 200 errors on Windows.

Fixes #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:35:38 +02:00
Michal Čihař
0fac07105e Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 15:13:48 +02:00
Michal Čihař
f71b7df929 Remove workaround for #11705 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 14:05:01 +02:00
Michal Čihař
0432a8af70 Merge branch 'QA_4_6' 2016-05-12 14:01:26 +02:00
Michal Čihař
8396ee4a3a Fix cookie path on IIS 
The path can contain backslashes on Windows, so let's replace them
before using it as cookie path which needs just forward slashes.

Fixes #12249

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 14:00:42 +02:00
Michal Čihař
ca5eb903b0 Make ThemeManager a singleton instead of storing it in the session 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:34:25 +02:00
Michal Čihař
cc9550579c Merge branch 'QA_4_6' 2016-05-11 15:14:57 +02:00
Michal Čihař
6b8f56dffd Imporove simplification of backtrace for console 
Replace only objects, include regular items verbatim.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:14:12 +02:00
Michal Čihař
d57d4e6e5a Do not include call to _dbgQuery in backtrace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:11:37 +02:00
Michal Čihař
e52cf14ae7 Merge branch 'QA_4_6' 2016-05-11 15:03:25 +02:00
Michal Čihař
d67facb641 Avoid storing objects in session when debugging SQL 
When $cfg['DBG']['sql'] is enabled, we used to store full backtrace in
session. This includes DBI objects which then can cause problems on
session start.

Issue #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:03:15 +02:00
Michal Čihař
ea1693da03 Merge branch 'QA_4_6' 2016-05-11 13:58:00 +02:00
Michal Čihař
63c89d2e33 Fixed setting mixed case languages 
Switched to use same code in both approaches to set language.

Fixes #12118

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 13:57:22 +02:00
Michal Čihař
053b954c40 Merge branch 'QA_4_6' 2016-05-11 12:11:36 +02:00
Michal Čihař
5653a5e70e Avoid using too log URLs when getting javascripts 
Some researchers have come with great idea of recommending
setting "LimitRequestline 512" in Apache, what allows even shorter URLs
than with MSIE.

I still consider this a really bad idea as most of the applications
really do not count with so small URL limits, but this error seems to be
quite widely spread among CentOS users (probably coming from some
howto).

Fixes #12244

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 12:08:06 +02:00
Michal Čihař
06da17077c Merge branch 'QA_4_6' 2016-05-11 11:39:55 +02:00
Michal Čihař
599f1d2455 Avoid parsing non JSON responses as JSON 
This is just a changelog entry, real fix was in
d344a8f7ae.

Fixes #12240

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 11:39:10 +02:00
Michal Čihař
b24347ca8f Merge branch 'QA_4_6' 2016-05-11 11:32:36 +02:00
Michal Čihař
b3132bf2c8 Fix schema export with too many tables 
We need to submit tables in POST parameters as there can be too many of
them to be included in GET.

Fixes #12234

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 11:31:55 +02:00
Michal Čihař
d88ebebc89 Define dataType so that jQuery do not have to guess 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 10:55:45 +02:00
Michal Čihař
d344a8f7ae Do not catch HTML requests in console 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 10:55:24 +02:00
Michal Čihař
edcecdb87d Remove extra space 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 10:08:15 +02:00
Michal Čihař
efa1845e23 Merge branch 'QA_4_6' 2016-05-10 15:05:32 +02:00