Commit graph

1275 commits

Author SHA1 Message Date
Alex Mason
5247980860 Merge branch 'master' into servant-dates-new
# Conflicts:
#	servant/CHANGELOG.md
2016-09-12 11:28:10 +10:00
Julian Arni
7f208c7f7d Merge pull request #598 from haskell-servant/jkarni/issecure
Add instances for IsSecure
2016-09-11 12:03:55 -03:00
Julian Arni
1842de4775 Merge pull request #600 from phadej/remove-servant-mock
Move servant-mock to https://github.com/haskell-servant/servant-mock
2016-09-08 13:39:36 -03:00
Oleg Grenrus
782f8e1541 Move servant-mock to https://github.com/haskell-servant/servant-mock 2016-09-08 17:42:58 +03:00
Julian Arni
040db21152 Merge pull request #599 from chkl/clientm
changed ClientM to be a Reader of ClientEnv
2016-09-07 20:03:36 -03:00
Christian Klinger
7a7f7d7cf5 changed ClientM to be a Reader of ClientEnv 2016-09-08 00:17:13 +02:00
Julian K. Arni
76e74f9d5a Add instances for IsSecure 2016-09-07 18:36:13 -03:00
Alex Mason
5c62f5a24f Merge branch 'master' into servant-dates-new
# Conflicts:
#	servant/CHANGELOG.md
2016-09-07 10:07:45 +10:00
Julian Arni
29af0bbdf9 Merge pull request #585 from axman6/axman6/get-headers-581
Replace use of ToByteString with HttpApiData for GetHeaders
2016-09-06 20:59:46 -03:00
Alex Mason
bd869c23a6 Servant.API.Times -> Servant.API.Time 2016-09-04 17:39:44 +10:00
Julian K. Arni
bf824a3889 Bump version to 0.8.1 2016-09-02 13:09:47 -03:00
Julian Arni
3d7a63e496 Merge pull request #588 from diekmann/patch-2
Fixed typo: s/real/realm/
2016-09-02 12:08:00 -03:00
Cornelius Diekmann
47eed38ee6 Fixed typo: s/real/realm/
Actually, I'm just trying to learn servant and I'm reading the doc for the first time. But this just looks like a typo to me.
2016-09-02 16:38:03 +02:00
Alex Mason
3e704362c3 Remove error calls and replace with working implementations of ToHttpApiData 2016-09-03 00:23:21 +10:00
Alex Mason
dbab31508e Comma style is hard 2016-09-02 23:59:36 +10:00
Alex Mason
a991cbe77c Revert version bump, update changelog 2016-09-02 23:53:18 +10:00
Alex Mason
5bef76ed03 Remove all use of bytestring-conversion 2016-09-02 23:27:37 +10:00
Alex Mason
9b5a564f3c Remove dependency on bytestring-conversion 2016-09-02 23:14:45 +10:00
Alex Mason
532ea9eb8b Update changelog 2016-09-02 23:06:59 +10:00
Julian Arni
d09b70f427 Merge pull request #586 from cko/edit_contributing_instructions
add 'stack setup' command to CONTRIBUTING.md
2016-09-02 10:00:18 -03:00
Christine Koppelt
85a6d9714c add 'stack setup' command 2016-09-02 12:43:22 +02:00
Alex Mason
a1b23018f9 Replace use of ToByteString with HttpApiData for GetHeaders, fixes servant/#581
* Version bump because this changes the API for GetHeaders
2016-09-02 19:47:32 +10:00
Alex Mason
d4cfe3ea74 Update version bounds for time for GHC 8.0 2016-09-02 17:00:26 +10:00
Alex Mason
e15737dd2f Merge branch 'servant-dates' into servant-dates-new
# Conflicts:
#	servant-server/servant-server.cabal
#	servant-server/test/Servant/ServerSpec.hs
#	servant/servant.cabal
#	servant/src/Servant/API.hs
2016-09-02 16:32:51 +10:00
Alex Mason
32fa3490cf Write better docs (and remove last use if undefined) 2016-09-02 16:17:17 +10:00
Alex Mason
7293717a0d Rename {render,parse}Time FTime 2016-09-02 16:16:41 +10:00
Alex Mason
518a2715be Remove use of CPP inside functions 2016-09-02 16:14:25 +10:00
Alex Mason
840eae8cfe various code clean ups, fixing some issues from @jkarni 2016-09-02 15:57:51 +10:00
Alex Mason
f3f61dbbac Rename toProxy to toFormatProxy 2016-09-02 15:46:23 +10:00
Alex Mason
1996ec05f7 Remove use of undefined in Read instance 2016-09-02 15:45:31 +10:00
Alex Mason
bbd6779cc5 Fix doc formatting and add note about + in URLs 2016-09-02 15:44:49 +10:00
Alex Mason
539b8c93fa Add three ISO8601 compatible formats 2016-09-02 15:44:16 +10:00
Alex Mason
523fe563c9 Remove toProxy from API.Times in API 2016-09-02 15:20:27 +10:00
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 Arni
9e7356c6d3 Merge pull request #506 from haskell-servant/jkarni/servant-js-docs
Add more JS documentation.
2016-08-25 16:14:09 -03:00
Sönke Hahn
23493d982d add Raw to ComprehensiveAPI (and add ComprehensiveAPIWithoutRaw) 2016-08-17 23:36:30 +02:00
Julian K. Arni
b22e4e72f9 Review fixes 2016-08-17 13:37:34 -03:00
Julian K. Arni
7aa550aa05 Make Javascript tutorial compile. 2016-08-17 13:37:34 -03:00
freezeboy
9e71fde756 Fixing typo in Javascript.lhs 2016-08-17 13:37:34 -03:00
Julian K. Arni
95d077f586 Add more JS documentation.
Contributed by freezeboy in PR #11 -
    https://github.com/haskell-servant/haskell-servant.github.io/pull/11/files
2016-08-17 13:37:34 -03:00
Sönke Hahn
f5efaf9416 add changelog entry for CaptureAll 2016-08-17 14:56:29 +02:00
Sönke Hahn
1b83d30cf3 switch ci to stack and add ci cron job to test hackage breakage 2016-08-17 14:12:12 +02:00
Sönke Hahn
4ccfce2331 docs: bump Sphinx version 2016-08-15 13:52:14 +02:00
Sönke Hahn
d0a28e46b0 add missing test file to servant-server.cabal 2016-08-14 22:59:12 +02:00
Sönke Hahn
b1f143010e servant-client: fix compilation when building with http-client < 0.4.30 2016-08-14 20:27:50 +02:00
Oleg Grenrus
490502cad1 Support QuickCheck-2.9 2016-08-10 17:49:56 +03:00
Oleg Grenrus
6999b00297 Support aeson-1 2016-08-07 20:12:09 +03:00
Julian Arni
f2a7adb748 Merge pull request #536 from jkachmar/fix-js-examples
Fix servant-js examples
2016-08-04 14:18:45 -03:00
Oleg Grenrus
197ed0548a Use parseRequest 2016-07-18 14:40:05 +02:00
Sönke Hahn
ecfa78d222 doc: add a tip about how to serve on / 2016-07-15 19:31:16 +02:00