Commit Graph

1843 Commits

Author SHA1 Message Date
maul.esel
ef22ebd7f1 code improvements according to @parkr's suggestions 2013-07-05 14:13:40 +02:00
maul.esel
656dcca3d2 Add a cucumber test for passing variables 2013-06-22 15:47:59 +02:00
imathis
2b01b06ec8 Support passing Liquid variables to includes
Change the regex matching to allow Liquid variables and object fields
to be passed to the include. Use the render context to retrieve the
variable value. Also, relax syntax checks by allowing surrounding spaces
and dashes in parameter names.
2013-06-22 15:47:16 +02:00
maul.esel
f8f6784305 move parameter parsing to render time 2013-06-22 15:30:10 +02:00
maul.esel
00ed567f99 move regex to the top 2013-06-22 15:07:10 +02:00
maul.esel
bdd84f275e Ruby 1.8.7 only supports 1 param to Regexp.match() 2013-06-15 18:28:26 +02:00
maul.esel
99721ee8aa To satisfy Ruby 1.8.7, use look-ahead instead of look-behind 2013-06-15 18:19:52 +02:00
maul.esel
0fa03d2651 stupid Ruby 1.8.7 doesn't support named groups 2013-06-13 18:48:40 +02:00
maul.esel
53dec6a4f6 add single-quote cucumber testing 2013-06-13 18:39:00 +02:00
maul.esel
639acea0a7 do parameter parsing with @imathis' incredible regex
This also introduces single-quote support.
2013-06-13 18:38:14 +02:00
maul.esel
1b20a185ca fix liquid syntax in the docs 2013-06-12 18:14:03 +02:00
maul.esel
1e15df0701 fix cucumber feature to obey new date format 2013-06-11 16:28:50 +02:00
maul.esel
5a990f7854 add unit tests for include tag parameters 2013-06-11 16:11:56 +02:00
maul.esel
fad210100b document include tag parameters 2013-06-11 16:08:47 +02:00
maul.esel
f612330565 add support for parameters to {% include %} tags 2013-06-11 16:04:42 +02:00
maul.esel
73e589df56 add a cucumber feature for passing parameters to includes 2013-06-11 16:04:42 +02:00
Parker Moore
f9d26bfd51 Update history to reflect fixing of #1196. 2013-06-09 18:12:03 +02:00
Parker Moore
62a2390470 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Update history to reflect merge of #1191
  Update history to reflect merge of #1151
  Moving Quick-start guide to own section
  Remove extra parentheses and swapped regex back
  Combined two features into one
