Commit Graph

105937 Commits

Author SHA1 Message Date
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
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
Michal Čihař
37c6c987e0 Better documentation for config file
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 13:41:48 +02:00
Michal Čihař
66622b5d30 Better document distribution specific differences (taken from wiki)
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 13:32:06 +02:00
Michal Čihař
00a4899114 Incorporate suggestions from wiki
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 13:09:40 +02:00
Michal Čihař
357fbe5925 Fix links in the import/export documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 13:01:28 +02:00
Michal Čihař
c346699605 Improve import/export documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 12:55:15 +02:00
Michal Čihař
9568d75d76 Add charts documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:44:40 +02:00
Michal Čihař
cbe624d529 Document relations (moved from wiki)
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:37:16 +02:00
Michal Čihař
d14d14b52f Document prerequisite
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:28:29 +02:00
Michal Čihař
3f1004ec6f Move bookmarks information into user guid
It better fits there.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:26:52 +02:00
Michal Čihař
bc46c6d06d Improve SSL setup documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:20:26 +02:00
Michal Čihař
0b5f76065f Consistent naming of the server section
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 11:15:02 +02:00
Michal Čihař
56c9a077e8 Document that bookmakrs need configuration storage
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:51:26 +02:00
Michal Čihař
a728f819a0 Add link to PHP installer bug causing this
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:46:11 +02:00
Michal Čihař
6c209f1b12 Improve FAQ on connect errors
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:44:05 +02:00
Michal Čihař
bfebdbfaf8 Adjust file name to match current structure
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:38:57 +02:00
Michal Čihař
a24a937579 Make FAQ more generic in regard to webservers
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:37:31 +02:00
Michal Čihař
64baaf7b07 Consistent writing of bzip2/gzip
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:34:16 +02:00
Michal Čihař
829ad2cac0 Update FAQ based on wiki content
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:29:32 +02:00
Michal Čihař
88889ac88c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-04-27 10:22:13 +02:00
Michal Čihař
25caf94056 Document possible problems with php.ini
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:21:48 +02:00
Weblate
9fe4fc6fd4 Merge remote-tracking branch 'origin/master' 2016-04-27 10:15:28 +02:00
Julien ITARD
994b158b68 Translated using Weblate (French)
Currently translated at 99.5% (3196 of 3211 strings)

[CI skip]
2016-04-27 10:15:25 +02:00
Michal Čihař
af9ae1dd75 Adjust FAQ to current placement of import
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-27 10:14:51 +02:00
Weblate
49959e77be Merge remote-tracking branch 'origin/master' 2016-04-27 09:15:23 +02:00
Adam Magnier
247a311f4f Translated using Weblate (French)
Currently translated at 99.5% (3196 of 3211 strings)

[CI skip]
2016-04-27 09:15:20 +02:00