Commit Graph

7585 Commits

Author SHA1 Message Date
jekyllbot cc994105ed Update history to reflect merge of #5100 [ci skip] 2016-07-12 20:16:11 -07:00
jekyllbot 070267af8a Merge pull request #5100 from Crunch09/fix_activesupport_dependency
Merge pull request 5100
2016-07-12 20:16:10 -07:00
jekyllbot f42fac60b0 Update history to reflect merge of #5097 [ci skip] 2016-07-12 20:11:04 -07:00
jekyllbot b1674ed5b1 Merge pull request #5097 from chrisfinazzo/jekyll-community
Merge pull request 5097
2016-07-12 20:11:03 -07:00
jekyllbot a29498eaae Update history to reflect merge of #5069 [ci skip] 2016-07-12 19:50:33 -07:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834
Merge pull request 5069
2016-07-12 19:50:32 -07:00
jekyllbot 506ba8af1e Update history to reflect merge of #5098 [ci skip] 2016-07-12 19:22:40 -07:00
jekyllbot 49573b6fcf Merge pull request #5098 from esasse/patch-1
Merge pull request 5098
2016-07-12 19:22:39 -07:00
Florian Thomas 0ebf7129cf
use activesupport ~> 4.2 if we are on a Ruby < 2.2.2
activesupport 5.0.x requires a ruby version >= 2.2.2
see 48512d7906/activesupport/activesupport.gemspec (L10)
2016-07-12 22:18:11 +02:00
chrisfinazzo 3674a7760f
Remove JekyllConf from the sidebar 2016-07-11 22:18:12 -04:00
Erick Sasse d683baa257 Updates html-proofer code
As in html-proofer docs: https://github.com/gjtorikian/html-proofer
2016-07-11 23:17:30 -03:00
chrisfinazzo 26b2a6251c
Add a Community section and cleanup, closes #5057 2016-07-11 17:50:24 -04:00
Mike Neumegen 8d2227a03a
added JekyllConf page 2016-07-11 17:03:43 -04:00
jekyllbot 4b5126dda7 Update history to reflect merge of #5067 [ci skip] 2016-07-11 11:20:23 -07:00
jekyllbot 146d0f301d Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
Merge pull request 5067
2016-07-11 11:20:22 -07:00
jekyllbot 5b51b8bdf3 Update history to reflect merge of #5096 [ci skip] 2016-07-11 11:19:31 -07:00
jekyllbot 841727eed7 Merge pull request #5096 from chrisfinazzo/update-normalize-css
Merge pull request 5096
2016-07-11 11:19:30 -07:00
chrisfinazzo 232054a059
Update normalize.css to v4.2.0. 2016-07-11 12:41:42 -04:00
jekyllbot d4a7fbee28 Update history to reflect merge of #5068 [ci skip] 2016-07-08 23:23:18 -07:00
jekyllbot ac6ba15bae Merge pull request #5068 from stomar/example-com
Merge pull request 5068
2016-07-08 23:23:18 -07:00
Florian Thomas cc82d44222
check if relative URL contains a colon
fixes #2834
2016-07-08 20:33:47 +02:00
Marcus Stollsteimer ba8573c420 Change baseurl to example.com for some test cases 2016-07-08 15:48:14 +02:00
jekyllbot f6dc749332 Update history to reflect merge of #5063 [ci skip] 2016-07-07 15:42:31 -07:00
jekyllbot 09f3e46945 Merge pull request #5063 from ayastreb/extract-tag-name
Merge pull request 5063
2016-07-07 15:42:30 -07:00
Parker Moore 1a934125d9
Check for Ruby first, then JRuby 2016-07-07 13:37:25 -07:00
Parker Moore e3214c23a3
Add missing elements to Excerpt which delegate to its Document 2016-07-07 13:37:09 -07:00
Parker Moore c46f219d3c
Commit failing test for lack of certain excerpt drop properties. 2016-07-07 13:34:10 -07:00
jekyllbot 5a339cc735 Update history to reflect merge of #5065 [ci skip] 2016-07-07 08:12:05 -07:00
jekyllbot 8bc104969f Merge pull request #5065 from stomar/fix-test
Merge pull request 5065
2016-07-07 08:12:03 -07:00
Marcus Stollsteimer d4c87e3655 Remove useless statement from test 2016-07-07 15:30:59 +02:00
Anatoliy Yastreb ba08e17204 Extract tag name to class method 2016-07-07 14:41:57 +03:00
jekyllbot 25bff0075c Update history to reflect merge of #5056 [ci skip] 2016-07-06 19:34:58 -07:00
jekyllbot 08b279cbdd Merge pull request #5056 from ayastreb/drop-fetch
Merge pull request 5056
2016-07-06 19:34:56 -07:00
jekyllbot a25e97b5fb Update history to reflect merge of #5058 [ci skip] 2016-07-06 17:46:35 -07:00
jekyllbot 3a8e28cba1 Merge pull request #5058 from synthecypher/patch-2
Merge pull request 5058
2016-07-06 17:46:35 -07:00
Joshua Barnett c698e83eb1 Highlight help nav item when navigated to. 2016-07-06 12:00:19 +01:00
Anatoliy Yastreb 3aead1d4a9 Imitate fetch method instead of creating real Hash object 2016-07-06 11:20:37 +03:00
Anatoliy Yastreb 72d49490d2 Add fetch method to Drops 2016-07-05 21:22:24 +03:00
jekyllbot 51a80b8225 Update history to reflect merge of #5054 [ci skip] 2016-07-05 10:19:29 -07:00
jekyllbot bfaa80e41c Merge pull request #5054 from andrewmunsell/patch-1
Merge pull request 5054
2016-07-05 10:19:28 -07:00
Andrew Munsell ac552cd4e4 Add Formingo to the list of Jekyll form SaaS
Formingo (https://www.formingo.co) is a new service I'm working on that handles form processing for static websites, such as those generated through Jekyll. Adding it to the list of form services because I believe it'd be a helpful resource and alternative to some of the other listed services.
2016-07-04 16:15:48 -07:00
jekyllbot 2f8c0ffc5d Update history to reflect merge of #5043 [ci skip] 2016-06-30 10:37:16 -07:00
jekyllbot 5688266d54 Merge pull request #5043 from alexivkin/master
Merge pull request 5043
2016-06-30 10:37:15 -07:00
Alex Ivkin c261730799 Art gallery generator plugin added 2016-06-29 21:30:42 -07:00
jekyllbot 70aa8a4e37 Update history to reflect merge of #5015 [ci skip] 2016-06-29 12:18:41 -07:00
jekyllbot 325b4c88d5 Merge pull request #5015 from jekyll/remove-jruby-and-ruby-head
Merge pull request 5015
2016-06-29 12:18:40 -07:00
Parker Moore a072e9d25f
Ping our Travis overlords. 2016-06-29 00:55:11 -07:00
Parker Moore b772329c60
Merge branch 'master' into remove-jruby-and-ruby-head
* master: (41 commits)
  Fix rubocop offenses on master.
  script/fmt: print Rubocop version
  Update history to reflect merge of #5030 [ci skip]
  rubocop: separate deprecator error messages
  Update history to reflect merge of #5031 [ci skip]
  Update history to reflect merge of #5032 [ci skip]
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  Update history to reflect merge of #5024 [ci skip]
  Update history to reflect merge of #5025 [ci skip]
  utils: check that the object is a hash when merging default_proc
  Update history to reflect merge of #5026 [ci skip]
  rubocop: refactor modified? method
  Add a benchmark for capture vs. assign in Liquid. [ci skip]
  Update history to reflect merge of #5027 [ci skip]
  Add generator-jekyllized to third party plugins
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  ...
2016-06-29 00:52:58 -07:00
Parker Moore a7d25ed963
Fix rubocop offenses on master. 2016-06-28 22:08:06 -07:00
Parker Moore 6f3c01ca87
Fix for jruby 2016-06-28 18:30:02 -07:00