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

105962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
56e59c19f4 Add option to log executed SQL queries to syslog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 11:20:55 +02:00
Weblate
65dc25e5a6 Merge remote-tracking branch 'origin/master' 2016-04-29 10:21:50 +02:00
Chien Wei Lin
b012ab94ea Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-04-29 10:21:46 +02:00
Michal Čihař
befd937a79 Merge remote-tracking branch 'origin/QA_4_6' 2016-04-29 10:21:27 +02:00
Michal Čihař
4c95cda370 Merge branch 'QA_4_6' 2016-04-29 10:21:15 +02:00
Michal Čihař
fffe26b6fd Merge commit '13814f1006bce325a525172b5899958283f5fc20' 2016-04-29 10:21:04 +02:00
Weblate
94ec333a35 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-29 10:20:45 +02:00
Julien ITARD
5c5ba2d065 Translated using Weblate (French) 
Currently translated at 99.9% (3209 of 3211 strings)

[CI skip]
 2016-04-29 10:20:43 +02:00
Michal Čihař
2e0ed0d7c7 Changelog entry for #12208 2016-04-29 10:20:34 +02:00
Isaac Bennetch
5a4a3e70ac Fix minor typos 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-04-28 21:11:24 -04:00
Chien Wei Lin
13814f1006 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-28 05:13:06 +02:00
Weblate
db15a8cdc5 Merge remote-tracking branch 'origin/master' 2016-04-27 14:27:01 +02:00
Chien Wei Lin
15abfcc8f6 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.8% (3173 of 3211 strings)

[CI skip]
 2016-04-27 14:26:58 +02:00
Michal Čihař
2581f6decc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-04-27 14:26:47 +02:00
Michal Čihař
c6903756cb Add some clarifications to phpMyAdmin configuration storage based on wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 14:18:24 +02:00
Weblate
ed7576be4c Merge remote-tracking branch 'origin/master' 2016-04-27 14:06:13 +02:00
Chien Wei Lin
50d4d5ba0e Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 97.8% (3142 of 3211 strings)

[CI skip]
 2016-04-27 14:06:10 +02:00
Michal Čihař
9cbd60a0b0 Improve configuration docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 14:05:27 +02:00
Michal Čihař
5573f184c2 Improve auth types documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 14:01:33 +02:00
Michal Čihař
d4307a6693 Clarify PmaAbsoluteUri docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 13:50:32 +02:00
Michal Čihař
77fec5e8bc Improve sample config description 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 13:45:34 +02:00