Commit Graph

2755 Commits

Author SHA1 Message Date
Michael Snoyman
19f13fa3c7 Scaffolding update 2013-12-04 07:00:28 +02:00
Michael Snoyman
4fe36c848e Bump resourcet dep 2013-12-04 06:09:28 +02:00
Michael Snoyman
04893d6b0a Export credsKey 2013-12-04 05:26:51 +02:00
Michael Snoyman
cf0fad20bc Merge branch 'master' of github.com:yesodweb/yesod 2013-12-03 12:34:55 +02:00
Michael Snoyman
cca38cfe03 Expand prefix on generated identifiers #625 2013-12-03 12:01:11 +02:00
Michael Snoyman
f85b38e817 Fix tests: force HTTP/1.1 in a few places 2013-12-03 11:57:56 +02:00
Michael Snoyman
c670c54ba4 fast-logger 2.0 2013-12-03 11:55:39 +02:00
Michael Snoyman
b18e43c050 Incomplete fast-logger 2.0 changes 2013-12-02 19:40:03 +02:00
Michael Snoyman
a2851c929c Merge branch 'master' into wai-2.0
Conflicts:
	yesod-bin/Devel.hs
2013-12-02 08:00:37 +02:00
Michael Snoyman
6b2e4ef3a4 Switch to EMBED_REFRESH 2013-12-02 07:59:26 +02:00
Michael Snoyman
b81a9721fb Disable CSS minification when combining stylesheets #623 2013-11-21 22:44:31 +02:00
Greg Weber
7915510322 hlint & compiler warnings
also tried out embeding the refresh file
2013-11-19 11:24:59 -08:00
Greg Weber
8390802a6b randomly show one motivational refresh messages 2013-11-19 11:24:59 -08:00
Michael Snoyman
089f8f1e12 Ignore sandbox files #620 2013-11-14 21:10:26 +02:00
Michael Snoyman
3330e89e10 Merge remote-tracking branch 'origin/master' into wai-2.0 2013-11-12 19:40:51 +02:00
Michael Snoyman
11b49dfe9e Merge remote-tracking branch 'origin/master' into HEAD 2013-11-12 19:29:34 +02:00
Michael Snoyman
dce5ea942e Fix a faulty rewrite rule 2013-11-12 19:29:18 +02:00
Michael Snoyman
4d25fd2be1 Replace lift . notFound to avoid a segfault bug 2013-11-12 19:28:18 +02:00
Michael Snoyman
d34c3f26dc WAI 2.0 updates 2013-11-10 16:49:26 +02:00
Michael Snoyman
6f495fc758 Merge branch 'master' into wai-2.0
Conflicts:
	yesod-static/yesod-static.cabal
