aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #311 from mitya57/masterWaylan Limberg2014-05-263-8/+15
|\ | | | | Make smarty extension work together with attr_list
| * Make smarty extension use its own InlineProcessorDmitry Shachnev2014-05-261-5/+11
| |
| * Make it easier to override list of inline patterns for InlineProcessorDmitry Shachnev2014-05-261-2/+3
| |
| * Add smarty to extensions for attr_list testDmitry Shachnev2014-05-061-1/+1
| | | | | | | | To make it easier to notice (and fix) the failure.
* | Support extensions as modules.Waylan Limberg2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #300. When a python module (.../__init__.py) is imported by `__import__` and the `from_list` argument is a unicode string (as is returned by rpartition), then an error is raised in Python 2.7. Force conversion to default string type (byte in 2.7 and unicode in 3) to avoid the error. For a full explaination, see issue [300](https://github.com/waylan/Python-Markdown/issues/300).
* | Upped version to 2.4.12.4.1-finalWaylan Limberg2014-05-221-1/+1
| |
* | Merge pull request #310 from ryneeverett/issue308Waylan Limberg2014-05-224-23/+30
|\ \ | |/ |/| Fix issue308 and fix (unrelated) failure to break out of nest loop.
| * Fix issue308 and fix (unrelated) failure to break out of nest loop.ryneeverett2014-05-214-23/+30
|/
* Skip a weird PHP test.Waylan Limberg2014-04-201-0/+4
| | | I can't make out what this PHP test is trying to accomplish. From my point of view, our output is fine. So we skip this test.
* No assertIs in Python 2.6. Fixes #294Waylan Limberg2014-04-201-1/+1
|
* Merge pull request #306 from brownhead/masterWaylan Limberg2014-04-201-5/+8
|\ | | | | Emphasized proper use of reset method in docs.
| * Emphasized proper use of reset method in docs.John Sullivan2014-04-191-5/+8
|/ | | | This is related to waylan/Python-Markdown#305.
* Added some badges to the READMEWaylan Limberg2014-03-241-1/+5
| | | Using shields.io for generating badges.
* Update .travis.ymlWaylan Limberg2014-03-241-0/+3
| | | Add install of libtidy dependancy. Forgot about that.
* Add .travis.yml fileWaylan Limberg2014-03-241-0/+10
| | | | | | | | | Just uses the existing tox config as described in <http://borntyping.com/posts/tox-and-travis-ci.html>. This fixes #299. I took this route rather than @mitya57's suggestion because we get better test coverage with tox's config (more dependencies are installed) and I can't see mirroring that here when we can just reuse it.
* Merge pull request #296 from mitya57/smarty-fixesWaylan Limberg2014-03-131-4/+4
|\ | | | | Smarty extension fixes
| * smarty: Fix test failure with Python 3.1 and 3.2. Fixes #295Dmitry Shachnev2014-03-111-1/+1
| |
| * smarty: Pass tuples, not iterable strings to the pattern.Dmitry Shachnev2014-03-111-3/+3
|/
* Merge pull request #293 from martinmaillard/fix-reference-typoWaylan Limberg2014-03-031-1/+1
|\ | | | | Fix typo in reference.txt
| * Fix typo in reference.txtMartin Maillard2014-03-031-1/+1
|/
* Merge pull request #292 from Dav1dde/masterWaylan Limberg2014-03-021-1/+1
|\ | | | | added nav-tag as block level element. Fixes #191. Thanks @Dav1dde
| * added nav-tag as block level elementDavid2014-03-021-1/+1
|/
* Upped version to 2.4 final.2.4-finalWaylan Limberg2014-02-162-2/+2
|
* Cleaned up some minor issues with recent changes to docs.Waylan Limberg2014-02-168-36/+55
|
* Merge pull request #288 from lahwaacz/masterWaylan Limberg2014-02-1620-306/+320
|\ | | | | docs: improved documentation
| * docs: capitalization fixes, plural fixes, small wording improvementsJakub Klinkovský2014-02-1517-54/+56
| |
| * docs: update wikilinks documentationJakub Klinkovský2014-02-151-38/+24
| |
| * docs: update toc documentationJakub Klinkovský2014-02-151-30/+43
| |
| * docs: update smarty documentationJakub Klinkovský2014-02-151-19/+10
| |
| * docs: update sane_lists documentationJakub Klinkovský2014-02-151-12/+4
| |
| * docs: update nl2br documentationJakub Klinkovský2014-02-151-3/+15
| |
| * docs: update meta_data documentationJakub Klinkovský2014-02-151-14/+25
| |
| * docs: update header_id documentationJakub Klinkovský2014-02-151-10/+16
| |
| * docs: update codehilite documentationJakub Klinkovský2014-02-151-67/+72
| |
| * docs: improved documentation of the extra/ extensionsJakub Klinkovský2014-02-158-79/+75
|/ | | | | | Simplified, unified style, added some undocumented options. NOTE: Footnotes/UNIQUE_IDS stays mostly undocumented
* Merge pull request #287 from mitya57/masterWaylan Limberg2014-02-136-57/+58
|\ | | | | Release Notes and a fix for Smarty
| * smarty: Get rid of canonicalize() function.Dmitry Shachnev2014-02-131-51/+16
| | | | | | | | | | | | | | | | The previous problem happened because canonicalize() removed the space from closeClass regexp. Instead of fixing the function, get rid of it completely. It should also make module load a bit faster.
| * Add a (failing) test for Smarty extension.Dmitry Shachnev2014-02-132-1/+3
| |
| * Updated version 2.4 release notes.Dmitry Shachnev2014-02-133-5/+39
|/
* Merge pull request #285 from mitya57/masterWaylan Limberg2014-02-122-2/+2
|\ | | | | Fix some tests failures
| * Fix some tests failuresDmitry Shachnev2014-02-122-2/+2
|/
* Merge pull request #284 from eichin/patch-2Waylan Limberg2014-02-111-1/+1
|\ | | | | typo
| * typoMark Eichin2014-02-111-1/+1
|/ | | chaining calls, not changing calls
* Merge pull request #282 from llbit/patch-1Waylan Limberg2014-02-061-1/+1
|\ | | | | Pedantic edit in installation instructions
| * Pedantic edit in installation instructionsJesper Öqvist2014-02-061-1/+1
|/ | | Fixed "you're"/"your" mixup. Sorry.
* No longer restrict INLUNE_PLACEHOLDER to 4 digits.Waylan Limberg2014-02-021-1/+1
| | | | | | This was limiting the parser to only 10,000 placeholders (0-9999) per document. removing this limitation allows longer documents ot be parsered correctly. Fixes #255.
* Merge branch 'master' of github.com:waylan/Python-MarkdownWaylan Limberg2014-01-124-0/+27
|\
| * Merge pull request #267 from ryneeverett/attr_list-tablesWaylan Limberg2014-01-114-0/+27
| |\ | | | | | | tables and attr_list compatibility
| | * tables_and_attr_list testryneeverett2014-01-113-0/+25
| | |
| | * tables and attr_list compatibilityryneeverett2013-11-131-0/+2
| | |