Commit Graph

241 Commits

Author SHA1 Message Date
Michael Diodone
4a5d06e850 Merge remote-tracking branch 'upstream/master'
Sync with upstream
2014-10-17 15:40:47 +02:00
Dougal Matthews
0f5b6e14fa Update index.md
Closes #161
2014-10-14 16:11:29 +01:00
Dougal Matthews
410742cdaa Merge pull request #158 from d0ugal/documentation-updates
Documentation updates
2014-10-14 08:32:44 +01:00
Tom Christie
ba0efd5e9c Merge pull request #160 from ericholscher/fix-rtd-unnested
Fix RTD theme toc when pages don't have children.
2014-10-14 07:27:10 +01:00
Tom Christie
867752b747 Merge pull request #157 from d0ugal/LICENSE
Add BSD license file
2014-10-14 07:26:37 +01:00
Eric Holscher
3d679f1749 Link to RTD footer 2014-10-13 16:38:44 -07:00
Eric Holscher
fb21ba5801 Fix RTD theme toc when pages don't have children. 2014-10-13 16:30:32 -07:00
Dougal Matthews
eb3a153820 Add a note about supported Python versions 2014-10-13 21:29:55 +01:00
Dougal Matthews
a3507d28b4 Add BSD license file 2014-10-13 21:23:34 +01:00
Dougal Matthews
5d4b918c49 Remove Lorem ipsum 2014-10-13 21:23:01 +01:00
Dougal Matthews
d45288b56d Updated docs for multiple theme directories
Originally changed in 8f3c2b0.
2014-10-13 21:16:47 +01:00
Dougal Matthews
e08eb91d28 Django Rest -> MkDocs
Oops.
2014-10-13 20:45:54 +01:00
Michael Diodone
6e58441ca9 Merge branch 'master' of github.com:devbliss/mkdocs
merged with master
2014-10-13 14:03:23 +02:00
Dougal Matthews
b09c817e50 Merge pull request #145 from d0ugal/template-override
Support multiple template directories
2014-10-10 15:37:09 +01:00
Dougal Matthews
45e0def4b0 Updated notes 2014-10-10 15:35:31 +01:00
Dougal Matthews
3ac7ae00bc Improve the tox coverage output 2014-10-10 15:29:14 +01:00
Dougal Matthews
8f3c2b0b27 Support multiple template directories
theme_dir is now a list which contains the user provided directory if
given plus the packaged theme directory.

Fixes #129
2014-10-10 15:29:14 +01:00
mdio
f9b60d5d83 Merge pull request #1 from tomchristie/master
Merge updates from origin
2014-10-10 15:31:01 +02:00
Dougal Matthews
bc7782b362 Merge pull request #148 from d0ugal/image-fix
Fix image paths in non-index markdown files
2014-10-10 10:12:27 +01:00
Dougal Matthews
3613051f02 Merge pull request #149 from d0ugal/release-notes
Initial release notes
2014-10-09 18:35:51 +01:00
Dougal Matthews
72d884e5d7 Merge pull request #151 from d0ugal/master
Updated classifiers for PyPI
2014-10-09 18:35:47 +01:00
Dougal Matthews
7df0c9c283 Updated classifiers for PyPI 2014-10-09 09:47:58 +01:00
Dougal Matthews
e1366d0a18 Initial release notes 2014-10-09 09:47:38 +01:00
Dougal Matthews
f437ab0585 Added a fix for Python2.6 2014-10-09 09:29:53 +01:00
Dougal Matthews
afc1f2863e Add the json run to Travis 2014-10-09 07:35:17 +01:00
Eric Holscher
b14c834114 Default json to false 2014-10-08 20:17:37 -07:00
Eric Holscher
77a29a73bc Added to help output, and included a tox command 2014-10-08 17:39:04 -07:00
Eric Holscher
e82131cc69 Add a `mkdocs json` that builds a site in json. 2014-10-08 17:34:04 -07:00
Dougal Matthews
157fc7a232 Added missing command from the help output 2014-10-08 12:18:59 +01:00
Dougal Matthews
d9e50170a4 Fix image paths in non-index markdown files
Fixes #138
2014-10-08 12:18:08 +01:00
Dougal Matthews
f2bee586bb Verify that parents isn't empty before popping
If the first iteration of the loop isn't a match then parents will be an
empty list.
2014-10-08 07:58:56 +01:00
Dougal Matthews
7c66b5bc71 Fix a typo in the use_directory_urls config name 2014-10-07 10:13:33 +01:00
Dougal Matthews
cc2310ff2a Merge pull request #64 from thiagomael/master
Fixed issue #63 - `use_directory_urls` option has no effect.
2014-10-07 10:04:24 +01:00
Dougal Matthews
8c1b96ca51 Show coverage for the docs building 2014-10-06 18:13:58 +01:00
Dougal Matthews
6d3c5eccda Added links to Python and pip. 2014-10-06 18:09:00 +01:00
Dougal Matthews
dced02f405 Merge pull request #125 from d0ugal/travis-updates
Use Tox to run the tests on Travis
2014-10-03 10:37:53 +01:00
Dougal Matthews
fa8566a1a1 Removed flake8 exclusion that wasn't needed 2014-10-01 20:02:04 +01:00
Dougal Matthews
ac4a900e5e Use Tox to run the tests on Travis
Rather than repeating the steps in the Travis config, use Travis to run
tox. This has the added benifit of verifying the setup.py install into a
virtualenv.
2014-10-01 16:50:33 +01:00
Dougal Matthews
56de70a4b1 Merge pull request #135 from dnrce/extra-media-whitespace
Improve whitespace around css and script tags
2014-10-01 15:23:36 +01:00
Dougal Matthews
09f318c27e Merge pull request #134 from dnrce/bug/133-wrong-extra-media-paths
Avoid repeated overwrites of config['extra_*']
2014-10-01 09:09:36 +01:00
Dougal Matthews
745b7d0560 Merge pull request #90 from jimporter/extra-css
Add support for extra_css and extra_javascript in all the themes
2014-10-01 08:54:45 +01:00
Dougal Matthews
d5b968fe2d Merge pull request #136 from jimporter/config-var
Remove reference to the `config` variable in the template files for custom themes
2014-10-01 08:47:30 +01:00
Dan Rice
73da53038b Avoid repeated overwrites of config['extra_*']
Fixes #133
2014-09-12 19:20:20 -04:00
Jim Porter
6c33fe80b6 Add support for extra_css and extra_javascript in all the themes 2014-09-12 16:51:51 -05:00
Jim Porter
bb8d62d41f Remove reference to the config variable in the template files 2014-09-02 19:05:51 -05:00
Dan Rice
91ca05943a Improve whitespace around css and script tags 2014-09-02 18:42:48 -04:00
Tom Christie
80c9b2842c Merge pull request #121 from edbrannin/windows-paths
Fix path-handling on Windows
2014-08-21 15:49:36 +01:00
Dougal Matthews
ddf9350224 Merge pull request #124 from ryanneufeld/fix-gh-110
Update the menu/toc to support the new nav code changes.
2014-08-21 08:19:48 +01:00
Dougal Matthews
83ed147129 Merge pull request #122 from edbrannin/windows-command
Fix "mkdocs" command creation in Windows
2014-08-20 21:49:55 +01:00
Ryan Neufeld
4149befa64 Update the menu/toc to support the new nav code changes.
fixes gh-110
2014-08-18 18:28:04 -07:00