Commit graph

1339 commits

Author SHA1 Message Date
Jasper Van der Jeugt
0639a73c24 Merge branch 'master' of github.com:jaspervdj/hakyll 2014-05-09 11:51:12 +02:00
Jasper Van der Jeugt
43c2aeae54 Merge pull request #247 from blaenk/static-windows-check
Minor refactor of PR #233
2014-04-28 10:42:39 +02:00
Jorge Israel Peña
ca44e643a4 Minor refactor of PR #233
OS won't change mid-execution, so lets avoid the unnecessary
check each time `unixFilter` is run.
2014-04-27 15:55:33 -07:00
Jasper Van der Jeugt
889b9f95ad Merge pull request #246 from duplode/master
Add duplode.github.io to examples.
2014-04-27 15:21:12 +02:00
Daniel Mlot
b7f7b2ea65 Add duplode.github.io to examples. 2014-04-27 03:56:00 -03:00
Jasper Van der Jeugt
bb1700b198 Merge pull request #245 from moonlightdrive/master
close a missing p tag
2014-04-26 17:23:00 +02:00
Jyotsna Prakash
7e7d193722 close a missing p tag 2014-04-25 12:36:13 -07:00
Jasper Van der Jeugt
15a9b90988 Merge pull request #243 from izzycecil/FIX_toSiteRoot
Fix `toSiteRoot` so that it properly deals with "./"
2014-04-21 11:20:56 +02:00
Izzy Cecil
19788ede4e FIX: toSiteRoot no considers "./" to not be relavent. 2014-04-19 17:24:27 -06:00
Izzy Cecil
cc5ea59b8c ADD: Added failing test cases for toSiteRoot. 2014-04-19 17:20:58 -06:00
Jasper Van der Jeugt
8229765cbd Fix tag dependency issue, slightly improve caching 2014-04-11 21:12:01 +02:00
Jasper Van der Jeugt
889e6f59f7 Fix compilation when disabling preview server 2014-04-07 19:49:17 +02:00
Jasper Van der Jeugt
8dcc8f846a Strictify http-conduit dependency 2014-04-06 12:40:33 +02:00
Jasper Van der Jeugt
99e8bda0f4 Merge pull request #239 from emwap/master
Relax upper limit on http-conduit
2014-04-06 12:15:12 +02:00
Anders Persson
053fdcf552 Relax upper limit on http-conduit
Fixes #237.
2014-04-04 17:13:31 +02:00
Jasper Van der Jeugt
e906be0214 Add secure.plaimi.net to examples 2014-04-03 10:47:01 +02:00
Jasper Van der Jeugt
30c20db9ca Add jelv.is to examples 2014-04-03 10:44:05 +02:00
Jasper Van der Jeugt
2de507318f Version bump (4.5.0.1) 2014-04-01 12:07:34 +02:00
Jasper Van der Jeugt
8e6a6b73c1 Merge pull request #235 from dacto/master
Added imports that are missing when compiling under Windows.
2014-04-01 12:05:45 +02:00
Dacto
3bb0919d25 Added imports that are missing when compiling under Windows. 2014-03-31 23:07:40 -07:00
Jasper Van der Jeugt
dc0c47f6df Bump version, update changelog 2014-03-26 12:20:56 +01:00
Jasper Van der Jeugt
32d9f2ec43 Bump various dependencies 2014-03-26 12:14:16 +01:00
Jasper Van der Jeugt
d173de7438 Allow regex-tdfa-1.2
Closes #232
2014-03-26 12:10:28 +01:00
Jasper Van der Jeugt
0b705d7db0 Micro cleanup of pull request #233 2014-03-26 12:09:35 +01:00
Jasper Van der Jeugt
87eafc752f Revert "added gloabl metadata parsing"
This reverts commit e0f45b29b3.

Conflicts:
	src/Hakyll/Core/Provider/Metadata.hs
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
157a81b413 Revert "Fix loadGlobalMetadata on Windows"
This reverts commit e71bbd90a8.
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
bc1cfc8d5a Revert "Fix root directory in directory-wise metadata and beautify code"
This reverts commit a6ae4eb99d.
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
6552dd5bc0 Revert "Track metadata dependencies"
This reverts commit 712ffa39b5.

