Commit graph

1591 commits

Author SHA1 Message Date
Oleg Grenrus
c9ddd9b183
Merge pull request #847 from phadej/pull-742
Pull 742
2017-11-06 13:34:07 +02:00
Oleg Grenrus
f8fb618efe Fix formatting in doc/examples.md 2017-11-06 13:08:29 +02:00
Cies Breijs
bd71022979 Update examples.md 2017-11-06 13:06:14 +02:00
Oleg Grenrus
d04bd290c5
Merge pull request #846 from phadej/pull-809-foreign-data
Pull 809 foreign data
2017-11-06 13:04:15 +02:00
Oleg Grenrus
bba98a3755 Update changelogs 2017-11-06 12:35:43 +02:00
Oleg Grenrus
80c6ba5347 Derive Typeable for internal servant-foreign types 2017-11-06 12:29:43 +02:00
Oliver Charles
bfe6f5b0a4 servant-foreign: Explicitly import Data 2017-11-06 12:21:35 +02:00
Ollie Charles
197d776e08 servant-foreign: Move -XDeriveDataTypeable to servant-foreign.cabal 2017-11-06 12:21:31 +02:00
Ollie Charles
335e30be74 servant-foreign: Derive Data for all types 2017-11-06 12:21:28 +02:00
Oleg Grenrus
b7b6ce7f40
Merge pull request #845 from phadej/changelog-0.12
Bump versions and update changelogs.
2017-11-06 12:19:50 +02:00
Oleg Grenrus
018f0e082e Bump versions and update changelogs.
The changelog for `servant` contains changes across core packages,
as we release them as a suite.

