webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

747 Commits

Author SHA1 Message Date
Michal Čihař
db4a2e11f4 Add suggestion for AllowRoot as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 17:26:24 +02:00
Michal Čihař
73fb08a7aa Use stable version for demo links 
Fixes #12606

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:24:03 +02:00
Michal Čihař
a8783aabec Merge branch 'QA_4_6' 2016-09-27 09:23:36 +02:00
Michal Čihař
2d316e47e1 Add missing escaping in sample regexp 
Fixes #12594

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:23:06 +02:00
Michal Čihař
8c253e91f6 Merge branch 'QA_4_6' 2016-09-26 13:36:25 +02:00
Michal Čihař
07b0f09232 Clarify documentation on ArbitraryServerRegexp 
- recommend using start/end of string in regexp
- add examples
- add note mentioning port inclusion in the match
- fixes #12511

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:35:41 +02:00
Michal Čihař
be8e64d4ea Document setting verbose name for Docker 
See https://github.com/phpmyadmin/docker/issues/54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-22 09:57:29 +02:00
Michal Čihař
3ba4c10adf Document date verification as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-22 08:47:06 +02:00
Michal Čihař
2fc2c25aaf Fix documentation to match state after PMASA-2016-54 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 15:59:42 +02:00
Michal Čihař
7982b7d28f Merge branch 'QA_4_6' 2016-09-16 11:38:54 +02:00
Michal Čihař
bd9bbc4b4d Document test removal suggestion for production usage 
Issue #12547

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:38:13 +02:00
Daniel Mossaband
be315905bd Updated file locations (#12528) 
Documentation Update after PMASA-2016-54 fix #12507

Signed-off-by: Daniel Mossaband <Daniel@Mossaband.com>
 2016-09-06 18:01:09 +02:00
Michal Čihař
001aff0e8c Remove no longer valid options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:41 +02:00
Michal Čihař
d239d6cc49 Add link to related configuration directives 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:24 +02:00
Michal Čihař
5087fc727a Revert "Remove documentation for Docker PMA_ABSOLUTE_URI" 
This reverts commit c00cc4a15a.
 2016-08-29 10:14:02 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
1099f68c1a Reintroduce PmaAbsoluteUri setting 
It has no affect yet.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:14:46 +02:00
Michal Čihař
b53fff29b2 Crossreference docs for PmaAbsoluteUri 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 14:44:21 +02:00
Michal Čihař
c1df7a9a0d Merge branch 'QA_4_6' 2016-08-17 10:40:19 +02:00
Michal Čihař
27f4ff93ee Document how to set up credentials on Docker 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 10:40:13 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Isaac Bennetch
b3d8ebad3f Prepare for 4.6.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 21:35:34 -04:00
Isaac Bennetch
b9a6a9993e Release 4.6.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-16 16:38:46 -04:00
Isaac Bennetch
0f6b76b578 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2016-08-16 16:34:37 -04:00
Michal Čihař
eec4856cb4 Merge branch 'QA_4_6' 2016-08-08 15:08:53 +02:00
Michal Čihař
3dcb219834 Simplify markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 15:08:46 +02:00
Michal Čihař
aadee00209 Document signing key for themes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 15:08:23 +02:00
Michal Čihař
2876871dd7 Merge branch 'QA_4_6' 2016-08-08 14:35:32 +02:00
Michal Čihař
12a66952a9 Use long key IDs or fingerprints to point to keys 
This is safer than short IDs, where colliscion could exist.

Fixes #12448

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 14:34:25 +02:00
Michal Čihař
6deff4131c Document docker configuration customization 
See https://github.com/phpmyadmin/docker/pull/42

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 14:31:11 +02:00
Michal Čihař
e601c7fff1 Document docker configuration customization 
See https://github.com/phpmyadmin/docker/pull/42

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 13:26:17 +02:00
Michal Čihař
0172751bf6 Merge branch 'QA_4_6' 2016-08-04 09:20:52 +02:00
Michal Čihař
4c2c562204 Suggest more secure Apache configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-04 09:20:48 +02:00
Michal Čihař
ce9914e35d Use https for link 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-03 11:05:49 +02:00
Michal Čihař
12873604cb Merge branch 'master' into master-security 2016-08-02 09:16:12 +02:00
Michal Čihař
6bfde0908d Merge pull request #12417 from Newman101/patch-1 
credits.rst - Finnish language (missing surname)
 2016-08-02 09:02:54 +02:00
Michal Čihař
1cd7b757bf Merge branch 'master' into master-security 2016-08-02 08:45:23 +02:00
Michal Čihař
ef9bd20e7a Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:33:39 +02:00
Michal Čihař
380dcad2d4 Merge commit '8d413e7ddea4d48df5fa8240c420d19ce47e56f3' 2016-08-01 16:07:58 +02:00
Isaac Bennetch
8d413e7dde Minor grammar improvements 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-01 07:10:52 -04:00
Juha
a7efa1455d Update credits.rst - Finnish language 
Hi.

My surname was missing on credit listing. 

This has been now amended. 

Thank you.
 2016-07-29 13:10:59 +01:00
Michal Čihař
aebbb31aad Merge branch 'master' into master-security 2016-07-29 14:08:23 +02:00
Michal Čihař
90498afe76 Allow to specify further parameters for control connection 
Fixes #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:38:03 +02:00
Michal Čihař
d6e85cc48d Remove wrong parts of the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:29:47 +02:00
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
d31ff5a1e7 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-28 09:43:26 +02:00
Michal Čihař
a2e6c78fb7 Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:41:52 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
298f19b3be Use https links in docs where available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:30:29 +02:00
Michal Čihař
5caabf2d1f Merge branch 'QA_4_6' 2016-07-27 17:26:41 +02:00