Commit Graph

78 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
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
d01d6fa61a Static file combining #517 2013-04-21 11:14:18 +03: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
ee8eefdaf7 Version bumps 2012-12-27 09:30:22 +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
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
f3a3408260 http-types 0.7 2012-07-06 16:24:24 +03:00
Michael Snoyman
014732dac8 hspec 1.2 2012-06-26 10:56:50 +03:00
Michael Snoyman
ebc737a5cb conduit 0.5 2012-06-22 15:28:14 +03:00
Felipe Lessa
d4d69e8e3e Bump yesod-static's version to 1.0.0.3. 2012-05-21 21:31:27 -03:00
Michael Snoyman
61b5627e44 Version bumps 2012-05-14 12:33:44 +03:00
Michael Snoyman
d0a7447f56 Remove containers upper bounds 2012-05-09 10:25:19 +03:00
Simon Hengel
ad93e8c729 yesod-static: Adapt tests for hspec-1.0 and hspec-1.1 2012-05-07 07:43:36 +02:00
Michael Snoyman
e18c678aed Remove upper bounds on bytestring (yesodweb/shakespeare#60) 2012-04-29 09:38:45 +03:00
Michael Snoyman
110b4a2b45 Relax some upper bounds 2012-04-05 22:40:51 +03:00
Michael Snoyman
43d938bbe7 Switch from BSD3 to MIT 2012-04-03 10:45:51 +03:00
Michael Snoyman
25ec577449 transformers 0.3 2012-03-28 16:23:00 +02:00
Michael Snoyman
4cc933b21a conduit 0.4 2012-03-28 07:19:58 +02:00
Michael Snoyman
cbd0719f37 conduit 0.3 2012-03-12 13:40:04 +02:00
Michael Snoyman
b26868cd28 Version bumps 2012-02-09 15:20:15 +02:00
Greg Weber
f3087f8e98 add tests back
removed in 1f2e451370
2012-02-05 07:56:36 -06:00
Michael Snoyman
2724785e04 conduit 0.2 2012-01-28 23:46:11 +02:00
Michael Snoyman
9b92215819 WAI 1.1 2012-01-26 15:56:13 +02:00
Michael Snoyman
97be0d1b90 Merge pull request #230 from sol/clickable-repository-urls
Use HTTP repository URLs
2012-01-18 04:01:58 -08:00
Michael Snoyman
548b69497a Cabal is frustrating 2012-01-18 13:54:14 +02:00
Simon Hengel
5c2f2b11c3 Use HTTP repository URLs
That way they get linked from Hackage.
2012-01-18 09:45:31 +01:00