gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,923 Commits 12 Branches 481 Tags 2.4 GiB
5ae4fdfcff
Commit Graph

107923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f05a8006ee Document Docker volumes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:19:20 +02:00
Michal Čihař
8d6dec4703 Merge branch 'QA_4_6' 2016-10-18 13:16:46 +02:00
Weblate
238dbc4df6 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-18 13:12:46 +02:00
Paul Polidoro
bf5052c60e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2993 of 3206 strings)

[CI skip]
 2016-10-18 13:12:45 +02:00
Paul Polidoro
203dd98797 Translated using Weblate (Korean) 
Currently translated at 80.0% (2565 of 3206 strings)

[CI skip]
 2016-10-18 13:12:44 +02:00
Michal Čihař
7e2a2b457a Merge branch 'QA_4_6' 2016-10-18 13:12:30 +02:00
Michal Čihař
191bbd9575 Adjust documentation to match current Docker container 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:12:21 +02:00
Weblate
c7bc718511 Merge remote-tracking branch 'origin/master' 2016-10-18 12:17:32 +02:00
Paul Polidoro
07cdc14a3f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.5% (2988 of 3229 strings)

[CI skip]
 2016-10-18 12:17:31 +02:00
Paul Polidoro
79f8a418ec Translated using Weblate (Korean) 
Currently translated at 79.3% (2563 of 3229 strings)

[CI skip]
 2016-10-18 12:17:31 +02:00
Michal Čihař
cd56aabf80 Merge branch 'QA_4_6' 2016-10-18 12:17:20 +02:00
Michal Čihař
0c213a2a34 Fix test expectations for php.net URLs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:17:06 +02:00
SDSkyKlouD
4d4d31774d Translated using Weblate (Korean) 
Currently translated at 79.8% (2561 of 3206 strings)

[CI skip]
 2016-10-18 11:33:39 +02:00
SDSkyKlouD
95a4dd8fe2 Translated using Weblate (Korean) 
Currently translated at 79.2% (2558 of 3229 strings)

[CI skip]
 2016-10-18 11:33:29 +02:00
Michal Čihař
ff607034a0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 11:15:02 +02:00
Michal Čihař
b675ef07eb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-18 11:14:28 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links 
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 11:13:24 +02:00
Weblate
476d4f8fcc Merge remote-tracking branch 'origin/master' 2016-10-18 11:11:41 +02:00
SDSkyKlouD
712ad621fd Translated using Weblate (Korean) 
Currently translated at 79.5% (2560 of 3219 strings)

[CI skip]
 2016-10-18 11:11:39 +02:00
Michal Čihař
4747bdadeb Merge pull request #12645 from nijel/linkcheck 
Add documentaton checks to be executed in Travis CI
 2016-10-18 11:11:13 +02:00
Michal Čihař
11fcf44078 Merge branch 'QA_4_6' 2016-10-18 10:48:11 +02:00
Michal Čihař
9de117ffed Changelog entry for #12647 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:47:43 +02:00
Michal Čihař
10a2eedeb2 Merge pull request #12647 from devenbansod/fix_12533 
Use justBrowsing only if outputting the results from a single table
 2016-10-18 10:46:16 +02:00
Michal Čihař
8051ae981b Install requests[security] for SNI support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:41:47 +02:00
Michal Čihař
55c30edf99 Fix headline 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:27:54 +02:00
Michal Čihař
098ac12b9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-18 10:27:23 +02:00
Michal Čihař
855899628a Specify we are using MySQL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:34 +02:00
Michal Čihař
fffbcd1969 Avoid using non breakable space in code samples 
- It's not possible to copy and paste it then
- It's not possible to use syntax highlighting on these

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
21beba716a Fix missing references in docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
4fc27b8e8e Compatibility with Sphinx 1.4 
See https://github.com/sphinx-doc/sphinx/issues/2673

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
b10e57099d Add documentation checks to be executed in Travis CI 
- Validate all internal references
- Validate parse errors
- Validate external links

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
ece3dd04fb Remove deprecated --dev from composer calls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:17:54 +02:00
Michal Čihař
7642280aa1 Disable runkit install for PHP 7.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:16:43 +02:00
Deven Bansod
3a785fb07f Fix typos in faq 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-18 13:16:16 +05:30
Michal Čihař
978538dce8 Use http_response_code to set response code 
Fixes #12646

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 09:17:55 +02:00
Michal Čihař
d4c3d283ca Document Wordfence problems 
Fixes #12628

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 09:10:27 +02:00
Deven Bansod
1d70d34a46 Merge branch 'QA_4_6' 2016-10-18 11:24:22 +05:30
Deven Bansod
c7aa10e266 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-18 11:23:09 +05:30
Deven Bansod
9880f57344 Fix incorrect clause generation in getting ForeignData if LIMIT provided 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-18 11:10:47 +05:30
Michal Čihař
1aee86a4fe Remove the nopasswd setting 
It does nothing since removal of related feature in
53f541af86.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:20:54 +02:00
Michal Čihař
0e03ffdb76 Merge branch 'QA_4_6' 2016-10-17 17:13:31 +02:00
Michal Čihař
307dd63354 ChangeLog entry for #12472 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:13:25 +02:00
Michal Čihař
6a4cf7b1ec Merge pull request #12631 from devenbansod/fix_12472 
Fix order of testing DBConnection with different parameters in Config method
 2016-10-17 17:12:40 +02:00
Michal Čihař
4311ea09d9 Merge branch 'QA_4_6' 2016-10-17 17:03:12 +02:00
Michal Čihař
d47956461f Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 2016-10-17 17:02:25 +02:00
Michal Čihař
62b6e640fc Merge branch 'QA_4_6' 2016-10-17 17:01:18 +02:00
Michal Čihař
153d6ca4f0 Merge remote-tracking branch 'origin/QA_4_6' 2016-10-17 17:01:15 +02:00
Michal Čihař
198e257da4 Merge commit '57451f31c8ef8ba0d9dd695dd9004dbdaec2e10c' 2016-10-17 17:01:06 +02:00
Michal Čihař
d6680545ff ChangeLog entry for #12632 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:00:42 +02:00
Weblate
0b59c6283e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 16:59:52 +02:00