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

105983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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
Michal Čihař
bbe8efaf7c Use https for documentation links 
Fixes #12225

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-10 15:04:29 +02:00
Michal Čihař
7c6a0f8cd8 Merge branch 'QA_4_6' 2016-05-09 20:10:03 +02:00
Michal Čihař
db1c90f112 Merge commit '464b2c3ec8ab15011f9bb7bb2cda944993e58307' 2016-05-09 20:09:58 +02:00
Michal Čihař
5231649343 Merge commit 'cda4290749f10ed686bfb466b415e5e3a1c04fea' 2016-05-09 20:09:36 +02:00
Michal Čihař
c7c9918886 This todo is already done with PMA_sessionFailed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-09 19:31:10 +02:00
Lasm Gratel
464b2c3ec8 Translated using Weblate (Chinese (China)) 
Currently translated at 88.4% (2839 of 3211 strings)

[CI skip]
 2016-05-09 12:44:17 +02:00
Lasm Gratel
419455eac4 Translated using Weblate (Chinese (China)) 
Currently translated at 87.9% (2823 of 3210 strings)

[CI skip]
 2016-05-09 12:44:12 +02:00
Robin van der Vliet
683bcc9f00 Translated using Weblate (Esperanto) 
Currently translated at 15.1% (487 of 3210 strings)

[CI skip]
 2016-05-05 00:44:25 +02:00
Martin Lacina
485b4254ad Translated using Weblate (Slovak) 
Currently translated at 82.9% (2664 of 3210 strings)

[CI skip]
 2016-05-04 15:45:26 +02:00
Weblate
5d0f8af77e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-05-03 03:55:14 +02:00
Martin Lacina
477e6171e7 Translated using Weblate (Slovak) 
Currently translated at 83.3% (2677 of 3211 strings)

[CI skip]
 2016-05-03 03:55:13 +02:00
Robin van der Vliet
bcd26adc01 Translated using Weblate (Esperanto) 
Currently translated at 15.1% (485 of 3211 strings)

[CI skip]
 2016-05-03 03:55:11 +02:00
Isaac Bennetch
cda4290749 Prepare for 4.6.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-02 21:53:57 -04:00
Isaac Bennetch
07fd0bce67 4.6.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-02 17:13:27 -04:00
Michal Čihař
b2f77691e9 Use https links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:41:33 +02:00
Michal Čihař
bdb20d1499 Remove link to wiki 
It's outdated and will be soon completely disabled.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:37:32 +02:00
Michal Čihař
59e56bd63a Pass link to demo server through url.php 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:36:54 +02:00
Michal Čihař
8326aaebe5 Pass links to external sites in changelog through url.php 
This avoids possible information disclossure in the links (token).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:35:02 +02:00
Michal Čihař
d2dc9481d2 Fix possible path existence disclossure 
On non released versions (where line counts are not precalculated) it
was possible to check for file existence due to limited checks for
supplied path.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:28:32 +02:00
Isaac Bennetch
5a4af02291 Merge remote-tracking branch 'upstream/master' 2016-04-29 08:31:16 -04:00
Michal Čihař
7034681cfb Cache menu tabs 
Otherwise we fetch them with every request from the database.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 11:20:55 +02:00