Stéphane Goetz a2f5d89201 Merge branch 'master' into development ...

* master:
  Adjust API to work with Guzzle 6
  Change guzzle version to ~6.0
  Added docs to explain how to use markdown to display images

# Conflicts:
#	composer.lock

2016-04-14 21:28:52 +02:00

..

Console

Finalize search feature for merge

2016-03-13 21:51:58 +01:00

ContentTypes

Finalize table of contents feature, also for confluence upload

2016-04-14 12:02:31 +02:00

Format

Merge branch 'master' into development

2016-04-14 21:28:52 +02:00

Server

Finalize search feature for merge

2016-03-13 21:51:58 +01:00

Tree

Add computed raw pages, to create special content at any time

2016-01-31 12:00:29 +01:00

Compiler.php

Create latest daux.phar

2016-04-14 12:13:53 +02:00

Config.php

Change configuration format

2015-07-20 20:51:48 +02:00

Daux.php

Small tweaks

2016-01-31 11:59:35 +01:00

DauxHelper.php

UTF8 Internal link support

2016-01-26 14:35:29 +08:00

Exception.php

Convert to PSR2

2015-07-20 20:49:09 +02:00

GeneratorHelper.php

First checkin of search for static websites

2016-02-15 12:14:48 -08:00

Processor.php

Add previous and next links to the pages, fixes #93

2015-10-28 00:18:29 +01:00