Commit Graph

264 Commits

Author SHA1 Message Date
Michael Diodone
a28154a19f Merge remote-tracking branch 'upstream/master' into bug/incorrect-theme-dir-order
Synced with upstream
2014-10-22 17:05:02 +02:00
Michael Diodone
a07be37cb0 Fixed wrong order of media files copy from theme dirs (own, base -> base, own) to prevent own files being overwritten by their base counterparts 2014-10-22 17:00:13 +02:00
Dougal Matthews
e4b9ea0755 Merge pull request #130 from d0ugal/relax-requirements
Relax version requirements to accept a greater version
2014-10-22 07:31:41 +01:00
mdio
e4534236b0 Merge pull request #3 from devbliss/feature/clear-site-directory-option
Added feature: clear site directory switch
2014-10-21 10:58:51 +02:00
Dougal Matthews
b6c4ead170 Merge pull request #154 from devbliss/feature/clear-site-directory-option
Clear site directory before build
2014-10-21 09:52:55 +01:00
Michael Diodone
40d8a505c6 Fixed small typos in release notes 2014-10-21 10:32:24 +02:00
Michael Diodone
b1ade76ccd Added documentation about new --clean switch 2014-10-21 10:32:01 +02:00
Michael Diodone
fa52f6b6ea Enabled clean switch for json and gh-deploy commands as well 2014-10-21 10:30:54 +02:00
Dougal Matthews
27b3268931 Relax version requirements to accept a greater version
Fixes #104
2014-10-18 08:41:35 +01:00
mdio
d465d834aa Merge pull request #2 from devbliss/feature/clear-site-directory-option
Added feature: clear site directory switch
2014-10-17 15:45:01 +02:00
Michael Diodone
4a5d06e850 Merge remote-tracking branch 'upstream/master'
Sync with upstream
2014-10-17 15:40:47 +02:00
Michael Diodone
5d24a5c0c8 Renamed clear_directory to clean_directory 2014-10-15 11:54:46 +02:00
Michael Diodone
a4351e6eb8 Fixed flake8 error (no newline at end of file) 2014-10-15 11:28:30 +02:00
Michael Diodone
02887edd3d Added --clean switch to build command and output of stale files warning (with simple check) 2014-10-15 11:26:02 +02:00
Dougal Matthews
0f5b6e14fa Update index.md
Closes #161
2014-10-14 16:11:29 +01:00
Michael Diodone
c7c41dad73 Clear directory for json builds as well 2014-10-14 15:22:24 +02:00
Michael Diodone
7bef126d53 Removed exception handling as suggested by d0ugal 2014-10-14 15:19:59 +02:00
Michael Diodone
77eada76c4 Fixed bug in clear_directory (fails if directory does not exist) 2014-10-14 10:48:57 +02:00
Michael Diodone
7ebc019a40 Removed clear_site_dir option and made it the default behaviour 2014-10-14 10:43:49 +02:00
Michael Diodone
4cc0e9bfe7 Merge remote-tracking branch 'upstream/master' into feature/clear-site-directory-option
Synced with upstream
2014-10-14 10:34:22 +02: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
dcd90abef6 Fixed whitespace issues reported by flake8 test 2014-10-13 16:59:23 +02:00
Michael Diodone
dc62ac213c Fixed another Python 3 syntax error 2014-10-13 16:49:49 +02:00
Michael Diodone
5b99cb1b23 Fixed syntax error 2014-10-13 15:44:51 +02:00
Michael Diodone
3a01d2a64b merged before pull request to sync with upstream 2014-10-13 14:15:32 +02:00
Michael Diodone
6e58441ca9 Merge branch 'master' of github.com:devbliss/mkdocs
merged with master
2014-10-13 14:03:23 +02:00
Michael Diodone
cc77e9a786 Added option clear_site_dir to removed old files from site directory 2014-10-13 13:56:14 +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