Commit graph

1494 commits

Author SHA1 Message Date
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
Julian K. Arni
b20edfd96a Fix loop in IsSubList
See #293.
2015-12-16 13:41:18 +01:00
Julian K. Arni
82deaeb63c Test cases for bad links. 2015-12-16 13:39:52 +01:00
Julian Arni
3429870120 Merge pull request #289 from mitchellwrosen/master
Add 'pretty' to servant-docs
2015-12-10 23:48:30 +01:00
Julian Arni
bf8959d2d7 Merge pull request #287 from arianvp/285
WIP: Fix issue #285
2015-12-10 23:44:25 +01:00
Mitchell Rosen
f1a6a2a151 Move 'pretty' to its own module 2015-12-10 12:27:15 -08:00
Mitchell Rosen
702c2cec7d Add 'pretty' 2015-12-09 18:38:31 -08:00
Arian van Putten
cf475c26c9 WIP: Fix issue #285 2015-12-06 12:40:27 +01:00
Arian van Putten
60f1ddb89e WIP: Fix issue #285 2015-12-06 12:22:18 +01:00
Julian Arni
69c9ca437a Merge pull request #284 from kantp/relax-upper-bound-http-api-data
Relax upper version bound for http-api-data ...
2015-12-04 20:32:56 +01:00
Philipp Kant
da5c273640 Relaxed upper version bound for http-api-data ...
... in order to include http-api-data-0.2.1, which is currently in LTS
Haskell (lts-3.16).
2015-12-03 14:13:50 +01:00
Denis Redozubov
1bd2d913de Merge pull request #277 from MaxOw/master
Type information in servant-foreign.
2015-12-03 01:00:45 +03:00
Maksymilian Owsianny
721151a32d Added default NoTypes parameter for dynamic languages. 2015-12-02 15:56:56 +00:00
Maksymilian Owsianny
83600d5326 Added myself as co-author. 2015-12-02 14:26:45 +00:00
Maksymilian Owsianny
0f42e0a7f0 Add documentation of 'HasForeignType'. 2015-12-02 14:10:30 +00:00
Maksymilian Owsianny
0c0c382ae6 Fix broken servant-js tests. 2015-12-02 13:22:01 +00:00
Maksymilian Owsianny
b6ee20dfe0 Fix to support GHC < 710 2015-12-02 13:02:05 +00:00
Maksymilian Owsianny
e56fc650c2 Added test spec for servant-foreign. 2015-12-02 12:28:04 +00:00
Maksymilian Owsianny
2d8db45907 Moved GenerateList to servant-foreign. 2015-12-02 11:21:37 +00:00
Julian Arni
6dac6e831c Merge pull request #279 from sestrella/fix_broken_link
[servant-js] README-md - Fix broken link
2015-12-01 08:52:32 +01:00
Sebastián Estrella
38cb32cda6 [servant-js] README-md - Fix broken link 2015-12-01 00:38:37 -05:00
Maksymilian Owsianny
69f09f2622 Added lang parameter. 2015-11-29 04:53:50 +00:00
Maksymilian Owsianny
0b37222733 Fix servant-js based on changes to servant-foreign. 2015-11-28 08:24:55 +00:00
Maksymilian Owsianny
8932cb242c Add access to types in servant-foreign. 2015-11-28 08:13:26 +00:00
Julian Arni
8bf804e292 Merge pull request #265 from liqd/foreign-internal-module
Foreign internal module
2015-11-23 16:56:09 -05:00
Matthias Fischmann
9b08a05502 Adjust file contents a little. 2015-11-16 18:40:15 +01:00
Matthias Fischmann
a1dcc275eb Just rename the file. 2015-11-16 18:33:35 +01:00
Julian Arni
fdd1829c8f Merge pull request #237 from sol/master
Test Hackage breakage
2015-11-05 11:39:20 -05:00
Simon Hengel
fccb01907b Disable -Werror due to aeson-0.10.0.0 issue 2015-11-05 11:07:38 +08:00
Simon Hengel
4e53e2083b Use tinc on travis 2015-11-05 09:32:13 +08:00
Simon Hengel
cd395a27e8 aeson-0.10.0.0 fixes 2015-11-05 09:14:07 +08:00
Julian Arni
0d8439c5cd Merge pull request #262 from mattjbray/fix-camel-case
Fix camelCase
2015-11-04 17:51:59 +01:00