Commit graph

627 commits

Author SHA1 Message Date
Julian Arni
e9f73b0989 Merge pull request #31 from haskell-servant/merge
Merge all repos
2015-04-20 14:23:04 +02:00
Julian K. Arni
619e665e11 Fix travis 2015-04-20 13:38:25 +02:00
Julian K. Arni
e462b957f2 Update gitignore 2015-04-20 13:31:30 +02:00
Julian K. Arni
7351c072bd Update travis.yml for merged repos 2015-04-20 13:30:11 +02:00
Julian K. Arni
9da1f6ef40 Merge remote-tracking branch 'servant-jquery/prepare-merge' into merge 2015-04-20 11:24:19 +02:00
Julian K. Arni
03862836c4 Merge remote-tracking branch 'servant-docs/prepare-merge' into merge 2015-04-20 11:24:11 +02:00
Julian K. Arni
1eedad4073 Merge remote-tracking branch 'servant-client/prepare-merge' into merge 2015-04-20 11:23:45 +02:00
Julian K. Arni
29a54fe290 Merge remote-tracking branch 'servant-server/prepare-merge' into merge 2015-04-20 11:23:33 +02:00
Julian K. Arni
90ad8248d7 prepare merge 2015-04-20 11:21:21 +02:00
Julian K. Arni
88f1a3fc15 prepare merge 2015-04-20 11:19:48 +02:00
Julian K. Arni
2210e94727 prepare merge 2015-04-20 11:18:28 +02:00
Julian K. Arni
45f35852f8 prepare merge 2015-04-20 11:15:58 +02:00
Julian K. Arni
ed502f5f21 Prepare merge 2015-04-20 11:13:18 +02:00
Alp Mestanogullari
6a11656aa7 Merge pull request #14 from haskell-servant/api-to-js-code-string
add a jsForAPI function that takes an API type proxy and generates js fu...
2015-04-20 11:40:29 +03:00
Alp Mestanogullari
95a120f110 jsForAPI now needs to take into account Canonicalize 2015-04-20 10:21:03 +02:00
Alp Mestanogullari
d90b59e902 fix a couple of typos 2015-04-20 09:59:03 +02:00
Alp Mestanogullari
0644c8dd79 canonicalize API type before generating jquery functions, flattening everything on the way 2015-04-20 09:59:03 +02:00
Alp Mestanogullari
0173087166 Merge pull request #25 from haskell-servant/canonical-types-rebased
Canonical types rebased
2015-04-20 09:37:40 +03:00
Julian K. Arni
d7fcf2b19b Fix missing canonicalize changes 2015-04-19 18:31:23 +02:00
Alp Mestanogullari
eae2f5f282 add a changelog entry for canonicalize 2015-04-19 18:08:40 +02:00
Alp Mestanogullari
34f1715666 canonicalize api type before generating client functions, to flatten out all the client functions, distributing arguments properly: Client (a :> (b :<|> c)) = Client (a :> b) :<|> Client (a :> c) 2015-04-19 18:08:26 +02:00
Julian Arni
e4b2e154f5 Merge pull request #19 from haskell-servant/fixed-pr-16
Canonicalize API before generating docs.
2015-04-19 17:52:45 +02:00
Julian K. Arni
47aeb20c4b Fix mimeRender name change 2015-04-19 15:11:17 +02:00
Julian K. Arni
b23b334128 Canonicalize API before generating docs. 2015-04-19 14:35:42 +02:00
Alp Mestanogullari
01a020d432 Merge pull request #32 from haskell-servant/canonical-types
Canonicalize types
2015-04-19 13:23:51 +03:00
Alp Mestanogullari
bf637865cd fix inconsistencies from rebase 2015-04-19 12:06:31 +02:00
Alp Mestanogullari
b09e2bf9da add a test for jsForAPI 2015-04-19 11:56:29 +02:00
Alp Mestanogullari
f71c7a813a Merge branch 'master' into canonical-types
Conflicts:
	CHANGELOG.md
	src/Servant/Server/Internal.hs
2015-04-19 11:17:11 +02:00
Alp Mestanogullari
9838aca752 fix a couple of typos 2015-04-19 11:06:12 +02:00
Alp Mestanogullari
fc30c7e242 Merge branch 'master' into canonical-types
Conflicts:
	CHANGELOG.md
	src/Servant/Server/Internal.hs
2015-04-19 10:59:14 +02:00
Alp Mestanogullari
36e038a7c9 Merge branch 'canonical-types' 2015-04-19 10:36:03 +02:00
Alp Mestanogullari
504793b3b3 Merge branch 'master' into canonical-types 2015-04-19 10:35:24 +02:00
Alp Mestanogullari
21b6e96891 add a jsForAPI function that takes an API type proxy and generates js functions for each endpoint, collecting the result in a big String. fixes #12 2015-04-19 10:07:58 +02:00
Julian Arni
f6f120ded9 Merge pull request #41 from haskell-servant/jkarni/response-headers
Add server support for response headers
2015-04-16 20:53:13 +02:00
Julian K. Arni
2ec477159f Add server support for response headers 2015-04-15 18:35:25 +02:00
Julian Arni
68a129dcd3 Merge pull request #28 from haskell-servant/jkarni/response-headers
Add response headers.
2015-04-14 15:53:32 +02:00
Julian K. Arni
1a2a0d027a Add response headers. 2015-04-14 12:00:57 +02:00
Alp Mestanogullari
f90348c03a Merge pull request #18 from haskell-servant/jkarni/cleanup
Cleanup
2015-04-08 18:25:32 +03:00
Julian K. Arni
9996e6755b Cleanup: tests, fix ToJSON supeclass. 2015-04-08 16:58:48 +02:00
Julian K. Arni
52157f5181 Add nix files 2015-04-08 16:27:24 +02:00
Julian Arni
8c6f327c0d Merge pull request #11 from haskell-servant/pr5
Matrix params
2015-04-08 12:28:30 +02:00
Julian K. Arni
ad900cda51 More PR5 fixes 2015-04-08 12:08:18 +02:00
Julian Arni
1eaed73794 Merge pull request #38 from haskell-servant/jkarni/fix-406
Don't succeedWith when response content-type is unacceptable.
2015-04-07 16:40:19 +02:00
Julian K. Arni
fed014e120 Pay back some test-debt 2015-04-07 16:25:23 +02:00
Julian K. Arni
622c77251e Don't succeedWith when response content-type is unacceptable. 2015-04-06 16:12:28 +02:00
Julian Arni
14f63520d0 Merge pull request #23 from haskell-servant/jkarni/patch-etc
Add patch method, and make () response expect no content
2015-03-26 19:17:19 +01:00
Julian K. Arni
3802ef5447 Add patch method, and make () response expect no content 2015-03-26 14:34:38 +01:00
Alp Mestanogullari
a06e54610c add lens as a dependency for the example 2015-03-26 13:26:23 +01:00
Alp Mestanogullari
32768e431e import Control.Lens in the example 2015-03-26 13:14:34 +01:00
Alp Mestanogullari
38fea6060e do not export Control.Lens and Data.Monoid from Servant.Docs 2015-03-26 13:03:22 +01:00