Commit graph

69 commits

Author SHA1 Message Date
Julian K. Arni
88f1a3fc15 prepare merge 2015-04-20 11:19:48 +02:00
Julian Arni
e4b2e154f5 Merge pull request #19 from haskell-servant/fixed-pr-16
Canonicalize API before generating docs.
2015-04-19 17:52:45 +02:00
Julian K. Arni
47aeb20c4b Fix mimeRender name change 2015-04-19 15:11:17 +02:00
Julian K. Arni
b23b334128 Canonicalize API before generating docs. 2015-04-19 14:35:42 +02:00
Alp Mestanogullari
f90348c03a Merge pull request #18 from haskell-servant/jkarni/cleanup
Cleanup
2015-04-08 18:25:32 +03:00
Julian K. Arni
9996e6755b Cleanup: tests, fix ToJSON supeclass. 2015-04-08 16:58:48 +02:00
Julian K. Arni
52157f5181 Add nix files 2015-04-08 16:27:24 +02:00
Alp Mestanogullari
a06e54610c add lens as a dependency for the example 2015-03-26 13:26:23 +01:00
Alp Mestanogullari
32768e431e import Control.Lens in the example 2015-03-26 13:14:34 +01:00
Alp Mestanogullari
38fea6060e do not export Control.Lens and Data.Monoid from Servant.Docs 2015-03-26 13:03:22 +01:00
Alp Mestanogullari
eb87b00b0d prepare changelog for next version 2015-03-04 02:07:13 +01:00
Alp Mestanogullari
72b2fac95d Merge pull request #15 from zerobuzz/canonical-order
Render entpoints in canonical order.
2015-02-24 11:15:28 +00:00
Matthias Fischmann
68fee749c4 Remove dead code. 2015-02-24 11:01:34 +01:00
Matthias Fischmann
f11d5207e4 Dropped orphan instance for MediaType (now available upstream). 2015-02-24 08:54:14 +01:00
Matthias Fischmann
1fef813a3b Render entpoints in canonical order. 2015-02-23 11:33:44 +01:00
Christian Marie
795a770780 Merge pull request #11 from haskell-servant/wip-note-api
General extra info API
2015-02-23 10:55:43 +11:00
Christian Marie
055655618f Merge remote-tracking branch 'origin/master' into wip-note-api 2015-02-23 10:47:28 +11:00
Christian Marie
53d3f6db80 Rename safeInfo to extraInfo 2015-02-23 09:56:23 +11:00
Christian Marie
5df017267e Merge pull request #12 from anchor/jkarni/content-types
Extend servant-docs to support content types
2015-02-23 09:52:55 +11:00
Thomas Sutton
fc5802fe7f Show, rather than convert, media types 2015-02-23 09:38:19 +11:00
Thomas Sutton
97ff49c3c4 Replace HTML with PlainText in examples 2015-02-22 19:42:38 +11:00
Thomas Sutton
bdf61e4df9 Sample program more sensible and update README 2015-02-22 17:18:07 +11:00
Thomas Sutton
02c4adfd18 Simplify SupportedTypes instances 2015-02-20 08:05:37 +11:00
Thomas Sutton
8087fae18b amr renamed allMimeRender 2015-02-20 08:03:11 +11:00
Thomas Sutton
0daa8d27a5 Add list of supported content types to documentation 2015-02-19 15:29:04 +11:00
Thomas Sutton
921547da60 Example now depends on string-conversions 2015-02-19 13:23:13 +11:00
Thomas Sutton
f303f6176a Simplify encoding code slightly more 2015-02-19 13:19:29 +11:00
Thomas Sutton
d62c61224b Simplify encoding code slightly 2015-02-19 13:15:33 +11:00
Thomas Sutton
3451dcf186 Use string conversions in example 2015-02-19 13:03:38 +11:00
Thomas Sutton
508b9f9791 Generate docs with samples encoded in all types
Request and response body documentation now includes sample values
encoded in all supported media types.
2015-02-19 12:55:11 +11:00
Thomas Sutton
dba8689acd Remove redundant dependencies 2015-02-19 12:53:14 +11:00
Thomas Sutton
6d85885b42 Add content types to the example 2015-02-19 12:48:23 +11:00
Thomas Sutton
3c14343b88 Add content-type params to type constructors 2015-02-19 10:59:24 +11:00
Christian Marie
b935f28185 Improve documentation.
I also slipped a change into the Matrix Paramters section markdown generation,
there is one less (superfluous) newline there now.
2015-02-18 12:49:08 +11:00
Christian Marie
a008e08dd1 Add initial mockup of general extra info API 2015-02-07 15:23:54 +11:00
Christian Marie
2ea8a48eff Merge pull request #9 from anchor/wip-notes
Add DocIntro and DocNote types to allow extra docs
2015-01-30 16:06:31 +11:00
Christian Marie
dd34ba0d92 Merge remote-tracking branch 'upstream/master' into wip-notes
Conflicts:
	src/Servant/Docs.hs
2015-01-30 16:02:44 +11:00
Christian Marie
b85a90c4f5 Add docsWithIntros function, update documentation 2015-01-30 15:47:26 +11:00
Julian Arni
ec3bebee69 Merge pull request #7 from dlarsson/master
Support for matrix parameters
2015-01-27 03:16:30 +01:00
Christian Marie
aa64d7a0bf Add DocIntro and DocNote types to allow extra docs
This commit provides a way for a user to add information to either the
beginning of the output, and for a HasDoc instance to add extra sections to an
endpoint.

See example/greet.hs for usage of the Intro type.
2015-01-23 14:31:45 +11:00
Daniel Larsson
d603431498 Merge branch 'master' of https://github.com/dlarsson/servant-docs 2015-01-15 11:05:02 +01:00
Daniel Larsson
c4f7735de8 Added support for matrix parameters 2015-01-15 11:04:20 +01:00
Daniel Larsson
62f8a7f090 Initial support for matrix parameters. Not complete, not sure how to document them yet, since documentation is focused on endpoints, not individual path fragments. 2015-01-15 11:04:20 +01:00
Daniel Larsson
d81704abc7 Added support for matrix parameters 2015-01-06 14:30:01 +01:00
Daniel Larsson
330e9abcaa Merged in 0.3 2015-01-06 14:29:37 +01:00
Alp Mestanogullari
44efc7ff20 bump version 2015-01-04 17:18:40 +01:00
Alp Mestanogullari
b7591dd7e0 mention servant-pandoc in the readme 2015-01-04 17:18:12 +01:00
Alp Mestanogullari
923a75afef add a changelog 2015-01-04 17:17:57 +01:00
Alp Mestanogullari
07472ccb7a update the example to show off multiple-responses 2015-01-04 16:53:02 +01:00
Alp Mestanogullari
71142b08d4 fix build error 2015-01-04 16:44:23 +01:00