1b1e85c0b8
Update history to reflect merge of #2273 [ci skip]
2014-04-28 12:42:20 -04:00
6be3084eac
Merge pull request #2273 from jpiasetz/copy-rails-functions
2014-04-28 12:41:31 -04:00
3e6a6ffb52
Update util functions
...
Cribbed from http://api.rubyonrails.org/classes/Hash.html#method-i-symbolize_keys
2014-04-28 02:06:41 -04:00
b5b55c90de
Update history to reflect merge of #2154 [ci skip]
2014-04-28 00:02:15 -04:00
c546269485
Merge pull request #2154 from jpiasetz/refactor-highlighter
2014-04-28 00:01:50 -04:00
cf81331b39
Revert back to an intialize more similar to the original
2014-04-27 23:21:00 -04:00
446ca8f73d
Context is not used within any of the renders so no need to pass it
2014-04-27 23:21:00 -04:00
d6bd735aff
Refactor highlighting
...
Extract some of the common logic from the renderers.
2014-04-27 23:20:00 -04:00
494dd97775
Update history to reflect merge of #2269 [ci skip]
2014-04-27 19:16:04 -04:00
49dd67432d
Merge pull request #2269 from jekyll/fix-up-serve
2014-04-27 19:15:33 -04:00
4a40187f8e
Update jekyll-sass-converter to the latest RC
...
To see a detailed history of the changes, please visit https://github.com/jekyll/jekyll-sass-converter/compare/v1.0.0.rc3...v1.0.0.rc4
Notable change is that you can now set the style of the outputted Sass.
Ref: https://github.com/jekyll/jekyll-sass-converter/issues/3
2014-04-27 19:15:02 -04:00
513e77635b
Refactor 'jekyll serve' command.
2014-04-27 19:02:33 -04:00
619772b5c8
Update history to reflect merge of #2264 [ci skip]
2014-04-27 15:59:40 -04:00
bac4075128
Collections' "written" attribute has been changed to "output".
...
This is a follow-up to 068d921ef6
2014-04-27 15:56:02 -04:00
3a610882f6
Avoid duplicated output using highlight tags
...
While using Rouge and an `highlight` tag, the output was duplicated
since the `output` variable in the Liquid tag definition was equal to
the highlighter's prefix value and the `<<` method changes its receiver.
Therefore, we should simply define an empty string and append the prefix
if it is present.
2014-04-27 12:22:40 +02:00
cdeaa154cd
Release 2.0.0.rc1
2014-04-25 23:16:07 -04:00
4e6d268ef3
Bump 💎 version.
2014-04-25 23:16:00 -04:00
068d921ef6
Fix up docs for collections.
...
#2238 .
2014-04-25 23:15:18 -04:00
f45b597e61
Update history to reflect merge of #2238 [ci skip]
2014-04-25 23:07:04 -04:00
1d8fff706b
Merge pull request #2238 from jekyll/fix-the-collections
2014-04-25 23:06:25 -04:00
6225073095
Use the 'output' key instead of 'write' for writing out collections' document files.
2014-04-25 19:47:35 -04:00
2ccf7f1cfb
Run jekyll build in features (must give subcommand)
2014-04-25 13:04:56 -04:00
a619ce3e9b
Move link around for GitHub training site & source.
...
#2257 .
2014-04-24 15:36:52 -04:00
38276abe78
Update history to reflect merge of #2257 [ci skip]
2014-04-24 15:34:31 -04:00
03a3a1a261
Merge pull request #2257 from stevenspasbo/master
2014-04-24 15:33:56 -04:00
7ef857a0bc
Fix syntax issue on Templates page with `include` example.
...
Fixes #2256 for the time being.
2014-04-24 14:08:33 -04:00
d2b1d538bf
Add test for collections' new #to_liquid sturff
2014-04-24 14:07:08 -04:00
c906dfdf71
TEST THE COLLECTIONS
2014-04-24 14:01:23 -04:00
dd4fe87f69
Use Hash.new instead of hash literal
2014-04-24 13:59:25 -04:00
fb39b41ffb
NO MORE DATA COLLECTION I CAN'T HANDLE IT
2014-04-24 13:59:25 -04:00
764dc88832
script/test should probably use bundler
2014-04-24 13:59:24 -04:00
b74c90dc20
Extract Collections metadata from site config
2014-04-24 13:59:24 -04:00
0dc680df0b
Always render collections, just don't always write them
2014-04-24 13:59:24 -04:00
3a6ad0737c
Add a script/test file for ❤️ and :money:
2014-04-24 13:59:24 -04:00
7be78de93a
Don't read the collection if it's the data collection
2014-04-24 13:59:24 -04:00
f1a422dfff
Don't pretend there is a collections setter
2014-04-24 13:59:24 -04:00
a27e5825b9
Nil-out `@collections` so `#collections` will re-compile
2014-04-24 13:59:24 -04:00
fd98d5b1e6
Fetch collection names agnostically regarding the data structure of config['collections']
2014-04-24 13:59:24 -04:00
330005d932
Reset the collections hash on #reset.
...
Fixes #2234 .
2014-04-24 13:59:24 -04:00
d379e3c012
Update history to reflect merge of #2258 [ci skip]
2014-04-23 14:01:00 -04:00
bb079d6b39
Merge pull request #2258 from caffinatedmonkey/cucumber_cleanup
2014-04-23 14:00:26 -04:00
f9375d5660
Cleaned up cucumbers
2014-04-23 13:40:21 -04:00
73cba00687
Fixed broken link to github training material site
2014-04-23 08:32:15 -07:00
0c3285ced7
Update history to reflect merge of #2253 [ci skip]
2014-04-22 14:57:04 -04:00
54d0c63956
Merge pull request #2253 from jekyll/var-substitution
2014-04-22 14:56:30 -04:00
4de2be8c5f
Add Jekyll::LiquidExtensions.lookup_variable
...
To use, just include `Jekyll::LiquidExtensions` as you please:
```ruby
class SayHi < Liquid::Tag
include Jekyll::LiquidExtensions
def initialize(tag_name, markup, tokens)
@markup = markup.strip
end
def render(context)
"hi #{lookup_variable(context, @markup)}"
end
end
```
Fixes #2071 .
2014-04-22 14:27:47 -04:00
68d491c40d
Update history to reflect merge of #2205 [ci skip]
2014-04-21 23:01:47 -04:00
9db5a1a6ce
Merge pull request #2205 from jekyll/maul-esel-frontmatter-defaults
2014-04-21 23:01:05 -04:00
49c0f9cccc
Update history to reflect merge of #2250 [ci skip]
2014-04-20 16:02:50 -04:00
8389e78ff3
Merge pull request #2250 from sheehamj13/patch-1
2014-04-20 16:02:16 -04:00
Parker Moore
John Piasetzki
John Piasetzki
Robin Dupret
Martin Charles
Steven Spasbo