summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://github.com/jgm/pandoc into dokuwikiClare Macrae2014-07-01
|\
| * Filters: respect shebang if filter is executable.John MacFarlane2014-06-30
| * Merge pull request #1388 from jkr/divattrToCont-cleanupJohn MacFarlane2014-06-30
| |\
| | * Docx reader: clean up parStyle processing.Jesse Rosenthal2014-06-30
| |/
| * Rewrote normalize for efficiency. (Closes #1385.)John MacFarlane2014-06-29
| * Merge pull request #1386 from jkr/hanging_indentJohn MacFarlane2014-06-29
| |\
| | * Docx reader: Add tests for hanging indent handline.Jesse Rosenthal2014-06-29
| | * Docx reader: Make use of new ParIndentation info.Jesse Rosenthal2014-06-29
| | * Docx reader: Add ParIndentation type to parser.Jesse Rosenthal2014-06-29
| * | Merge pull request #1383 from jkr/writer-bookmark-fixJohn MacFarlane2014-06-29
| |\ \
| | * | Docx writer: insert bookmark tags inside <w:p> tag.Jesse Rosenthal2014-06-29
| | |/
| * | Merge pull request #1381 from jkr/updateDStateJohn MacFarlane2014-06-29
| |\ \ | | |/ | |/|
| | * Docx Reader: Update state properlyJesse Rosenthal2014-06-29
| |/
* | Remove stray <div> and </div> from DokuWiki output (#386)Clare Macrae2014-07-01
* | Improved HTML Blocks in DokuWiki output (#386)Clare Macrae2014-07-01
* | Disable warnings about unused parameters.Clare Macrae2014-06-30
* | Updated Copyright year, for consistency with MediaWiki.hsClare Macrae2014-06-29
* | Updated DokuWiki code and tests to work with latest code from jgm.Clare Macrae2014-06-29
* | Merge remote-tracking branch 'jgm/master' into dokuwikiClare Macrae2014-06-29
|\|
| * Merge pull request #1379 from jkr/more_auto_idJohn MacFarlane2014-06-28
| |\
| | * Update docx tests to reflect new expected behaviorJesse Rosenthal2014-06-28
| | * Docx Reader: All headers get auto id.Jesse Rosenthal2014-06-28
| |/
| * Merge pull request #1377 from jkr/monadJohn MacFarlane2014-06-28
| |\
| | * Change test result to match new behavior.Jesse Rosenthal2014-06-28
| | * Docx Reader: Introduce link rewriting.Jesse Rosenthal2014-06-28
| | * make makeHeaderAnchors make an auto idJesse Rosenthal2014-06-28
| | * Rewrote header generation.Jesse Rosenthal2014-06-28
| | * Docx Reader: Simplify makeHeaderAnchorsJesse Rosenthal2014-06-28
| | * Docx Reader: Clean up guardsJesse Rosenthal2014-06-28
| | * Docx rdr: Avoid mapping makeHeaderAnchors globallyJesse Rosenthal2014-06-28
| | * Move Docx reader to DocxContext monadJesse Rosenthal2014-06-28
| |/
| * Fixed `--filter` so it doesn't search PATH for a filter with a path.John MacFarlane2014-06-27
| * Require haddock-library >= 1.1 and simplify haddock reader code.John MacFarlane2014-06-26
| * Merge pull request #1374 from jkr/track-changes-optionsJohn MacFarlane2014-06-25
| |\
| | * Fix typo in README.Jesse Rosenthal2014-06-25
| | * Track changes tests.Jesse Rosenthal2014-06-25
| | * Updated README to include "--track-changes" option.Jesse Rosenthal2014-06-25
| | * Docx reader: Make use of track-changes option.Jesse Rosenthal2014-06-25
| | * Add track changes option to command line.Jesse Rosenthal2014-06-25
| | * Add TrackChanges to Options export.Jesse Rosenthal2014-06-25
| | * Add reader option for track changes.Jesse Rosenthal2014-06-25
| | * Add TrackChanges type to options.Jesse Rosenthal2014-06-25
| * | Merge pull request #1375 from jkr/cleanupJohn MacFarlane2014-06-25
| |\ \
| | * | Docx reader: Code cleanup in parse.Jesse Rosenthal2014-06-25
| |/ /
| * | Merge pull request #1372 from jkr/track-changesJohn MacFarlane2014-06-25
| |\|
| | * Docx reader: Add tests for basic track changesJesse Rosenthal2014-06-25
| | * Docx reader: Remove unnecessary filter in Parse.Jesse Rosenthal2014-06-25
| | * Docx reader: Add rudimentary track changes support.Jesse Rosenthal2014-06-25
| | * Docx reader: Parse Insertions and Deletions.Jesse Rosenthal2014-06-25
| | * Docx Reader: Add change typesJesse Rosenthal2014-06-25
| |/