webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
106,400 Commits 12 Branches 481 Tags
d53db00a615000e94227ccded87f2f237daa4250
Commit Graph

662 Commits

Author SHA1 Message Date
Isaac Bennetch
94192d66c7 Correct typo 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-14 13:29:30 -04:00
Michal Čihař
136b85fc97 Produce valid JSON on export 
The JSON export now generates valid JSON data, but this means that the
resulting JSON format has changed.

Fixes #12307

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 09:16:58 +02:00
Michal Čihař
c00cc4a15a Remove documentation for Docker PMA_ABSOLUTE_URI 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-10 13:50:53 +02:00
Michal Čihař
00412f9dd4 Increase timeout and retries for linkcheck 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 08:55:49 +02:00
Isaac Bennetch
727aaa45b9 Slight langauge improvement and remove extra whitespace 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-04 22:57:18 -04:00
Michal Čihař
c993509486 Improve FAQ 
Fixes #12232

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 13:50:17 +02:00
Michal Čihař
f4f4901b3b Merge pull request #12284 from ibennetch/doc12232 
FAQ 3.21 document issue unable to log in with characters such as á
 2016-06-03 13:48:42 +02:00
Isaac Bennetch
2dc895368f Enhance table_coord documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-30 09:15:00 -04:00
Isaac Bennetch
1500e4aaac FAQ 3.21 document issue unable to log in with characters such as á 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-30 08:21:10 -04:00
Michal Čihař
eea1bca501 Merge pull request #12273 from slokhorst/doc-rm-mcrypt 
Remove mcrypt mention in setup documentation
 2016-05-27 16:57:12 +02:00
Michal Čihař
a3bc2fa22e Move other articles links from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 16:28:15 +02:00
Michal Čihař
c1b147d9fa Improve controluser docs based on suggestions from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 15:42:33 +02:00
Michal Čihař
16d1464009 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-26 16:38:08 +02:00
Sebastiaan Lokhorst
e7e17420f7 Remove mcrypt mention in setup documentation 
mcrypt is no longer mentioned in the 'require' section (removed in commit 692c555c3f), so this is confusing.

Signed-off-by: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
 2016-05-25 22:15:43 +02:00
Michal Čihař
fb5da88128 Move server settings from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 18:20:45 +02:00
Michal Čihař
4dce15aac4 Incorporate upgrading instructions from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 18:06:47 +02:00
Michal Čihař
076f74d7e5 Add mbstring glossary term from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:49:16 +02:00
Michal Čihař
96e22abfff Move primary and unique key docs from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:43:20 +02:00
Michal Čihař
c39bf5a5e7 Improve storage engines description from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:36:14 +02:00
Michal Čihař
efa75c871d Retry when checking for broken links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 10:46:02 +02:00
Isaac Bennetch
499be8eca1 Correct typo with documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-22 21:55:10 -04:00
Isaac Bennetch
73fea05c60 Merge pull request #12263 from ibennetch/master 
FAQ about CSV formula injection
 2016-05-20 10:45:50 -04:00
Michal Čihař
815e67c7f1 Merge branch 'QA_4_6' 2016-05-19 10:08:30 +02:00
Michal Čihař
77998cc3a5 Link to documentation instead of PECL, this is more useful link 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-19 10:07:55 +02:00
Isaac Bennetch
fb2093402b FAQ about CSV formula injection 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-17 12:01:17 -04:00
Michal Čihař
b0f8511e60 Use https for links to www.phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:49:21 +02:00
Michal Čihař
98ad7d1ba4 Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:42:37 +02:00
Michal Čihař
05a45fe23f Use https for links to bugs.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:41:13 +02:00
Michal Čihař
1132e53f28 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:19:21 +02:00
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
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ř
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
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
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
Isaac Bennetch
5a4af02291 Merge remote-tracking branch 'upstream/master' 2016-04-29 08:31:16 -04: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
Isaac Bennetch
5a4a3e70ac Fix minor typos 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-04-28 21:11:24 -04: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
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