Commit graph

73 commits

Author SHA1 Message Date
Alp Mestanogullari
01a020d432 Merge pull request #32 from haskell-servant/canonical-types
Canonicalize types
2015-04-19 13:23:51 +03:00
Alp Mestanogullari
bf637865cd fix inconsistencies from rebase 2015-04-19 12:06:31 +02:00
Alp Mestanogullari
f71c7a813a Merge branch 'master' into canonical-types
Conflicts:
	CHANGELOG.md
	src/Servant/Server/Internal.hs
2015-04-19 11:17:11 +02:00
Alp Mestanogullari
fc30c7e242 Merge branch 'master' into canonical-types
Conflicts:
	CHANGELOG.md
	src/Servant/Server/Internal.hs
2015-04-19 10:59:14 +02:00
Julian Arni
f6f120ded9 Merge pull request #41 from haskell-servant/jkarni/response-headers
Add server support for response headers
2015-04-16 20:53:13 +02:00
Julian K. Arni
2ec477159f Add server support for response headers 2015-04-15 18:35:25 +02:00
Julian Arni
1eaed73794 Merge pull request #38 from haskell-servant/jkarni/fix-406
Don't succeedWith when response content-type is unacceptable.
2015-04-07 16:40:19 +02:00
Julian K. Arni
fed014e120 Pay back some test-debt 2015-04-07 16:25:23 +02:00
Julian K. Arni
622c77251e Don't succeedWith when response content-type is unacceptable. 2015-04-06 16:12:28 +02:00
Julian Arni
25d1e466e9 Merge pull request #33 from haskell-servant/jkarni/no-content
Make Post and Put return NoContent when response is ()
2015-03-13 10:14:44 +01:00
Julian K. Arni
b35512c3d4 Update changelog 2015-03-12 18:37:08 +01:00
Julian K. Arni
5eddb318a2 Make Post and Put return NoContent when response is () 2015-03-12 18:29:57 +01:00
Alp Mestanogullari
c1ed47b35f add changelog entry 2015-03-11 14:34:33 +01:00
Alp Mestanogullari
837099d12d Canonicalize the API type to make sure that the following 'law' holds: Server (a :> (b :<|> c)) ~ Server (a :> b) :<|> Server (a :> c) 2015-03-11 14:34:33 +01:00
Julian K. Arni
bd9d476679 CHANGELOG update for PR #21. 2015-03-11 14:33:51 +01:00
Roland Schatz
f76c729a08 Introduce ServerT to specify generic handlers. 2015-03-11 14:33:51 +01:00
Julian K. Arni
bd98844357 CHANGELOG update for PR #21. 2015-03-10 23:07:24 +01:00
Julian Arni
1b61455d2b Merge pull request #21 from rschatz/master
Support other monads than just IO.
2015-03-10 18:51:11 +01:00
Alp Mestanogullari
8428e4bd7b fix dumb error 2015-03-09 19:59:25 +01:00
Alp Mestanogullari
5f7795f70f remove canonicalize, it's now in servant 2015-03-09 19:23:53 +01:00
Alp Mestanogullari
9a33fa7812 Canonicalize the API type to make sure that the following 'law' holds: Server (a :> (b :<|> c)) ~ Server (a :> b) :<|> Server (a :> c) 2015-03-09 15:16:38 +01:00
Alp Mestanogullari
947815e6d3 Merge pull request #31 from haskell-servant/wip-incorrect-error
Change JSON-specific error message to a more general one
2015-03-05 18:56:16 +01:00
Christian Marie
0be89b4f3d Change JSON-specific error message to a more general one 2015-03-05 12:11:20 +11:00
Alp Mestanogullari
b24822a448 tentative changelog 2015-03-04 01:53:40 +01:00
Roland Schatz
f7af3b14d2 Introduce ServerT to specify generic handlers. 2015-03-02 22:23:56 +01:00
Julian Arni
5f6c981d80 Merge pull request #29 from zerobuzz/export-toApplication-fun
Export `toApplication` from Server.
2015-02-27 15:41:52 +01:00
Matthias Fischmann
27e842365f Remove overly specific comment. 2015-02-27 15:27:35 +01:00
Matthias Fischmann
1a63d8797a Export toApplication from Server. 2015-02-27 14:54:53 +01:00
Julian Arni
cae0b6e252 Merge pull request #13 from haskell-servant/jkarni/content-types
Jkarni/content types
2015-02-24 15:01:46 +01:00
Julian K. Arni
b96a2d214d Pay down some coverage debt 2015-02-24 14:48:17 +01:00
Julian K. Arni
81c3589624 Review fix 2015-02-24 14:08:27 +01:00
Julian K. Arni
0789682cf8 Remove ContentTypes.hs 2015-02-24 14:08:27 +01:00
Julian K. Arni
e9f3341b9e Move more Content-type logic back to servant. 2015-02-24 14:08:27 +01:00
Julian K. Arni
2092ddc201 Charset test fixes. 2015-02-24 14:08:27 +01:00
Julian K. Arni
8028cceee7 ReqBody content types. 2015-02-24 14:08:27 +01:00
Julian K. Arni
380acb3efa Add Accept header handling. 2015-02-24 14:07:00 +01:00
Julian K. Arni
c1377e0a73 Add cabal sandbox to travis path 2015-02-19 23:02:29 +01:00
Julian K. Arni
b5f2032f77 Enable coveralls 2015-02-19 20:45:42 +01:00
Julian K. Arni
578bda35d9 Use hackage docs. 2015-02-18 13:21:37 +01:00
Julian Arni
4f0d0b5093 Merge pull request #24 from anchor/patch-method
Add PATCH method
2015-02-14 18:13:26 +01:00
Timo von Holtz
9a3c268be4 Add PATCH method 2015-02-10 11:33:41 +11:00
Julian Arni
b6a6505ecf Merge pull request #22 from anchor/arbitrary-routemismatch
Add RouteMismatch constructor for arbitrary HTTP response code
2015-01-30 05:50:30 +01:00
Thomas Sutton
6b55bf583d Add RouteMismatch constructor for arbitrary HTTP response code 2015-01-30 11:36:01 +11:00
Julian Arni
0bb35b8571 Merge pull request #20 from paf31/errors
Return JSON error messages in response
2015-01-21 10:00:22 +08:00
Phil Freeman
56791952b8 Return JSON error messages in response 2015-01-19 19:12:08 -08:00
Julian Arni
f04bd3e24b Merge pull request #18 from haskell-servant/jkarni/fix-travis
Make travis clone master servant.
2015-01-16 11:01:31 +01:00
Julian K. Arni
7736339328 Make travis clone master servant. 2015-01-16 10:53:37 +01:00
Sönke Hahn
350e05e035 Merge pull request #17 from haskell-servant/fix_1
cabal: added lower bound for wai-app-static
2015-01-16 13:03:57 +08:00
Sönke Hahn
1148e21377 cabal: added lower bound for wai-app-static
Fixes #1.
2015-01-16 12:52:11 +08:00
Julian Arni
420fc2a842 Merge pull request #16 from dlarsson/matrix
Added support for matrix parameters.
2015-01-15 12:27:35 +01:00