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

8093 Commits

Author SHA1 Message Date
David Zhang 912079a796 Fix theme highlight 2016-08-16 13:57:19 +08:00
Mike Kasberg e080c7f1ce Fix a link in deployment-methods.md 
The link to the scp deploy script was broken - it appears someone
changed the link text and did not update the matching link text in the
markdown footer.

Because the script is really simple, and the script originally linked
includes some unnecessary scss commands, let's just inline the script.
 2016-08-15 15:01:59 -06:00
jekyllbot 9f8876a332 Update history to reflect merge of #5221 [ci skip] 2016-08-11 18:53:33 -07:00
jekyllbot 72629091d1 Merge pull request #5221 from ashmaroli/mod-travis 
Merge pull request 5221
 2016-08-11 18:53:32 -07:00
jekyllbot 30399528e4 Update history to reflect merge of #5222 [ci skip] 2016-08-11 14:22:51 -07:00
jekyllbot a49a5dcf4e Merge pull request #5222 from stkent/patch-1 
Merge pull request 5222
 2016-08-11 14:22:51 -07:00
jekyllbot dca8047f77 Update history to reflect merge of #5226 [ci skip] 2016-08-10 22:21:49 -07:00
jekyllbot 5a243fb64c Merge pull request #5226 from gerardorn/patch-1 
Merge pull request 5226
 2016-08-10 22:21:48 -07:00
Gerardo 3e65dd36a9 fixed typo 2016-08-11 00:03:59 -05:00
Eduardo Bouças e6f3fd347c Add link to Staticman 
This PR adds a link to [Staticman](https://staticman.net), a free and open source platform to insert user-generated into a Jekyll site by converting entries to data files and pushing them to the repository where the site lives.
 2016-08-10 10:08:00 +01:00
Stuart Kent b3ce1392db Add missing comma 2016-08-10 08:02:41 +01:00
Ashwin Maroli 1c68c23f85 update rubies in travis 2016-08-10 12:02:01 +05:30
Jordon Bedwell 8e361dfe7d That should be jruby-9.1.2.0. 2016-08-09 23:55:20 -05:00
Jordon Bedwell 4d44940b9c Fix bad colon in .travis.yml 2016-08-09 23:54:21 -05:00
Jordon Bedwell fbebdb7ce7 Cleanup .travis.yml so it can be updated more cleanly. 
Use shared values in YAML so that only certain pieces of .travis.yml need to be updated in order to update Ruby versions.  Things should cascade so that if people send a pull request they can update just RVM field.
 2016-08-09 23:53:59 -05:00
jekyllbot 088e931901 Update history to reflect merge of #5214 [ci skip] 2016-08-08 19:05:28 -07:00
jekyllbot c526c9dd62 Merge pull request #5214 from DirtyF/fix-5213 
Merge pull request 5214
 2016-08-08 19:05:27 -07:00
Frank Taillandier 519ccdf4d9 Remove mention of page for link tag 
fix #5213
 2016-08-08 21:39:31 +02:00
jekyllbot 4bff65be90 Update history to reflect merge of #5167 [ci skip] 2016-08-07 12:42:19 -07:00
jekyllbot 554749ae0a Merge pull request #5167 from Crunch09/plugin_manager_tests 
Merge pull request 5167
 2016-08-07 12:42:18 -07:00
Parker Moore b937757dce
Site#configure_theme: warn in case the 'theme' config is not a string 2016-08-07 12:03:50 -07:00
Florian Thomas 70ba8c578a
update require_gems test 2016-08-07 21:01:09 +02:00
Parker Moore de6476812f
Update history to reflect merge of #5182 
[ci skip]
 2016-08-07 11:55:24 -07:00
Parker Moore 7841db8acf
Merge branch 'DirtyF-doc-link-tag' 
* DirtyF-doc-link-tag:
  templates.md: {% link %} tag only accepts collection documents
  add more link tag usage examples
  [docs] link tag example for a post
  [docs] Document link Liquid tag
 2016-08-07 11:54:40 -07:00
Parker Moore ab4abb1933
templates.md: {% link %} tag only accepts collection documents 
Remove examples of pages/static file links until it's released.
#5182 #5199
 2016-08-07 11:54:32 -07:00
Florian Thomas 539154a158
replace `assert false, ...` with `refute` 2016-08-07 20:54:22 +02:00
jekyllbot 06126af5cc Update history to reflect merge of #5205 [ci skip] 2016-08-07 11:26:58 -07:00
jekyllbot d9a4f6a59a Merge pull request #5205 from DirtyF/document-new-theme 
Merge pull request 5205
 2016-08-07 11:26:58 -07:00
Stephen Checkoway 6167c09569 Run hooks in priority order. 
Low priority hooks are being run before higher priority hooks. This is easy to
demonstrate with the following plugin:

    1.upto(10).each do |n|
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:low] do
        puts "Low #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:normal] do
        puts "Normal #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:high] do
        puts "High #{n}"
      end
    end

