558dad7e70
Update history to reflect merge of #1604
2013-10-04 12:23:30 -04:00
38d70938e9
Merge pull request #1604 from sferik/update_rr_dependency
...
Update rr dependency to version ~> 1.1
2013-10-04 09:23:04 -07:00
2763d785b8
Update history to reflect merge of #1608
2013-10-04 12:21:15 -04:00
495ab66151
Merge pull request #1608 from sferik/update_launchy_dependency
...
Update launchy dependency to ~> 2.3
2013-10-04 09:18:55 -07:00
d32e3a06b4
Update history to reflect merge of #1495
2013-10-04 07:42:47 -05:00
fef96d95e1
Merge pull request #1495 from maul-esel/variable-include
...
Variable {% include %}
2013-10-04 05:42:27 -07:00
a5cb8c9f64
Update history to reflect merge of #1601
2013-10-04 07:40:45 -05:00
2bb29216e7
Merge pull request #1601 from maul-esel/fix-error-file
...
Fix error file reporting
2013-10-04 05:39:36 -07:00
be36ca5e6a
Update kramdown dependency to ~> 1.2
2013-10-04 12:04:56 +02:00
aea486819c
Update launchy dependency to ~> 2.3
2013-10-04 12:01:37 +02:00
4b6f96903f
Update cucumber dependency to ~> 1.3
2013-10-04 11:59:33 +02:00
ed17ef2b96
Update coveralls dependency to ~> 0.7.0
2013-10-04 11:57:41 +02:00
7bf7359d1b
Update rr dependency to version ~> 1.1
2013-10-04 11:36:10 +02:00
d098a35d65
Update rake dependency to ~> 10.1
2013-10-04 11:29:07 +02:00
76ada8c672
output correct path in case of liquid error in layout
...
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
2013-10-04 00:07:50 +02:00
809ab5e355
Move catching of liquid errors in include tags
...
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
2013-10-03 23:56:58 +02:00
7d56426d50
Update history to reflect merge of #1592
...
Combine it with the entry for #1590 since they're related. Move it
down to the site enhancements section since both pulls are changes to
the site.
2013-10-02 23:12:36 -05:00
3a72906795
Merge pull request #1592 from fxn/master
...
another pass on the documentation of generators
2013-10-02 21:01:38 -07:00
bc71dc84f1
Update history to reflect merge of #1503
2013-10-02 22:55:13 -05:00
b723a58f5f
Merge pull request #1503 from swanson/add-docs-for-data-feature
...
Add docs for new Data Files feature
2013-10-02 20:54:34 -07:00
92750c3cfd
Add parenthesis to the call for super
2013-10-02 21:51:32 -05:00
6d74b4df00
Update history to reflect merge of #1596
2013-10-02 21:48:03 -05:00
6abe01f60f
Merge pull request #1596 from maul-esel/error-file
...
Output path in case of liquid error in include file
2013-10-02 19:46:31 -07:00
09b5477856
Update history to reflect merge of #1598
2013-10-02 21:07:40 +00:00
46dcac63b1
Merge pull request #1598 from mojombo/maruku-0.6.0
...
Downgrade to Maruku 0.6.0 to fix all the tests
2013-10-02 14:05:55 -07:00
422b75ae39
Downgrade to Maruku 0.6.0 to fix all the tests
2013-10-02 15:05:33 +00:00
7a4ea086a1
Output path in case of render error in included file
...
Fixes #1591 .
2013-10-01 23:02:50 +02:00
623fa14b3c
Include tag: provide path in case of render error
2013-10-01 22:54:39 +02:00
2a92ad77cc
Document variables in include tag
2013-10-01 22:31:16 +02:00
4c6ccc8009
extend feature to ensure it works with parameters as well
2013-10-01 22:31:13 +02:00
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
50e945f251
Add a cucumber feature for variable includes
2013-10-01 22:22:50 +02:00
4e2217986f
another pass on the documentation of generators
...
This commit refines the docs contributed in f074bb6
2013-10-01 20:16:37 +02:00
3b6b56c220
Rebase on upstream/master; rename file to work with docs_ul includes file
2013-10-01 10:34:29 -04:00
eca642bf6f
Fix typo in data docs; update section pagination for migrations to correctly point back to data
2013-10-01 10:26:51 -04:00
f864b69019
Add docs for new Data Files feature
2013-10-01 10:26:51 -04:00
cb8572fedb
Update history to reflect merge of #1514
2013-09-30 22:55:26 -05:00
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
246825ac12
Update history to reflect merge of #1003
2013-09-30 22:50:23 -05:00
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
e8cab9da26
Update history to reflect merge of #1586
2013-09-30 22:47:18 -05:00
3071fcde11
Merge pull request #1586 from mojombo/print-webrick-url-if-muted
...
Print server address when launching a server.
2013-09-30 20:46:39 -07:00
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
92907c9545
Update history to reflect merge of #1590
2013-09-30 16:41:10 -05:00
670ec70c84
Merge pull request #1590 from fxn/master
...
adds more information to the documentation of generators
2013-09-30 14:40:35 -07:00
f074bb6ae6
adds more information to the documentation of generators
2013-09-30 23:04:29 +02:00
924285695c
Print server address when launching a server.
...
Related to: https://github.com/mojombo/jekyll/issues/1583
2013-09-28 19:18:36 -04:00
35336bfff4
Update history to reflect the merge of #1577 .
2013-09-27 15:12:50 -04:00
26803c28db
Remove gist URL in pagination docs.
2013-09-27 15:11:59 -04:00
Parker Moore
Matt Rogers
Erik Michaels-Ober
maul.esel
Xavier Noria
Matt Swanson
liufengyun