Conflicts:
	src/Hakyll/Core/Metadata.hs
	src/Hakyll/Core/Rules/Default.hs
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
e5446fd401 Revert "Added test case for global metadata"
This reverts commit 46b6f78da8.

Conflicts:
	tests/data/posts/metadata
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
3db3933b0b Revert "set internalRules last, so that it can be overrided by rules"
This reverts commit d406db44e3.
2014-03-26 12:05:38 +01:00
Jasper Van der Jeugt
969f2351ef Merge pull request #233 from rekahsoft/master
Fix unixFilter on Windows
2014-03-26 12:05:24 +01:00
Jasper Van der Jeugt
81a970c293 Merge pull request #234 from chrisdotcode/master
Add flag to bind on selected host, instead of default "0.0.0.0"
2014-03-25 11:11:30 +01:00
chrisdotcode
c922ab57ac "Serve on" should be "bind on". 2014-03-24 05:20:19 -04:00
chrisdotcode
5af08f807e Add flag to bind on selected host. 2014-03-24 04:50:17 -04:00
Collin J. Doering
da7ae99b12 Fix unixFilter on Windows
On windows, the 'unixFilter' function used window's 'createProcess'
function to create the external process that will filter some String
input. The problem with this is that it is unable to execute batch
stubs (eg. anything created using 'gem install ...') even if its in
$PATH. Anyways a solution to this issue is to execute the batch file
explicitly using 'cmd /c batchfile' but there is no rational way to know
where said batchfile is on the system. My solution is to detect windows
using the System.Info module and then instead of using 'proc' to create
the function, use 'shell' instead which will be able to execute
everything 'proc' can + batch files.

Inspired by: http://www.blaenkdenum.com/posts/the-switch-to-hakyll/#scss

Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
2014-03-23 17:30:29 -04:00
chrisdotcode
1a63b931a0 Update git ignore with cabal sandbox files. 2014-03-23 13:12:17 -04:00
Jasper Van der Jeugt
677a7f0f2d Merge pull request #230 from nagisa/watch-threading
Use OS threads for watch in Windows
2014-03-05 11:21:55 +01:00
Simonas Kazlauskas
6521cd7cbc Mention -threaded option in the tutorial 2014-03-04 21:23:48 +02:00
Simonas Kazlauskas
766060ed78 Use OS threads for watch on Windows 2014-03-04 21:22:35 +02:00
Jasper Van der Jeugt
ecdc1d3efc Add http://www.corentindupont.info/ to examples 2014-02-25 10:31:04 +01:00
Jasper Van der Jeugt
e3fc6cd05b Merge pull request #224 from crodjer/example-rohanjain.in
Add www.rohanjain.in as an example for Hakyll 4
2014-02-24 10:45:25 +01:00
Rohan Jain
3eba064ae6 Add www.rohanjain.in as an example for Hakyll 4
Highlight: Clean URLs, Sitemaps

Signed-off-by: Rohan Jain <crodjer@gmail.com>
2014-02-17 19:27:45 +05:30
Jasper Van der Jeugt
fd889c563a Merge pull request #221 from kosmikus/check-exit-code-fix
hakyll check: return exit code of 0 on success
2014-02-11 13:32:39 +01:00
Andres Loeh
21585c18f3 hakyll check: return exit code of 0 on success
The old test returns an exit code of 1 whenever the number of
errors is >= 0, which should always be the case. The fix replaces
this with a test whether the number of errors is strictly > 0.
2014-02-11 11:07:43 +01:00
Jasper Van der Jeugt
5ab9655714 Merge pull request #217 from cbcb/master
Changed command to watch from deprecated preview
2014-01-30 01:00:08 -08:00
Christian Baumhof
4b34d16f9f Changed command to watch from deprecated preview 2014-01-30 00:53:57 +01:00
Jasper Van der Jeugt
251c019e9e Don't cache pandocCompilerWithTransform, refactor 2014-01-28 11:04:28 +01:00
Jasper Van der Jeugt
ca20400712 Merge pull request #215 from co-dan/pandoc-transf
Added the `pandocCompilerWithTransformM` function
2014-01-28 01:59:40 -08:00
Dan
84ba953ed3 Typo in Pandoc.hs 2014-01-26 10:14:04 +03:00
Daniil Frumin
8a29542ee6 Added the pandocCompilerWithTransformM function 2014-01-24 14:55:32 +04:00