2013-06-09 18:09:31 +02:00
Parker Moore
9b668be281 Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. Fixes #1196. 2013-06-09 18:08:55 +02:00
Matt Rogers
1374a63542 Update history to reflect merge of #1191 2013-06-08 12:50:43 -05:00
Matt Rogers
da691b579f Merge pull request #1191 from leggetter/master
Moving Quick-start guide to own section
2013-06-08 10:49:32 -07:00
Matt Rogers
6850aa8094 Update history to reflect merge of #1151 2013-06-08 12:47:34 -05:00
Matt Rogers
a75b4a865d Merge pull request #1151 from jpiasetz/refactors-steps
Combined layout and theme features into one
2013-06-08 10:46:13 -07:00
Parker Moore
bbd789e549 Update history to reflect addition of fix for #1129. 2013-06-08 17:47:51 +02:00
Parker Moore
c4cf167ff1 Add documentation about paginate_path to "Templates" page in the docs. Closes #1129. 2013-06-08 17:46:58 +02:00
Parker Moore
03bdc2a2df Update history to reflect merge of #1175. 2013-06-08 17:34:41 +02:00
Parker Moore
bc3d4f9e33 Merge pull request #1175 from we-also-do-cookies/update_markuru_link_to_docs
Updated link to the official Maruku repo as stated on Maruku homepage
2013-06-08 08:33:58 -07:00
Parker Moore
f288eb271d Update history to reflect fix of #1182. 2013-06-08 17:32:23 +02:00
Parker Moore
c294d65730 Python is a dependency of Pygments. Closes #1182. 2013-06-08 17:32:08 +02:00
Parker Moore
1b2ae456d1 Update history to reflect the addition of the History page in the docs. 2013-06-08 17:26:40 +02:00
Parker Moore
10e3f67f1f Cleaned up code that generates History command. 2013-06-08 17:20:41 +02:00
Parker Moore
96051568fb Restructured docs a bit to accomodate new 'History' page. 2013-06-08 17:20:27 +02:00
Parker Moore
f8bb36c1cd Include instructions to upgrade to the latest version of Jekyll on 'Upgrading' page. Fixes #1194 2013-06-08 17:19:14 +02:00
Parker Moore
700d840a06 Release 1.0.3 v1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore
32143588ef Update history to reflect merge of #1189. Solves #1185. 2013-06-07 20:56:21 +02:00
Parker Moore
86e5a1f7a9 Merge pull request #1189 from mojombo/private-gist-support
Support new private gist syntax.
2013-06-07 11:55:09 -07:00
Parker Moore
f211560dcc Update history to reflect merge of #1190. Fixes #673. 2013-06-07 20:45:08 +02:00
Parker Moore
ae4da46ea1 Merge pull request #1190 from mojombo/maruku-errors
Fail loudly on MaRuKu errors (exit code other than 0).
2013-06-07 11:43:37 -07:00
Phil Leggetter
990d13cb17 Moving Quick-start guide to own section
As a new user to jekyll I wanted to get up and running as quickly as possible.

The first thing I did was jump to the docs (missing the example on the homepage - my bad) and look for the quick start guide. Since I couldn't find one I went for the 'Basic Usage' section. I ended up muddling around for about 10 minutes until I hit the home page again to see the simple - and very easy - example of how to get started.

So, in this pull request I've moved the Quick-start Guide out to it's own section so that users who really are impatient (like me) can clearly look for and jump to the quick start guide, follow the super-easy steps, and be up and running in a matter of minutes.

Interested to hear if this is thought of as being a good idea.
2013-06-07 11:54:01 +01:00
Parker Moore
1c18394afc Catch and print errors when MaRuKu freaks out, and exit with an error code other than 0. 2013-06-07 01:41:30 +02:00
Parker Moore
066912556e Support new private gist syntax. 2013-06-07 00:34:23 +02:00
Parker Moore
5e9b8d64c6 Merge pull request #1186 from gcapizzi/fix_command_line_params
Set short versions of --port and --host as -P and -H, respectively. Fixes #1173.
2013-06-06 15:08:42 -07:00
Giuseppe Capizzi
788ab57109 Fix #1173 2013-06-06 16:24:04 +02:00
Nicolas Alpi
e1b9363297 Updated link to the official Markuru repo as stated on Markuru homepage 2013-06-04 16:10:12 +01:00
Parker Moore
004125bcd2 Update history to reflect merge of #1147. 2013-06-03 21:02:07 +02:00
Parker Moore
94e5cb151f Merge pull request #1147 from beeeswax/frontmatter-nil
Add a Pro Tip to docs about front matter variables being optional
2013-06-03 12:00:40 -07:00
m
4efaaa8232 Add a Pro Tip to docs about front matter variables being optional 2013-06-03 11:07:35 -05:00
Matt Rogers
4270cce2e0 Update history to reflect merge of #1170. 2013-06-03 10:09:43 -05:00
Matt Rogers
cd3732e612 Merge pull request #1170 from mojombo/remove-ids-from-site-template
For template site, convert #post to .post. Fixes #1161.
2013-06-03 08:07:09 -07:00
Parker Moore
a3d1777251 Update history to reflect merge of #1166. 2013-06-02 19:07:04 +02:00