Commit graph

17 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
Luigy Leon
17fcc25d87 add include header files to extra-source-files 2016-01-04 23:05:05 -05:00
Julian K. Arni
79d4f944a4 less OverlappingInstances noise 2016-01-04 13:09:11 -05:00
Maksymilian Owsianny
83600d5326 Added myself as co-author. 2015-12-02 14:26:45 +00:00
Freezeboy
b88981cf14 Replace servant-jquery with servant-js in remaining files 2015-11-02 19:59:46 +01:00
Julian K. Arni
965063171b Janitoring 2015-09-23 20:18:52 +02:00
Denis Redozubov
64fc870852 make version/version constraints consistent with other servant-* packages 2015-09-22 22:28:02 +03:00
Denis Redozubov
438311c240 remove duplicate lens dependency 2015-09-22 14:47:38 +03:00
Denis Redozubov
b59a62e012 no opinion on valid function names in servant-foreign 2015-09-22 14:02:30 +03:00
Denis Redozubov
6fa4b55c94 fix build settings for ghc-7.8.4 2015-09-21 21:34:38 +03:00
Denis Redozubov
ce3e4f7193 Extract common code-generation stuff to servant-foreign 2015-09-21 20:59:09 +03:00
Alp Mestanogullari
3dc304b8d7 Merge pull request #173 from freezeboy/axios
servant-js: Add support for the Axios JS library
2015-07-29 14:10:41 +02:00
Julian K. Arni
1c9d5baa99 Bump versions to 0.5 2015-07-27 22:26:49 +02:00
Freezeboy
4362112f31 Add preliminary Axios support 2015-07-27 16:29:08 +02:00
Sönke Hahn
e24cb9ddf6 add stack file 2015-07-26 17:25:07 +08:00
Alp Mestanogullari
a2a4665951 clean up servant-js significantly, simplify the API of the library a lot and document @freezeboy's sweet generators from #159 a bit in the main module of the library, Servant.JS along with how people should use the library. 2015-07-22 19:25:02 +02:00
Alp Mestanogullari
eabf13ebdb rename servant-jquery to servant-js, Servant.JQuery to Servant.JS 2015-07-22 19:25:02 +02:00
Renamed from servant-jquery/servant-jquery.cabal (Browse further)