Commit graph

1275 commits

Author SHA1 Message Date
Julian K. Arni
cd101e6b23 Fix maintainer's @ 2016-01-15 11:40:56 +01:00
Julian Arni
a3339f11bf Merge pull request #328 from haskell-servant/shahn/doc-tweak
server/docs: fix formatting inconsistency
2016-01-15 11:12:46 +01:00
Sönke Hahn
c6e0ccbc2f server/docs: fix formatting inconsistency 2016-01-14 23:58:48 +01:00
Julian Arni
385ea2686b Merge pull request #326 from haskell-servant/jkarni/mock-build-example
Mock PolyKinds
2016-01-14 09:59:28 +01:00
Julian K. Arni
5a7fe76629 Add polykinds to servant-mock 2016-01-13 17:32:57 +01:00
Julian K. Arni
7f9758314e Build mock example by default.
So that CI reports errors.
2016-01-13 17:06:20 +01:00
Julian Arni
f97cbf0ce8 Merge pull request #320 from haskell-servant/add-ghci-for-servant
add servant/.ghci
2016-01-13 16:58:32 +01:00
Julian Arni
f8d030804f Merge pull request #324 from haskell-servant/jkarni/docsHeaderFix
Re-add missing Header instance for docs.
2016-01-13 16:57:15 +01:00
Julian K. Arni
37afddf3a2 Re-add missing Header instance for docs. 2016-01-11 13:37:20 +01:00
Julian Arni
357cc839b6 Merge pull request #276 from haskell-servant/jkarni/emptyWithHeaders
Consolidate verbs
2016-01-08 20:22:02 +01:00
Julian K. Arni
f9c61379c0 Refactor NoContent logic.
Now MimeRender and MimeUnrender instances are not needed.
2016-01-08 19:33:36 +01:00
Julian K. Arni
f1b6603c52 Review fixes 2016-01-08 18:03:28 +01:00
Sönke Hahn
feef8caea2 add servant/.ghci 2016-01-07 23:59:54 +01:00
Sönke Hahn
e007d8dc6d Merge pull request #318 from haskell-servant/jkarni/contributing
First pass at CONTRIBUTING
2016-01-07 18:30:42 +01:00
Julian K. Arni
32612c903c Review fixes 2016-01-07 17:19:31 +01:00
Julian K. Arni
783a849c67 Make NoContent still take an arg.
For consistency with other combinators, and to make using headers
        easier.
2016-01-07 14:30:08 +01:00
Julian K. Arni
574e9c48cd Export all Verb methods. 2016-01-07 13:47:08 +01:00
Julian K. Arni
bd77b4acba Verb for -mock, -js and -foreign. 2016-01-07 13:47:08 +01:00
Julian K. Arni
208bcf5986 Use Verb for servant-docs 2016-01-07 13:47:08 +01:00
Julian K. Arni
5909a6df7a Fix rebase issues. 2016-01-07 13:47:08 +01:00
Julian K. Arni
9b2d7a7b38 Remove unnecesary () AllMimeRender instance. 2016-01-07 13:47:08 +01:00
Julian K. Arni
20ae7dcc31 Update CHANGELOG for Verbs change. 2016-01-07 13:47:08 +01:00
Julian K. Arni
c6071bfb02 Don't override status code on empty body. 2016-01-07 13:47:08 +01:00
Julian K. Arni
190c75a364 Add descriptive type synonyms for success responses. 2016-01-07 13:47:07 +01:00
Julian K. Arni
cda8bcf17c Simplify verb combinators.
Create a single 'Verb' combinator with parameters for status code and
        method. Make existing combinators type synonyms of 'Verb'.
2016-01-07 13:47:07 +01:00
Julian K. Arni
832f1b985f Review fixes and note about CI. 2016-01-07 13:05:13 +01:00
Julian Arni
3d0ae36189 Merge pull request #310 from arianvp/294
Fix #294
2016-01-07 13:00:47 +01:00
Julian K. Arni
f66981fc8a First pass at CONTRIBUTING 2016-01-07 00:53:17 +01:00
Julian Arni
ec60b5503d Merge pull request #315 from luigy/removeOverlappingNoise
Remove Overlapping pragma noise using CPP
2016-01-05 15:01:07 +01:00
Luigy Leon
17fcc25d87 add include header files to extra-source-files 2016-01-04 23:05:05 -05:00
Luigy Leon
8a497c473c delete extra committed header files 2016-01-04 23:03:26 -05:00
Luigy Leon
9585598f30 Merge branch 'jkarni/removeOverlappingNoise' of https://github.com/haskell-servant/servant into removeOverlappingNoise 2016-01-04 13:53:39 -05:00
Julian K. Arni
79d4f944a4 less OverlappingInstances noise 2016-01-04 13:09:11 -05:00
Julian Arni
41d5a5d943 Merge pull request #314 from haskell-servant/jkarni/bump-wai-warp
Bump wai and warp upper bound to < 3.3.
2016-01-04 18:31:22 +01:00
Julian K. Arni
a4a0f1988b Bump wai and warp upper bound to < 3.3. 2016-01-04 17:21:14 +01:00
Julian K. Arni
e7c9084917 less OverlappingInstances noise 2015-12-27 17:54:29 +01:00
Arian van Putten
82fa23507f Add 205 2015-12-27 17:23:46 +01:00
Arian van Putten
a15d1d9314 Fix 294 2015-12-27 14:05:32 +01:00
Julian Arni
9cc344b95b Merge pull request #308 from haskell-servant/jkarni/linkHttpApiData
Add ToHttpApiData instance for Link.
2015-12-27 12:51:17 +01:00
Julian K. Arni
8b3258a0c1 Add ToHttpApiData instance for Link. 2015-12-27 02:20:46 +01:00
Julian Arni
4a03c6e8b5 Merge pull request #306 from haskell-servant/jkarni/env-bash
Use env bash rather than /bin/bash.
2015-12-25 16:18:46 +01:00
Julian Arni
5b3477ebd4 Merge pull request #304 from luke-clifton/master
MimeUnrender and MimeRender instances for Cassava
2015-12-25 15:52:32 +01:00
Julian K. Arni
1ea1340c5c Use env bash rather than /bin/bash. 2015-12-25 15:50:28 +01:00
Luke Clifton
130fd27e01 Conditionally include Control.Applicative <$> 2015-12-22 22:03:46 +11:00
Luke Clifton
57fe12ce84 MimeUnrender and MimeRender instances for Cassava
This allows the same API type to be used for `serve` and `client`.
2015-12-22 15:48:49 +11:00
Julian Arni
5e215cef68 Merge pull request #299 from xor-xor/docs-redundant-imports
[servant-docs] Removed redundant imports.
2015-12-20 18:31:21 +01:00
Tomasz Mieszkowski
69a4a8d4f6 [servant-docs] Removed redundant imports. 2015-12-20 17:56:11 +01:00
Alp Mestanogullari
3020c365fa Merge pull request #298 from atn34/patch-1
Fix broken link in servant-docs' README
2015-12-19 12:25:02 +01:00
Andrew Noyes
56beed459c Fix broken link 2015-12-18 16:56:37 -08:00
Julian Arni
1bb4292d97 Merge pull request #295 from haskell-servant/jkarni/293fix
Fix loop in IsSubList
2015-12-16 14:11:08 +01:00