Commit Graph

2692 Commits

Author SHA1 Message Date
Matt Rogers cb4d15561c Merge pull request #1003 from liufengyun/data-sources
support data sources
2013-09-30 20:47:57 -07:00
Matt Rogers e8cab9da26 Update history to reflect merge of #1586 2013-09-30 22:47:18 -05:00
Matt Rogers 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
liufengyun 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
Matt Rogers 92907c9545 Update history to reflect merge of #1590 2013-09-30 16:41:10 -05:00
Matt Rogers 670ec70c84 Merge pull request #1590 from fxn/master
adds more information to the documentation of generators
2013-09-30 14:40:35 -07:00
Xavier Noria f074bb6ae6 adds more information to the documentation of generators 2013-09-30 23:04:29 +02:00
Dmitry Chestnykh 58cab6b050 Handle destinations outside of source. 2013-09-30 05:55:38 +02:00
Dmitry Chestnykh dfaf1f45cc Remove require 'pathname': already included. 2013-09-30 05:11:15 +02:00
Dmitry Chestnykh 8fe25a6958 Replace directory_watcher with listen.
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.

Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
Parker Moore 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
Parker Moore 425885460f DARN YOU RUBY 1.8.7 AND YOUR DIFFERENT TIME.TO_S METHOD 2013-09-28 14:16:57 -04:00
Parker Moore d958fd5679 Clean it up, clean it up. 2013-09-28 13:26:55 -04:00
Parker Moore 2dd7964926 C'mon, you're a Ruby developer. What are you doing. 2013-09-27 21:56:24 -04:00
Parker Moore aa6ee14fb7 Get some nice Regexp which is agnostic about the seconds. 2013-09-27 15:38:38 -04:00
Parker Moore 35336bfff4 Update history to reflect the merge of #1577. 2013-09-27 15:12:50 -04:00
Parker Moore 26803c28db Remove gist URL in pagination docs. 2013-09-27 15:11:59 -04:00
张君君 dd6d0b42fe Update pagination example 2013-09-26 00:11:06 +08:00
wǒ_is神仙 d800cdcc31 Merge pull request #1 from mojombo/master
sync
2013-09-25 09:03:22 -07:00
Parker Moore 5badf7d53b Update history to reflect merge of #1449 2013-09-23 22:31:38 -04:00
Parker Moore 27347596ad Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
Parker Moore 903be7b750 Update history to reflect merge of #1571 2013-09-23 10:17:43 -04:00
Parker Moore c78c4159c0 Merge pull request #1571 from mojombo/non-destructive-array-concat
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
Matt Rogers 93b5004c48 Update history to reflect merge of #1574 2013-09-23 09:12:44 -05:00
Matt Rogers d3cddc7c8b Merge pull request #1574 from Aptary/simplified_css
Remove overly specific css from main.css in site_template
2013-09-23 07:11:46 -07:00
Edward Ball 943acc4395 Remove overly specific css from site template 2013-09-23 13:23:54 +01:00
Parker Moore a88a63da2d Don't use destructive Array#concat for Liquid Attribute arrays 2013-09-22 18:26:34 -04:00
Tom Preston-Werner b0694e96d1 Removing Sparkleshare files. Thanks Sparkleshare, for that. 2013-09-20 20:02:40 -07:00
Tom Preston-Werner 1bfc10dd32 + ‘.sparkleshare’
+ ‘SparkleShare.txt’
2013-09-20 19:59:03 -07:00
maul.esel 1829c2734a 'gist' tag: switch to ArgumentError exception class
SyntaxError is reserved for Ruby's internal use.

Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors.
2013-09-19 23:23:04 +02:00
maul.esel 9409a3d034 raise exceptions in include tag 2013-09-19 14:32:15 +02:00
maul.esel 72c3bba56a Change error handling in 'post_url' tag: raise exception 2013-09-19 14:24:22 +02:00
maul.esel 39c0d125bb fix tests for new behaviour 2013-09-19 14:24:22 +02:00
maul.esel 06fb31544f Change error handling for gist tag: raise exception 2013-09-19 14:24:22 +02:00
Shigeya Suzuki a93b1a26eb Documentation update for the encoding configuration 2013-09-19 12:22:50 +09:00
Shigeya Suzuki c625ddf6cd Invoke File.read with or without options depends on Ruby version
- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix
2013-09-19 12:22:50 +09:00
Shigeya Suzuki 97e052df63 Pass encoding parameter as string, not an object 2013-09-19 12:21:26 +09:00
Shigeya Suzuki fbea3471dd Make TestConvertible to pass with utf-8 encoding 2013-09-19 12:21:25 +09:00
Shigeya Suzuki 8b892ed735 read_yaml to accept optional parameter to override defaults 2013-09-19 12:21:25 +09:00
MURAOKA Taro 4cb24f4b87 consider a case of "site" is unavailable in Convertible 2013-09-19 12:21:25 +09:00
MURAOKA Taro f4c2383d3c write document for config.encoding 2013-09-19 12:21:25 +09:00
MURAOKA Taro 8a28d80690 add encoding for configuration 2013-09-19 12:21:25 +09:00
Matt Rogers 7ccb62e524 Update history to reflect merge of #1490 2013-09-18 21:36:27 -05:00
Matt Rogers 793eb96a77 Merge pull request #1490 from penibelst/allow-include-read-override
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
Parker Moore bbd275840b Update history to reflect fixing of #1561 2013-09-18 13:52:25 -04:00
Parker Moore 5f6af4c215 Add note about installing Xcode on the Mac in the Installation docs.
Xcode command-line tools (clang and ruby headers) are required for installing some of Jekyll's dependencies which create native extensions.

Closes #1561.
2013-09-18 13:51:56 -04:00
Anatol Broder f97eed544c Change exception type in tests 2013-09-17 22:20:41 +02:00
Anatol Broder ec85c49de3 Change exception type 2013-09-17 22:11:56 +02:00
Anatol Broder 7cec996f90 Validate the entire markup as soon as possible 2013-09-17 21:41:11 +02:00
Anatol Broder 25519b38f6 Validate file name as soon as possible 2013-09-17 20:57:01 +02:00