Sorting by the negative of the priority and then by the order the hook was
added does the right thing.
 2016-08-06 20:56:34 -05:00
jekyllbot bc7aaf5274 Update history to reflect merge of #5183 [ci skip] 2016-08-06 12:30:35 -07:00
jekyllbot d0f55d7207 Merge pull request #5183 from nhoizey/patch-1 
Merge pull request 5183
 2016-08-06 12:30:34 -07:00
jekyllbot c9bf8d0726 Update history to reflect merge of #5196 [ci skip] 2016-08-06 12:27:49 -07:00
jekyllbot 61eda2ee40 Merge pull request #5196 from jekyll/site-template-jekyll-feed 
Merge pull request 5196
 2016-08-06 12:27:48 -07:00
Frank Taillandier aa8d7772d5 fix hightlight tag 2016-08-05 21:25:19 +02:00
Frank Taillandier 6ab8b5ffe1 Documentation : `new-theme` command 2016-08-05 21:15:57 +02:00
Jeff Kolesky e0ce4a00f8 Fixes `link` tag to work with static files 2016-08-04 20:03:01 -07:00
Jeff Kolesky 05445b81c7 Fixes tests to account for new info.md file 2016-08-04 19:40:14 -07:00
Frank Taillandier 50854d2f76 add more link tag usage examples 2016-08-04 10:56:39 +02:00
Jeff Kolesky 82d6657ae8 Adds ability to link to all files 
Fixes request made in #4624 and bug found in #5182
 2016-08-03 15:08:26 -07:00
jekyllbot bc7eb70385 Update history to reflect merge of #5190 [ci skip] 2016-08-03 11:57:52 -07:00
jekyllbot a63a6d8487 Merge pull request #5190 from shingo-nakanishi/master 
Merge pull request 5190
 2016-08-03 11:57:51 -07:00
jekyllbot 9e4f469469 Update history to reflect merge of #5194 [ci skip] 2016-08-03 11:57:21 -07:00
jekyllbot ca77dae267 Merge pull request #5194 from nhoizey/patch-2 
Merge pull request 5194
 2016-08-03 11:57:20 -07:00
Ben Balter 58cd8f3f4e use jekyll-feed for default site RSS feed 2016-08-03 12:10:44 -04:00
Nicolas Hoizey ddff013696 Fix path in the prompt 2016-08-03 14:00:53 +02:00
shingo-nakanishi f084de7bc9 need subcommand build 
simply run the `jekyll` shows

```
A subcommand is required. 
jekyll 3.2.1 -- Jekyll is a blog-aware, static site generator in Ruby
``` 

need subcommand build
 2016-08-03 10:56:43 +09:00
jekyllbot 01c59004e9 Update history to reflect merge of #5180 [ci skip] 2016-08-02 17:42:13 -07:00
jekyllbot cb99cf603a Merge pull request #5180 from XhmikosR/patch-1 
Merge pull request 5180
 2016-08-02 17:42:12 -07:00
jekyllbot d3ae8403ea Update history to reflect merge of #5185 [ci skip] 2016-08-02 17:30:21 -07:00
jekyllbot 997c61470b Merge pull request #5185 from crispgm/doc-for-filters 
Merge pull request 5185
 2016-08-02 17:30:20 -07:00