dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,533 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2533 Commits

Author SHA1 Message Date
Parker Moore e2b6b7d932 Merge pull request #1602 from sferik/update_safe_yaml_dependency 
Update safe_yaml dependency to ~> 0.9.7
 2013-10-04 11:39:05 -07:00
Erik Michaels-Ober cebb936e60 Update safe_yaml dependency to ~> 0.9.7 2013-10-04 19:52:55 +02:00
Parker Moore 55f4c3a0fd Update history to reflect merge of #1613 2013-10-04 13:37:11 -04:00
Parker Moore b850c01605 Merge pull request #1613 from maul-esel/fix-variable-include 
fix error with variable as file name
 2013-10-04 10:36:26 -07:00
maul.esel b00849544b fix error with variable as file name 2013-10-04 19:12:29 +02:00
Parker Moore 04c0c2d0bb Don't post to IRC unless it's really important. 2013-10-04 12:58:58 -04:00
Parker Moore 06a757f156 Update history to reflect merge of #1610 2013-10-04 12:31:22 -04:00
Parker Moore 68306c691a Merge pull request #1610 from sferik/update_kramdown_dependency 
Update kramdown dependency to ~> 1.2
 2013-10-04 09:30:41 -07:00
Parker Moore 31b6a930c4 Update history to reflect merge of #1603 2013-10-04 12:29:39 -04:00
Parker Moore 6b2561424a Merge pull request #1603 from sferik/update_rake_dependency 
Update rake dependency to ~> 10.1
 2013-10-04 09:29:12 -07:00
Parker Moore c32e317236 Update history to reflect merge of #1606 2013-10-04 12:28:56 -04:00
Parker Moore ddcb6e95f5 Merge pull request #1606 from sferik/update_coveralls_dependency 
Update coveralls dependency to ~> 0.7.0
 2013-10-04 09:28:30 -07:00
Parker Moore 9dc6fee9c5 Move version updates for development dependencies to 'Development Fixes' heading. 2013-10-04 12:27:53 -04:00
Parker Moore 87693eeffe Update history to reflect merge of #1607 2013-10-04 12:27:19 -04:00
Parker Moore 82c8672632 Fix merge conflict. 2013-10-04 12:26:07 -04:00
Parker Moore 558dad7e70 Update history to reflect merge of #1604 2013-10-04 12:23:30 -04:00
Parker Moore 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
Parker Moore 2763d785b8 Update history to reflect merge of #1608 2013-10-04 12:21:15 -04:00
Parker Moore 495ab66151 Merge pull request #1608 from sferik/update_launchy_dependency 
Update launchy dependency to ~> 2.3
 2013-10-04 09:18:55 -07:00
Matt Rogers d32e3a06b4 Update history to reflect merge of #1495 2013-10-04 07:42:47 -05:00
Matt Rogers fef96d95e1 Merge pull request #1495 from maul-esel/variable-include 
Variable {% include %}
 2013-10-04 05:42:27 -07:00
Matt Rogers a5cb8c9f64 Update history to reflect merge of #1601 2013-10-04 07:40:45 -05:00
Matt Rogers 2bb29216e7 Merge pull request #1601 from maul-esel/fix-error-file 
Fix error file reporting
 2013-10-04 05:39:36 -07:00
Erik Michaels-Ober be36ca5e6a Update kramdown dependency to ~> 1.2 2013-10-04 12:04:56 +02:00
Erik Michaels-Ober aea486819c Update launchy dependency to ~> 2.3 2013-10-04 12:01:37 +02:00
Erik Michaels-Ober 4b6f96903f Update cucumber dependency to ~> 1.3 2013-10-04 11:59:33 +02:00
Erik Michaels-Ober ed17ef2b96 Update coveralls dependency to ~> 0.7.0 2013-10-04 11:57:41 +02:00
Erik Michaels-Ober 7bf7359d1b Update rr dependency to version ~> 1.1 2013-10-04 11:36:10 +02:00
Erik Michaels-Ober d098a35d65 Update rake dependency to ~> 10.1 2013-10-04 11:29:07 +02:00
maul.esel 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
maul.esel 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
Matt Rogers 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
Matt Rogers 3a72906795 Merge pull request #1592 from fxn/master 
another pass on the documentation of generators
 2013-10-02 21:01:38 -07:00
Matt Rogers bc71dc84f1 Update history to reflect merge of #1503 2013-10-02 22:55:13 -05:00
Matt Rogers 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
Matt Rogers 92750c3cfd Add parenthesis to the call for super 2013-10-02 21:51:32 -05:00
Matt Rogers 6d74b4df00 Update history to reflect merge of #1596 2013-10-02 21:48:03 -05:00
Matt Rogers 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
Parker Moore 09b5477856 Update history to reflect merge of #1598 2013-10-02 21:07:40 +00:00
Parker Moore 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
Parker Moore 422b75ae39 Downgrade to Maruku 0.6.0 to fix all the tests 2013-10-02 15:05:33 +00:00
maul.esel 7a4ea086a1 Output path in case of render error in included file 
Fixes #1591.
 2013-10-01 23:02:50 +02:00
maul.esel 623fa14b3c Include tag: provide path in case of render error 2013-10-01 22:54:39 +02:00
maul.esel 2a92ad77cc Document variables in include tag 2013-10-01 22:31:16 +02:00
maul.esel 4c6ccc8009 extend feature to ensure it works with parameters as well 2013-10-01 22:31:13 +02:00
maul.esel 2138dfc0ac Fix code to allow dots in variables 2013-10-01 22:31:11 +02:00
maul.esel a93795bcc0 implement variable retrieval in include tag 
Fixes #1464.
 2013-10-01 22:28:45 +02:00
maul.esel 50e945f251 Add a cucumber feature for variable includes 2013-10-01 22:22:50 +02:00
Xavier Noria 4e2217986f another pass on the documentation of generators 
This commit refines the docs contributed in f074bb6.
 2013-10-01 20:16:37 +02:00
Matt Swanson 3b6b56c220 Rebase on upstream/master; rename file to work with docs_ul includes file 2013-10-01 10:34:29 -04:00