Commit graph

9 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
Denis Redozubov
ce3e4f7193 Extract common code-generation stuff to servant-foreign 2015-09-21 20:59:09 +03:00
Julian K. Arni
1bffaac2d0 Add servant-cassava. 2015-08-29 19:15:16 +02:00
Alp Mestanogullari
2cf2d08cd3 Merge pull request #163 from haskell-servant/servant-mock
new package: servant-mock, to generate mock servers from API types
2015-07-24 15:45:08 +02:00
Alp Mestanogullari
87c3bd590e first shot at Servant.Mock 2015-07-22 21:22:42 +02:00
Alp Mestanogullari
eabf13ebdb rename servant-jquery to servant-js, Servant.JQuery to Servant.JS 2015-07-22 19:25:02 +02:00
Julian K. Arni
9c20b668e7 Changelog and sources.txt updates 2015-05-02 12:09:00 +02:00
Alp Mestanogullari
50a1c86f5f add servant-examples to sources.txt and scripts/shell.nix 2015-04-23 16:31:08 +02:00
Julian K. Arni
019d49e782 default.nix and sources files 2015-04-20 19:13:55 +02:00