Commit graph

11 commits

Author SHA1 Message Date
Alex Mason
6462804f52 Merge branch 'master' of https://github.com/haskell-servant/servant into servant-dates
# Conflicts:
#	servant-server/servant-server.cabal
#	servant-server/src/Servant/Server/Internal.hs
#	servant-server/test/Servant/ServerSpec.hs
#	servant/servant.cabal
#	servant/src/Servant/API.hs
2016-09-02 12:53:04 +10:00
Julian K. Arni
c22b5d1938 Changelogs for matrix params 2015-10-13 21:46:52 +02:00
Nickolay Kudasov
479290affd Update changelog 2015-09-24 14:29:27 +03:00
Nickolay Kudasov
350992069f Update changelog 2015-09-21 13:49:26 +03:00
Alp Mestanogullari
f39d57c6b3 add HttpVersion, IsSecure, RemoteHost and Vault combinators with instances for all interpretations (all but the server ones being 'ignore that combinator')
tighter version bounds for network

cleanup

document the new combinators

servant-server: add some tests for HttpVersion, IsSecure, RemoteHost and Vault

update changelogs

address Julian's feedback

remove vault test in servant-server

servant-server tests: -Werror friendly
2015-07-10 14:00:01 +02:00
Julian K. Arni
b81ea9eee2 Bump everything to 0.4 2015-05-09 17:28:52 +02:00
Brandon Martin
95abfc4090 fix ToSample instance and update changelogs 2015-05-07 05:22:01 -06:00
Julian K. Arni
59cc7972de Changelog updates 2015-05-04 17:04:11 +02:00
Julian K. Arni
50b05860b7 Remove Canonicalize 2015-05-03 01:45:17 +02:00
Julian K. Arni
9c20b668e7 Changelog and sources.txt updates 2015-05-02 12:09:00 +02:00
Julian K. Arni
88f1a3fc15 prepare merge 2015-04-20 11:19:48 +02:00
Renamed from CHANGELOG.md (Browse further)