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

6719 Commits

Author SHA1 Message Date
Parker Moore 29da9024ca Today, not yesterday. 2016-01-24 13:17:38 -08:00
Parker Moore 778fa4cc0e Release 💎 3.1.0 2016-01-24 13:13:53 -08:00
Parker Moore 55910f19c3 Merge branch 'master' of github.com:jekyll/jekyll 
* 'master' of github.com:jekyll/jekyll:
  Make our .travis.yml a little easier to maintain.
  Update History.markdown to reflect the merger of #4394
  Minor spelling error
 2016-01-24 13:13:21 -08:00
Parker Moore 368f5b67a9 Release 💎 3.1.0 2016-01-24 13:13:15 -08:00
Jordon Bedwell c5818d1837 Make our .travis.yml a little easier to maintain. 2016-01-24 09:50:02 -06:00
Jordon Bedwell ab8f2d6bb1 Update History.markdown to reflect the merger of #4394 2016-01-24 08:40:31 -06:00
Jordon Bedwell 7b5febdcd5 Merge pull request #4394 from j26design/patch-1 
Minor spelling error
 2016-01-24 08:39:35 -06:00
John Perry 96b80b1a72 Minor spelling error 2016-01-23 23:27:17 -07:00
Parker Moore 4b827e1797 Release 💎 3.1.0.pre.rc3 2016-01-22 13:15:41 -08:00
jekyllbot 4d138c9ab5 Update history to reflect merge of #4195 [ci skip] 2016-01-22 13:13:19 -08:00
jekyllbot ccb382679a Merge pull request #4195 from jekyll/pull/cleanup-document__post_read 
Merge pull request 4195
 2016-01-22 13:13:18 -08:00
jekyllbot 6d67e9bdd4 Update history to reflect merge of #4388 [ci skip] 2016-01-22 13:01:05 -08:00
jekyllbot 512c7fdb05 Merge pull request #4388 from jekyll/fix-page.class-access 
Merge pull request 4388
 2016-01-22 13:01:04 -08:00
Parker Moore 2b8de59717 remove merge conflict 2016-01-22 09:38:34 -08:00
Parker Moore afff4f0bec Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read 
* origin/pull/cleanup-document__post_read:
  add Utils.strip_heredoc
  Fix #4191: Reduce Document#post_read complexity slightly.
  Fix #4188: Extract title from filename successfully when dateless.
 2016-01-22 09:37:58 -08:00
Parker Moore 5878acaaf1 Document#post_read: only overwrite slug & ext if they aren't set by YAML 2016-01-22 09:36:55 -08:00
Parker Moore 6c40c7f553 collections.feature: check for 0 exit status always 2016-01-22 09:36:37 -08:00
Parker Moore ba1cfab73c step_definitions: fixture collections should copy _thanksgiving 2016-01-22 09:36:25 -08:00
Parker Moore 8204e479c3 add Utils.strip_heredoc 2016-01-22 09:11:56 -08:00
Jordon Bedwell 67f842546e Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-22 09:11:56 -08:00
rebornix 1298ba6908 Fix #4188: Extract title from filename successfully when dateless. 2016-01-22 09:09:30 -08:00
jekyllbot c0e0159783 Update history to reflect merge of #4389 [ci skip] 2016-01-22 09:03:44 -08:00
jekyllbot c42d27e428 Merge pull request #4389 from zsyed91/refactor_page_permalink 
Merge pull request 4389
 2016-01-22 09:03:43 -08:00
jekyllbot 95df351341 Update history to reflect merge of #4390 [ci skip] 2016-01-22 09:01:21 -08:00
jekyllbot cbe66193c2 Merge pull request #4390 from contentful/contentful/add-contentful-to-docs 
Merge pull request 4390
 2016-01-22 09:01:20 -08:00
Parker Moore cf51e32d0e Drop#[]: use self.class.invokable? instead of content_methods.include? for speed 2016-01-22 08:59:48 -08:00
David Litvak Bruno 442074fdb1 Add Contentful Extension to Plugins 2016-01-22 13:29:31 -03:00
Zshawn Syed 4ecdf6ce10 Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb 2016-01-21 23:44:30 -06:00
Parker Moore 31ae61b419 Drop#[]: only use public_send for keys in the content_methods array 2016-01-21 18:20:35 -08:00
Parker Moore b3ddd985a4 Merge pull request #4380 from jekyll/cherry-pick-4378 
Document: throw a useful error when an invalid date is given
 2016-01-20 14:58:44 -08:00
Parker Moore 4017e30cca Merge pull request #4382 from jekyll/3.0.2-release 
Release 💎 v3.0.2
 2016-01-20 14:34:00 -08:00
Parker Moore e9be8933de Release 💎 v3.0.2 2016-01-20 14:33:02 -08:00
Parker Moore a72629908a Document: throw a useful error when an invalid date is given 2016-01-20 14:19:06 -08:00
Parker Moore 1ba23c32c6 add Utils.strip_heredoc 2016-01-20 11:46:18 -08:00
Jordon Bedwell ec0eff3315 Switch to pry-byebug so everybody gets the benefit. 2016-01-20 13:30:56 -06:00
jekyllbot f1ac1f2125 Update history to reflect merge of #4376 [ci skip] 2016-01-20 11:07:34 -08:00
jekyllbot 7b8c39722b Merge pull request #4376 from pathawks/detach 
Merge pull request 4376
 2016-01-20 11:07:33 -08:00
jekyllbot af20abf1bc Update history to reflect merge of #4377 [ci skip] 2016-01-20 11:06:31 -08:00
jekyllbot 94b0c500c6 Merge pull request #4377 from liambowers/master 
Merge pull request 4377
 2016-01-20 11:06:31 -08:00
Jordon Bedwell e50d4d6b6e Fix bad UNLESS. 2016-01-20 07:30:07 -06:00
Jordon Bedwell 61acafe97a Move ByeBug to development and disallow for JRuby. 2016-01-20 07:24:24 -06:00
Jordon Bedwell 37e1101690 Re-add Gem version after accidental removal. 2016-01-20 07:04:22 -06:00
Liam Bowers f44a9cf401 Added the Wordpress2Jekyll Wordpress plugin 2016-01-20 12:25:29 +00:00
Pat Hawks 090cf5a50b
Disable auto-regeneration when running server detached 2016-01-19 23:12:59 -08:00
Brenton Horne 8507cda6dd Rm date indicators and >1 year inactive sites 2016-01-20 07:22:54 +10:00
Brenton Horne 805ab6b7f8 Adding commit/date indicators 2016-01-20 06:59:00 +10:00
Jordon Bedwell f8e8672148 Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-19 11:18:19 -08:00
rebornix d50656021f Fix #4188: Extract title from filename successfully when dateless. 2016-01-19 11:18:19 -08:00
Jordon Bedwell ecc5121918 Update our badge URL's for more reliability. 2016-01-19 10:15:58 -06:00
Jordon Bedwell 56a711f1ee Move to static Ruby versions so we can test on latest versions. 2016-01-19 10:11:54 -06:00