Also added links to the GitHub master as we might update entries
for old versions, as changelogs are written by humans.
2017-11-06 11:24:48 +02:00
gbaz
da98c94e2f refactor servant.server.internal to consolidate functions (#837)
refactor servant.server.internal to consolidate functions
2017-10-28 20:17:24 +02:00
Oleg Grenrus
ec8c99372d
Merge pull request #839 from phadej/travis-new-build
cabal new-build based .travis.yml
2017-10-27 23:57:31 +03:00
Oleg Grenrus
9fa886b145 Improve .cabal files
- Add build-tool-depends, so new-build can use hspec-discover
- Add mtl bounds in tutorial (and dependency on mtl-compact)
- Add extra-source-files to tutorial, so it's buildable from sdist
2017-10-25 18:15:19 +03:00
Oleg Grenrus
fcaef360cb Don't build --dep for all
As tutorial depends on servant-js, which isn't in this repository
cabal fails fatally to `new-build --dep all`.

Instead we are building deps for servant-server and servant-client only,
which already includes e.g. http-client and warp, i.e. pretty much
everything we need. It's not bad that some dependencies might be build
during `script` phase
2017-10-25 18:15:03 +03:00
Oleg Grenrus
b45e94de19 cabal new-build based .travis.yml 2017-10-25 18:15:02 +03:00
Oleg Grenrus
de965b208e Merge pull request #842 from phadej/http-types-0.10b
Http types 0.10b
2017-10-25 13:08:15 +03:00
Oleg Grenrus
76616de601 Allow http-types-0.10 2017-10-25 12:56:12 +03:00
Oleg Grenrus
09485871f5 Adopt http-types-0.10 2017-10-23 08:59:36 +03:00
Oleg Grenrus
2d6bf5055b Improve .cabal files
- Add build-tool-depends, so new-build can use hspec-discover
- Add mtl bounds in tutorial (and dependency on mtl-compact)
- Add extra-source-files to tutorial, so it's buildable from sdist
2017-10-23 08:58:39 +03:00
Oleg Grenrus
781ea66a62 Use http-types-0.10 in stack.yaml 2017-10-23 08:57:56 +03:00
Ryan James Spencer
ff5502f4f7 Replace User with Account in Generalized Authentication section (#757)
* Change `User` to `Account` in Generalized Authentication section
2017-10-17 14:31:29 +02:00
Alp Mestanogullari
602806296e Merge pull request #834 from ivan-m/group-notes-together
servant-docs: Offer the ability to group notes together
2017-10-11 11:54:52 +02:00
Ivan Lazar Miljenovic
0d97deada9 Note change 2017-10-11 12:19:00 +11:00
Ivan Lazar Miljenovic
6df200326f Add an option to wrap notes in a separate header
Closes #831, using option 3.
2017-10-11 12:12:48 +11:00
Ivan Lazar Miljenovic
9d10fe13dd Use 3rd-level headings
For some reason, 2nd-level headings are used for introductions and for
each API endpoint, but then it immediately jumps to 4th-level
headings.

Instead, promote everything that's 4th-level to 3rd-level.
2017-10-11 10:48:22 +11:00
Alp Mestanogullari
f960d97256 Merge pull request #829 from ivan-m/multiple-content-types
servant-docs: configurable rendering for multiple content types
2017-10-09 08:13:29 +02:00
Ivan Lazar Miljenovic
b3e35fbc79 Make sure tutorial can build 2017-10-09 13:22:54 +11:00
Ivan Lazar Miljenovic
dc40badb7c Add motivating example for markdownWith to tutorial 2017-10-06 13:38:37 +11:00
Ivan Lazar Miljenovic
02821e326a Update sample servant-docs output in tutorial
Not all of this is due to the changes in multiple content-type
handling.
2017-10-06 13:21:20 +11:00
Ivan Lazar Miljenovic
ed3ace3066 Handle request/response bodies with empty titles 2017-10-06 13:19:04 +11:00
Ivan Lazar Miljenovic
a21beadf86 Continuing fix to build on 7.8.4 2017-10-06 13:03:27 +11:00
Ivan Lazar Miljenovic
0160f9c6d9 Update ChangeLog 2017-10-06 11:14:03 +11:00
Ivan Lazar Miljenovic
ddcb3560e0 Better haddocks for new documentation 2017-10-06 11:13:57 +11:00
Ivan Lazar Miljenovic
a693648044 A better name for ApiOptions
It's more about how rendering happens than options for the API.
2017-10-06 10:59:00 +11:00
Ivan Lazar Miljenovic
e3c1c2b464 Fix building on GHC 7.8.4 2017-10-06 10:58:00 +11:00
Ivan Lazar Miljenovic
354bee8d32 Remove unused uncurry3 function 2017-10-06 10:54:55 +11:00
Ivan Lazar Miljenovic
09896b5f39 Group mime-types together, and control how many get displayed
Closes #815
2017-10-05 16:29:43 +11:00
Ivan Lazar Miljenovic
41d75b4de8 Combine rendering of code samples for request/response bodies
This does mean that the "Example" portion for reqeust bodies is lost
though.
2017-10-05 16:29:43 +11:00
Ivan Lazar Miljenovic
4f8df0ebe2 Make sure code blocks are indented in markdown documentation
This relies on the behaviour of pandoc, and as such may not apply to
other Markdown renderers.

Before this change, you would have something like:

> - Example: `application/json`
>
> ```javascript
> "HELLO, HASKELLER"
> ```

When converting this to HTML, PDF, etc. the code block is _not_
contained within the bullet point.

With this change, the generated markdown looks like:

> - Example: `application/json`
>
>     ```javascript
> "HELLO, HASKELLER"
>     ```

With pandoc at least, this effectively indents the entire code block
to be under the bullet point, which is the intended effect.

Note that the code itself is _not_ indented (which might break other
Markdown renderers) as to do so would require splitting on newlines,
which may have unintended consequences when dealing with generated
values (may contain `\r\n`, etc.).
2017-10-05 16:29:43 +11:00
Ivan Lazar Miljenovic
061bf7a5b1 Add markdown type for text/xml
As it's an alternative mime-type for XML
2017-10-05 16:29:43 +11:00
Julian Arni
63d8f6c0f3 Merge pull request #822 from limaner2002/issue-821
Fix issue #821
2017-10-02 09:30:11 -07:00
Oleg Grenrus
6e431d59f2 Merge pull request #824 from phadej/hoist-server-docs
Update docs related to hoistServer
2017-10-02 09:27:37 +03:00
Oleg Grenrus
15cc4f55dd Update docs related to hoistServer 2017-10-01 20:24:22 +03:00
Joshua McCartney
3fedbd097a Fix issue #821 2017-09-28 19:15:53 -04:00
Alp Mestanogullari
4a6edd7864 Merge pull request #813 from ivan-m/response-content-type
List content type with response examples
2017-09-25 10:38:02 +02:00
Ivan Lazar Miljenovic
81184df3d4 List content type with response examples 2017-09-22 14:12:13 +10:00
Julian Arni
28fe7a0d0f Merge pull request #803 from haskell-servant/pr800
Factor out servant-client-core
2017-09-18 13:51:55 -04:00
Alp Mestanogullari
885808cd3b Merge pull request #806 from vaibhavsagar/fix-typo
typo in servant-server/src/Servant/Server/Internal.hs
2017-09-17 14:15:02 +02:00
Vaibhav Sagar
1a10972904 Update servant-server/src/Servant/Server/Internal.hs
s/taylor/tailor
2017-09-17 11:40:12 +08:00