Commit Graph

117 Commits

Author SHA1 Message Date
Michael Snoyman
98955ac161 Minor doc fix (thanks Toby) 2013-12-24 14:52:50 +02:00
Michael Snoyman
02ab5320e3 Version bumps 2013-12-04 07:01:20 +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
b81a9721fb Disable CSS minification when combining stylesheets #623 2013-11-21 22:44:31 +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
Michael Snoyman
ad6e99d589 GHC 7.8 changes 2013-10-15 10:30:05 +03: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
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
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
Michael Snoyman
94f42659ea Merge branch 'master' into wai-2.0 2013-09-08 13:23:09 +02:00
Michael Snoyman
e29cd12ff8 Version bumps 2013-09-08 10:46:37 +02:00
Alexey Kotlyarov
f0bef8005f Update to cryptohash-cryptoapi
Crypto.Hash.MD5 no longer exports the MD5 type, switch to
cryptohash-cryptoapi.
2013-09-01 15:05:27 +10:00
Michael Snoyman
2d0f560bea wai 2.0 2013-08-19 12:51:54 +03:00
Michael Snoyman
18dd77a1fe Revert string packing in yesod-static 2013-04-25 13:55:45 +03:00
Michael Snoyman
d79fe24d4d Fixes after merge 2013-04-24 22:00:56 +03:00
Michael Snoyman
98ededba28 Merge remote-tracking branch 'origin/yesod1.2'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/yesod-auth.cabal
	yesod-core/yesod-core.cabal
	yesod-static/Yesod/Static.hs
	yesod-static/yesod-static.cabal
	yesod/yesod.cabal
2013-04-24 19:00:03 +03:00
Michael Snoyman
d3f25d1f44 Version bumps 2013-04-24 18:23:44 +03:00
Michael Snoyman
d01d6fa61a Static file combining #517 2013-04-21 11:14:18 +03:00
Michael Snoyman
91757320f3 Dedupe path pieces in yesod-static 2013-04-18 22:59:40 +03:00
Felipe Lessa
53fd20d239 Squash static strings into a single one. 2013-04-09 18:03:32 -03:00
Felipe Lessa
1a8767935e Whitespace. 2013-04-09 18:03:17 -03:00
Michael Snoyman
0eda39f242 Added ParseRoute instance for Static 2013-03-19 15:53:03 +02:00
Michael Snoyman
8b9f8ea024 Some convenience re-exports 2013-03-15 05:54:09 +02:00
Michael Snoyman
2d93157e9a Fixed Yesod.Static 2013-03-14 19:02:30 +02:00
Michael Snoyman
9c4cd573b4 Everything compiles 2013-03-14 09:28:51 +02:00
Michael Snoyman
099b96f178 Everything compiles 2013-03-13 13:35:11 +02:00
Michael Snoyman
db57468832 Version bumps 2013-03-11 12:07:10 +02:00
Michael Snoyman
c39fa8ddf8 Version bumps 2013-02-18 18:36:20 +02:00
Michael Snoyman
a73cac167e wai 1.4 2013-02-18 12:39:20 +02:00
Michael Snoyman
551b9d7c1e Version bumps 2013-02-18 07:02:08 +02:00
Michael Snoyman
a1734e0e18 conduit 1.0 support 2013-02-13 11:45:50 +02:00
Michael Snoyman
d167842839 Version bumps, http-types 0.8 2013-01-29 10:33:14 +02:00
Michael Snoyman
617c1d724e Removed some FIXMEs 2013-01-02 14:26:56 +02:00
Michael Snoyman
ee8eefdaf7 Version bumps 2012-12-27 09:30:22 +02:00
Michael Snoyman
992f4e7893 staticFiles (in Yesod.Static) does not work without OverloadedStrings (#437) 2012-12-26 15:59:49 +02:00
Michael Snoyman
21090b9314 Version bumps 2012-11-11 10:08:37 +02:00
Michael Snoyman
d40da67656 Remove hspec upper bound 2012-11-09 09:12:32 +02:00
Michael Snoyman
1c7e4c6f1a Version bumps 2012-11-07 12:07:32 +02:00
Michael Snoyman
c26e5cd4eb Cleaned up some warnings 2012-11-02 08:27:30 +02:00
Michael Snoyman
cd8a898115 No infinite redirects in yesod-static (#442) 2012-10-28 09:09:44 +02:00
Michael Snoyman
393133d1b6 Add missing test files for yesod-static (#438) 2012-10-22 07:27:55 +02:00
Simon Hengel
dfae661878 Adept Hspec tests for forward compatibility
* Don't use hspecX, it's deprecated.

 * Do not import Test.Hspec.HUnit.  It's no longer necessary and may be
   removed in the future.
2012-10-16 14:44:58 +02:00
Michael Snoyman
a6ce05609d Version bumps 2012-09-11 07:17:23 +03:00
Michael Snoyman
df5018a94c hspec 1.3 2012-08-03 15:40:36 +03:00
Michael Snoyman
699d76d13a Merge branch 'beta'
Conflicts:
	yesod-core/yesod-core.cabal
	yesod-json/yesod-json.cabal
	yesod-test/Yesod/Test.hs
	yesod-test/test/main.hs
	yesod-test/yesod-test.cabal
2012-07-11 08:48:09 +03:00
Michael Snoyman
f3a3408260 http-types 0.7 2012-07-06 16:24:24 +03:00