2013-11-10 13:46:58 +02:00
Michael Snoyman
294641c404 Version bumps 2013-11-10 07:48:01 +02:00
Greg Weber
b86f809a10 fix environment capitalize function 2013-11-05 14:26:46 -08:00
Michael Snoyman
30dac8fbb6 Merge branch 'master' of github.com:yesodweb/yesod 2013-11-01 08:12:38 +02:00
Michael Snoyman
5a53777615 Newer entropy fixes #617 2013-11-01 08:12:14 +02:00
Greg Weber
9e17b83514 add --force-reinstalls to .travis.yml 2013-10-29 21:02:04 -07:00
Greg Weber
1722d32666 done message should reference the sandbox 2013-10-29 20:51:47 -07:00
Greg Weber
2d79ef43e9 cabal-dev -> cabal sandbox 2013-10-29 20:41:41 -07:00
Michael Snoyman
0c386c9f46 Replace ghcError with throwGhcException #612 2013-10-15 10:33:45 +03:00
Michael Snoyman
ad6e99d589 GHC 7.8 changes 2013-10-15 10:30:05 +03:00
Michael Snoyman
f04c4c456c Add an extensions line for TH 2013-10-15 10:30:05 +03:00
Michael Snoyman
5fb40434e9 Merge pull request #611 from wuzzeb/compress-messages
yesod-static: improve messages for embedded compression tools
2013-10-13 20:56:31 -07:00
Michael Snoyman
2e7694d465 Version bump 2013-10-13 18:40:17 +03:00
Michael Snoyman
a94566e22e Version bump 2013-10-13 13:06:41 +03:00
Michael Snoyman
3a9fa33b7e Export a TH-used identifier #609 2013-10-13 12:11:15 +03:00
Michael Snoyman
978d6a80da optparse-applicative 0.6 #610 2013-10-13 11:27:00 +03:00
Michael Snoyman
eb478470e9 Merge pull request #608 from AaronFriel/master
Update Socks dependency to fix build error
2013-10-10 09:39:40 -07:00
Aaron Friel
ba7d732a81 Update Socks dependency to fix build error 2013-10-10 10:39:37 -05:00
Michael Snoyman
8fb2d180d5 cereal 0.4 fpco/stackage#121 2013-10-01 15:42:46 +03:00
Michael Snoyman
eb5c5be2c5 Merge pull request #603 from axel-angel/checkboxesField
Add checkboxesField{,List} fields (based on multiSelectField{,List})
2013-09-22 11:21:43 -07:00
Axel Angel
0dcc9e2b29 Simplify in checkboxesField{,List}: no intermediate selOpts list 2013-09-22 15:08:21 +02:00
Axel Angel
a3bef1bc2b Add missing exports for checkboxesField{,List} 2013-09-22 15:01:09 +02:00
John Lenz
a4690dd424 yesod-static: improve messages for embedded compression tools
When trying various compression tools, display some messages
to the user about which compression tool is used.

--HG--
extra : rebase_source : e90e6ed49317b91a0fbe90d94f437459926f59e7
2013-09-19 15:22:14 -05:00
Axel Angel
d13c145b97 Add checkboxesField{,List} fields (based on multiSelectField{,List})
squashed:
    - Attrs are applied to checkboxes in checkBoxField
    - Fix checkboxesField{,List} attrs are applied to input instead of span
    - Fix checkboxesField{,List} attribute checked
2013-09-18 20:27:24 +02:00
Michael Snoyman
f0cfebe879 Merge pull request #601 from wuzzeb/data-default
static: make Entry a setting type
2013-09-17 10:14:55 -07:00
John Lenz
380cdcd174 static: make Entry a setting type
In the future we might want to add new features to the
Entry.  I am currently thinking about source maps, where
a new field will need to be added to the Entry.  Therefore,
use Data.Default to make sure we don't need to bump the
major version for these features.
2013-09-17 11:03:00 -05:00
Michael Snoyman
b903128bf0 Merge pull request #600 from wuzzeb/embedded-static
Embedded static
2013-09-15 00:51:00 -07:00
John Lenz
1a5aa23f13 static: fix the build on GHC 7.4
There were two build issues on GHC 7.4: using atomicModifyIORef'
and ByteString.Lazy.toStrict, both of which were missing.  These
are now fixed.

In addition, looking at the IORef code more closely,
we want the quite a bit of strictness in the IORef.
The common case is that the widget content already exists in the map
(every reload of a page will call embedStaticContent), but until we
force the map the thunks holding the duplicated generated content will
be kept around, leaking memory.  This will be the common situation since
the vast majority of the time the content already exists.  Since
the containers module does not have a strict map until 0.5, use
unordered containers which does have a strict map.
2013-09-12 17:52:15 -05:00
John Lenz
8e16fd2227 static: update sample-embed.hs and point the old embedded static to the new one 2013-09-12 12:21:47 -05:00
John Lenz
2ad3977712 static: add several embedded generators
This constains the generators to embed files, directories,
and javascript compression
2013-09-12 12:21:47 -05:00
John Lenz
f8a35ce0a0 static: Add an embedded static subsite
This commit adds just the subsite itself.  The subsite
works by running a list of generaters at compile time.
The entries produced by the generators are converted into
wai-app-static.WaiAppStatic.Storage.Embedded entries.  Also,
addStaticContent is supported via an IORef.  When a widget
produces static content (css, javascript), it is stuck into
the IORef inside the embedded static subsite.  The embedded
static subsite will then serve it from the IORef, properly
using a 304 response if the client already has the content.
2013-09-12 12:21:33 -05:00