centersl/mkdocs
1
0
Fork 0
mirror of https://github.com/mkdocs/mkdocs.git synced 2026-03-27 09:58:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
200 Commits 21 Branches 61 Tags
ac4a900e5e216bf54f76fad31632db062b20d700
Commit Graph

200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Christie
bd55377b2e Merge pull request #92 from ericholscher/master 
Detect absolute URL’s in the extra_* path.
 2014-08-18 18:54:11 +01:00
Eric Holscher
966bcf7b2a Update the mkdocs theme. 2014-08-18 09:38:15 -07:00
Ed Brannin
adee80945d flake8 fixes in main.py (How did this ever pass?) 2014-08-17 00:23:18 -04:00
Ed Brannin
9202ffdff8 Updated setup.py to use entry_points['console_scripts'] instead of scripts. 
This makes a "mkdocs" command on Windows/OSX/Linux without any platform-specific code in setup.py.

I think this is the preferred way to install a Python command with setuptools.

It is, at least, the method used by:

* [flake8](8ee94d1eee/setup.py)
* [coverage.py](ca875e7390/setup.py)
* [Fabric](https://github.com/fabric/fabric/blob/master/setup.py)
* Many others

In the past, I had to change imports willy-nilly or add
"from __future__ import absolute_imports" to a bunch of files.
This is because I was renaming "mkdocs" to "mkdocs.py" instead of "main.py",
and the module-vs-script name clash was confusing imports from other files.
 2014-08-17 00:01:45 -04:00
Ed Brannin
90d8710478 Windows: Use posixpath in nav.FC.make_absolute() 
nav.FileContext.make_absolute() is only used to compare
links to entries in mkdocs.yml, so it makes sense for it
to only use POSIX-style paths.

Without this, the site fails to build because it checks for
a Windows-style path in a list of POSIX paths in
build.PathToURL.__call__().

This is the last change required to build the mkdocs site
on Windows.
 2014-08-16 23:42:04 -04:00
Ed Brannin
41f484c9e5 Windows: Don't use os.path.join() for URL paths. 2014-08-16 23:42:04 -04:00
Eric Holscher
ea34ccd7c7 Fix whitespace 2014-08-16 16:49:05 -07:00
Eric Holscher
4f8baf94d9 Import from compat 2014-08-16 12:48:18 -07:00
Eric Holscher
c86ccb2358 Fix python 3 compat 2014-08-14 17:14:42 -07:00
Eric Holscher
7c6dc4b181 Use urlparse and display text correctly 2014-08-14 17:08:47 -07:00
Eric Holscher
96f54b0267 More whitespace 2014-08-14 17:08:47 -07:00
Eric Holscher
4bd091b825 Fix whitespace 2014-08-14 17:08:47 -07:00
Eric Holscher
dc84d21435 Add ability to include third party URLs in extra_* 2014-08-14 17:08:47 -07:00
Dougal Matthews
db0644dacf Merge pull request #74 from sampsyo/master 
Configurable Markdown extensions
 2014-08-12 14:59:44 +01:00
Dougal Matthews
189625cfc8 Merge pull request #103 from sloria/python3 
Added support for Python 3.3 and 3.4.
 2014-08-11 08:39:09 +01:00
sloria
f35f91fce2 Import print_function in build.py 2014-08-10 15:12:10 -04:00
Dougal Matthews
7d4ef4cb77 Merge pull request #118 from rlabrecque/patch-1 
Updated license.md with theme license links
 2014-08-10 18:52:01 +01:00
Riley Labrecque
25047f04fe Updated docs/about/license.md with theme license links 2014-08-10 05:40:15 -06:00
sloria
57f0ceb111 Prevent ResourceWarning due to unclosed file 2014-08-09 20:22:48 -04:00
sloria
25188f0a5b Add future import; remove unnecssary lines in compat.py 2014-08-09 20:18:53 -04:00
sloria
dac0d4b748 Fix unquote compatibility 2014-08-09 20:18:53 -04:00
sloria
9334d6b05c Fix a few encoding errors 2014-08-09 20:18:06 -04:00
sloria
5fe3c93476 Fix httpserver and socketserver compatibility with py3 2014-08-09 20:18:06 -04:00
sloria
6ff32de768 Fix ordering of imports as per the project's conventions 
Always order imports alphabetically
 2014-08-09 20:17:08 -04:00
sloria
05dc58bfcc Minor style fixes as per @tomchristie's code review 2014-08-09 20:17:08 -04:00
sloria
69213ae658 Fix all py3 syntax errors; All tests passing 2014-08-09 20:17:08 -04:00
sloria
8a2fb34368 Fix urlparse py2/3 compatiblity in build.py and config.py 2014-08-09 20:15:11 -04:00
sloria
20eda86df7 Add python 2/3 compatibility module 2014-08-09 20:15:10 -04:00
sloria
1b3ffd76a0 Test against py33 and py34 2014-08-09 20:15:10 -04:00
Adrian Sampson
4489a04cc9 Fix comment copypasta error 2014-08-08 14:58:13 -07:00
Adrian Sampson
c82f55e6fb Add test for duplicated custom extension names 2014-08-08 14:57:19 -07:00
Adrian Sampson
38210c714a Add test for extension enabling 
I didn't use the SmartyPants extension here because the version of
python-markdown pinned here (2.3.1) doesn't include the extension. 2.4 does;
maybe the project should consider updating this dependency.
 2014-08-08 14:57:19 -07:00
Adrian Sampson
4e66ed6ce9 Fix crash when markdown_extensions is not set 
This lets the value be a tuple as well as a list. (Never really understood why
Python won't concatenate lists and tuples.)
 2014-08-08 14:57:19 -07:00
Adrian Sampson
c60b3b6dcf Add docs for markdown_extensions 2014-08-08 14:57:19 -07:00
Adrian Sampson
f33b1b1928 Configurable Markdown extensions 
This lets the YAML configuration specify a list of Python Markdown extensions
to enable (on top of the default set). This is especially handy, for example,
when you want nice typography via the SmartyPants extension.
 2014-08-08 14:57:19 -07:00
Dougal Matthews
49c81a6009 Merge pull request #117 from d0ugal/master 
Add building docs as an integration test
 2014-08-08 22:29:33 +02:00
Dougal Matthews
2fc3bd2dde Add building docs as an integration test 2014-08-08 21:08:46 +01:00