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

6257 Commits

Author SHA1 Message Date
chrisfinazzo f5351f7268 Use the proper names 2015-05-01 10:34:09 -04:00
Parker Moore bd25c62f55 Merge pull request #3681 from nightsense/master 
Fixes typo on doc page "Directory structure".
 2015-04-29 17:34:25 -07:00
nightsense cf778e2be6 Fixes typo on doc page "Directory structure". 2015-04-29 19:55:47 -04:00
Parker Moore bda515bfc7 Update history to reflect merge of #3670 [ci skip] 2015-04-29 13:48:04 -07:00
Parker Moore e5bbdb1c83 Merge pull request #3670 from jekyll/bernardodiasc-collections 
Merge pull request 3670
 2015-04-29 13:47:35 -07:00
Parker Moore 6a26907495 features: update collections features to match new iteration method 2015-04-29 10:49:06 -07:00
Bernardo Dias 8546298047 fix collections output, see #2346 2015-04-29 10:49:06 -07:00
Parker Moore eab92d3b96 Update history to reflect merge of #3678 [ci skip] 2015-04-29 10:36:06 -07:00
Parker Moore d3e867d4a0 Merge pull request #3678 from jekyll/minitest-5-6 
Merge pull request 3678
 2015-04-29 10:35:40 -07:00
Parker Moore ee7f7baef2 Update history to reflect merge of #3679 [ci skip] 2015-04-29 10:35:23 -07:00
Parker Moore 4e34d2627b Merge pull request #3679 from alfredxing/remove-relative-permalinks 
Merge pull request 3679
 2015-04-29 10:34:57 -07:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Matt Sheehan 786f6e1985 Add "Typescript Generator by Matt Sheehan" to the list of third-party plugins. 2015-04-28 12:53:17 -07:00
Parker Moore 6597bacee8 features: Update the way we access Minitest assertions 
Per https://github.com/cucumber/cucumber/wiki/Using-MiniTest.
 2015-04-28 12:49:45 -07:00
Jordon Bedwell e93e49c269 Update history.md to reflect the merger of #3671 2015-04-26 08:18:24 -05:00
Jordon Bedwell 166fdf35a3 Merge pull request #3671 from falkorichter/completeCiInstructions 
Added a mention on the Gemfile to complete the instructions
 2015-04-26 08:17:35 -05:00
Falko Richter 159dbd0170 feedback on jekyll#3671 2015-04-24 10:28:40 +02:00
Parker Moore bac28fcfce Merge pull request #3672 from chrisfinazzo/remove-extra-space 
Remove extra space
 2015-04-21 15:12:00 -07:00
chrisfinazzo 987309917a Remove extra space 2015-04-21 17:32:49 -04:00
Falko Richter 76c1dcc791 added a mention on the Gemfile to complete the instructions 
travis relies on a Gemfile tp be present.
 2015-04-21 10:53:56 +02:00
Parker Moore 7be47c2c48 ci docs: Add note that the .travis.yml assumes bundle install. 
Closes #3660
 2015-04-20 10:23:04 -07:00
Parker Moore c59d02d6c6 Update history to reflect merge of #3665 [ci skip] 2015-04-20 10:20:30 -07:00
Parker Moore 6ce345be59 Merge pull request #3665 from purp/master 
Merge pull request 3665
 2015-04-20 10:20:11 -07:00
Parker Moore 095736b5ef Update history to reflect merge of #3667 [ci skip] 2015-04-20 10:04:24 -07:00
I´m a robot 791b2eccf6 updated documentation on the excerpt_separator 2015-04-20 09:58:38 -07:00
Jim Meyer 4302604c89 remove non-essential with() statement 2015-04-18 23:36:12 -07:00
Jim Meyer 269662d0f0 DRY config value fetching 
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
 2015-04-18 16:59:36 -07:00
Jim Meyer 9c03fc3f27 Set logging to debug when verbose flag is set 
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
 2015-04-18 16:57:57 -07:00
Parker Moore f908051aa4 mime.types: remove extraneous hyphen before comment 2015-04-14 17:15:08 -07:00
Parker Moore 80a921ccfd Update history to reflect merge of #3649 [ci skip] 2015-04-14 17:13:03 -07:00
Parker Moore ab83f0bf2e Merge pull request #3649 from schneems/schneems/utf8-myhomework 
Merge pull request 3649
 2015-04-14 16:51:21 -07:00
schneems 701617cb0e Fix header for RSS feeds with UTF8 characters. 
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```

Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
 2015-04-14 18:21:25 -04:00
Jordon Bedwell e3ab992f75 Update history.md to reflect the merger of #3658. 2015-04-14 15:16:39 -05:00
Jordon Bedwell a682ca1600 Merge pull request #3658 from jekyll/fix-jekyll-minitest-rspec-mocks 
Create #mock_expects that goes directly to RSpec Mocks.
 2015-04-14 15:15:02 -05:00
Parker Moore fff7bb31f5 Update history to reflect merge of #3629 [ci skip] 2015-04-14 13:14:11 -07:00
Parker Moore 0072865512 Merge pull request #3629 from justinweiss/lsi_search_on_posts 
Merge pull request 3629
 2015-04-14 13:13:24 -07:00
Parker Moore da80240fac Update history to reflect merge of #3596 [ci skip] 2015-04-14 13:01:03 -07:00
Parker Moore 3aaa889218 Merge pull request #3596 from jekyll/static-files-upgrade 
Merge pull request 3596
 2015-04-14 12:52:36 -07:00
Jordon Bedwell f26cdd8da4 Create #mock_expects that goes directly to RSpec Mocks. 2015-04-14 14:20:55 -05:00
Parker Moore 00aa2955d8 generated site tests: put the static file mod time through a date filter 2015-04-14 11:52:26 -07:00
Parker Moore dead70724e Fix expectation for StaticFile#to_liquid in tests. 2015-04-14 11:52:26 -07:00
Parker Moore d15e4a9c8a Link things up to the new static files documentation. 2015-04-14 11:52:26 -07:00
Parker Moore ff3edbc16b static files mtime liquid should return a Time obj 2015-04-14 11:52:25 -07:00
Parker Moore 68907ab833 Update history to reflect merge of #3655 [ci skip] 2015-04-14 11:51:40 -07:00
Parker Moore 7d3a5f82be Merge pull request #3655 from alfredxing/sunset-maruku 
Merge pull request 3655
 2015-04-14 11:51:25 -07:00
Alfred Xing 5a60adb6bd Maruku deprecation error message 2015-04-14 10:58:47 -07:00
Alfred Xing 4f06ba7884 Remove Maruku-specific tests 2015-04-14 10:58:47 -07:00
Alfred Xing ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
Parker Moore 6dcdf06c8a Update history to reflect merge of #3657 [ci skip] 2015-04-14 10:15:20 -07:00
Parker Moore e19d6c3f7e Merge pull request #3657 from arthurnn/minitest_v 
Merge pull request 3657
 2015-04-14 10:15:01 -07:00