Commit Graph

3818 Commits

Author SHA1 Message Date
Michael Snoyman
128165c19c Merge pull request #1054 from chreekat/keter-build-args
Add build-args to keter subcommand
2015-08-11 18:54:45 +03:00
Bryan Richter
3cae60bb88
Add build-args option to keter subcommand 2015-08-11 08:22:51 -07:00
Michael Snoyman
09343872c4 Version bump 2015-08-11 07:50:24 +03:00
Michael Snoyman
7d85092da2 Version bump 2015-08-11 07:48:56 +03:00
Michael Snoyman
b5077abdd9 Version bump for scaffold 2015-08-04 16:48:11 +03:00
Michael Snoyman
a6fe8c444d Upgrade to newer LTS 2015-08-04 16:44:18 +03:00
Michael Snoyman
4c7dc5caaf Scaffolding update 2015-08-04 16:44:18 +03:00
Greg Weber
0bab753ada Merge pull request #1050 from mpietrzak/master
Fix parameter order for uglifyjs.
2015-08-02 09:28:58 -07:00
Maciej Pietrzak
d1b8ba0e8a Fix parameter order for uglifyjs. 2015-08-02 17:40:49 +02:00
Michael Snoyman
896d2f9236 Allow fsnotify 0.2 2015-07-26 21:49:57 +03:00
Greg Weber
5f58f7b2ed Merge pull request #1044 from hritchie/master
Change done.cg to refer to 'stack build'
2015-07-25 08:08:49 -07:00
Heath Ritchie
37b2c6e095 Change done.cg to refer to 'stack build'
Remove instruction to use cabal install.
Instead direct users to use 'stack build', as is suggested in the quickstart
guide.
2015-07-25 10:40:39 -04:00
Andrew Martin
48657022be Merge pull request #1042 from yesodweb/add_getsYesod_function
Added getsYesod
2015-07-23 13:58:33 -04:00
Andrew Martin
c4d154b512 Added getsYesod 2015-07-23 13:29:16 -04:00
Andrew Martin
81c996f29e Merge pull request #1038 from yesodweb/widget_isstring_instance
Add IsString instance for WidgetT site m ()
2015-07-23 13:21:10 -04:00
Michael Snoyman
8024173e05 Fix warning 2015-07-23 06:24:58 +03:00
Michael Snoyman
8893393ec9 Version bump 2015-07-23 06:18:37 +03:00
Michael Snoyman
e023c769ee Version bump 2015-07-23 06:16:01 +03:00
Michael Snoyman
2d33f90803 Version bump 2015-07-23 06:15:12 +03:00
Bryan Richter
0588bfd6de Merge pull request #1041 from chreekat/stack-keter
Enable stack with yesod keter
2015-07-22 17:32:05 -07:00
Bryan Richter
7851a660a7
Use stack only if stack.yaml exists 2015-07-22 16:45:36 -07:00
Bryan Richter
c6499bbe91
WIP for #1039
This works, but ignores previous cabal(-dev) options. I'll work to add them
back in now.
2015-07-22 13:16:18 -07:00
Bryan Richter
9fbfb62e68
Warning cleanup
Note that configCompilerEx was added in Cabal-1.18.0, not 1.22.
2015-07-22 13:10:50 -07:00
Bryan Richter
57c20d7d31 Extra dep needed for stack 2015-07-22 12:54:48 -07:00
Christopher Reichert
a5a627db58 Clarify IsString instance for Widget only works with Strings. 2015-07-21 13:19:00 -05:00
Christopher Reichert
66ed314866 Document IsString instance for WidgetT. 2015-07-21 12:24:33 -05:00
Andrew Martin
4e354c9e07 Improve type inference for WidgetT IsString instance 2015-07-21 11:37:09 -04:00
Andrew Martin
00635452b9 Add IsString instance for WidgetT site m () 2015-07-21 11:07:52 -04:00
Michael Snoyman
2ebf14aaba Merge pull request #1035 from tolysz/patch-2
Update WebSockets.hs
2015-07-19 15:53:32 -07:00
Marcin Tolysz
1420f627e3 Update WebSockets.hs
Add `send and  receive` `DataMessageE` so the whole WS API is mirrored
2015-07-19 23:49:35 +01:00
Michael Snoyman
46fbb1a615 Have to type quit to quit 2015-07-20 01:29:46 +03:00
Michael Snoyman
9cb48dfa7a Merge branch 'master' of github.com:yesodweb/yesod 2015-07-20 01:25:17 +03:00
Michael Snoyman
beabde14bf Update since/changelog #772 2015-07-20 01:25:09 +03:00
Michael Snoyman
704b904e1f Merge branch 'master' of https://github.com/tolysz/yesod
Conflicts:
	yesod-websockets/yesod-websockets.cabal
2015-07-20 01:23:59 +03:00
Michael Snoyman
d8a831162c Merge pull request #1032 from creichert/master
Fix compilation error in yesod-websockets/sample.hs.
2015-07-15 09:52:53 -07:00
Christopher Reichert
118d33d3b4 Fix compilation error in yesod-websockets/sample.hs. 2015-07-15 11:28:07 -05:00
Michael Snoyman
0b0341a280 vector 0.11 2015-07-15 19:10:17 +03:00
Michael Snoyman
335df65eb8 Merge pull request #1008 from nathankot/generate-spec
Is there a reason why add-handler doesn't generate a spec file?
2015-07-07 08:43:00 -07:00
Michael Snoyman
8de3e80c94 Simplify README based on stack #1021 2015-07-05 15:24:39 +03:00
Michael Snoyman
add408c535 Version bump 2015-07-02 18:53:47 +03:00
Michael Snoyman
56ad4b137b Merge pull request #1027 from andrewthad/master
Don't show source location for logs that don't have that information
2015-07-02 08:52:54 -07:00
Andrew
e37ccee3d7 Use a let binding for greater clarity 2015-06-30 18:30:24 -04:00
Andrew Martin
e327963912 Don't show source location for logs that don't have that information 2015-06-30 17:02:33 -04:00
Michael Snoyman
c2efc73e04 Merge pull request #1022 from bergmark/patch-2
yesod-bin needs directory >= 1.2.1 due to System.Directory.findFiles
2015-06-30 09:29:46 +03:00
Adam Bergmark
79d87f1fd6 yesod-bin needs directory >= 1.2.1 due to System.Directory.findFiles 2015-06-30 07:56:55 +02:00
Michael Snoyman
aff47075b2 Update changelog 2015-06-30 06:49:17 +03:00
Michael Snoyman
aa273c6092 Merge pull request #1011 from geraldus/email-nonce
Use nonce package to generate verification keys and CSRF tokens
2015-06-30 06:48:31 +03:00
Michael Snoyman
a7cccf2a7c yesod devel support for stack 2015-06-29 08:14:04 +03:00
Arthur Fayzrakhmanov (Артур Файзрахманов)
4ba82fad96 Version bump 2015-06-24 20:54:27 +05:00
Arthur Fayzrakhmanov (Артур Файзрахманов)
2074915962 Apply stylish-haskell, organize imports 2015-06-24 20:54:27 +05:00