github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-29 16:58:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,125 Commits 60 Branches 160 Tags
1d788203df00a012de23cdbf6ad554fe51a34502
Commit Graph

7125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jekyllbot
1d788203df Merge pull request #4710 from fenollp/safe-symlinks 
Merge pull request 4710
 2016-04-21 17:38:00 -07:00
jekyllbot
1ac9c21956 Update history to reflect merge of #4808 [ci skip] 2016-04-21 17:20:03 -07:00
jekyllbot
298d56aab2 Merge pull request #4808 from jekyll/fix-collection-defaults- 
Merge pull request 4808
 2016-04-21 17:20:02 -07:00
jekyllbot
d8dc0b6333 Update history to reflect merge of #4595 [ci skip] 2016-04-21 17:19:00 -07:00
jekyllbot
30f2bdff5b Merge pull request #4595 from jekyll/themes 
Merge pull request 4595
 2016-04-21 17:18:59 -07:00
Parker Moore
685abf109b Merge pull request #4819 from jekyll/release-posts 
Release posts for v3.0.4 and v3.1.3
 2016-04-21 17:17:31 -07:00
Parker Moore
e4057e0c81 Write release posts. 2016-04-21 17:17:13 -07:00
Parker Moore
57ccbe08ea Ensure symlinks work as expected (and secured). 2016-04-21 16:32:52 -07:00
Parker Moore
bac65ea8c5 C'mon travis 2016-04-21 16:16:46 -07:00
Parker Moore
49a3f543f3 Theme: configure sass at initialize time so we don't forget 2016-04-21 16:11:09 -07:00
Parker Moore
3b2d68d333 LayoutReader: read proper item from theme class 2016-04-21 16:10:43 -07:00
Parker Moore
2b73696d03 Set @path and @base_dir on the Layout per whether it's in the theme 2016-04-21 16:10:19 -07:00
Parker Moore
d5dd423bfd Add cucumber specs. 2016-04-21 16:09:23 -07:00
Parker Moore
42cc2445a5 Merge branch 'master' into themes 
* master: (58 commits)
  Update history to reflect merge of #4792 [ci skip]
  Update history to reflect merge of #4793 [ci skip]
  Update history to reflect merge of #4804 [ci skip]
  Update history to reflect merge of #4754 [ci skip]
  Update history to reflect merge of #4813 [ci skip]
  Added missing single quote on rsync client side command
  Add v3.0.4 and v3.1.3 to the history.
  Fixed typo
  Add jekyll-autoprefixer plugin
  Explicitly require Filters rather than implicitly.
  Update history to reflect merge of #4786 [ci skip]
  Update history to reflect merge of #4789 [ci skip]
  updates example domain in config template
  Globalize Jekyll's Filters.
  Update JRuby to 9.0.5.0; Drop the double digit test.
  Update Rack-Jekyll Heroku deployment blog post url
  convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
  Update history to reflect merge of #4734 [ci skip]
  Update history to reflect merge of #4478 [ci skip]
  Fix rubocop warning.
  ...
 2016-04-21 11:43:35 -07:00
Parker Moore
f67f771a45 Empty release posts 2016-04-21 11:41:54 -07:00
Parker Moore
655ffd45be Use source_dir instead of my own computer's path 2016-04-21 11:26:33 -07:00
jekyllbot
0d89b77dae Update history to reflect merge of #4792 [ci skip] 2016-04-20 14:06:11 -07:00
jekyllbot
341407ef2a Merge pull request #4792 from jekyll/feature/globalize-filters 
Merge pull request 4792
 2016-04-20 14:06:10 -07:00
jekyllbot
1d55558956 Update history to reflect merge of #4793 [ci skip] 2016-04-20 14:03:36 -07:00
jekyllbot
46b2ab8e88 Merge pull request #4793 from sl4m/change-example-domain-url 
Merge pull request 4793
 2016-04-20 14:03:36 -07:00
jekyllbot
823a84fec9 Merge pull request #4799 from vwochnik/patch-1 
Merge pull request 4799
 2016-04-20 14:01:22 -07:00
jekyllbot
1ec64f568d Update history to reflect merge of #4804 [ci skip] 2016-04-20 13:57:26 -07:00
jekyllbot
f6f0d39b81 Merge pull request #4804 from henrywright/patch-1 
Merge pull request 4804
 2016-04-20 13:57:25 -07:00
jekyllbot
94647af1f4 Update history to reflect merge of #4754 [ci skip] 2016-04-20 12:31:10 -07:00
jekyllbot
894b356619 Merge pull request #4754 from lexoyo/patch-1 
Merge pull request 4754
 2016-04-20 12:31:08 -07:00
jekyllbot
f61ba8abf7 Update history to reflect merge of #4813 [ci skip] 2016-04-19 11:02:18 -07:00
jekyllbot
ccd5c9e106 Merge pull request #4813 from joshaidan/patch-1 
Merge pull request 4813
 2016-04-19 11:02:17 -07:00
Brian Jones
4e09375531 Added missing single quote on rsync client side command 
The rsync command was missing a single quote around the --rsh='ssh -p2222' parameter.
 2016-04-19 13:59:23 -04:00
Parker Moore
9315cdb473 Add v3.0.4 and v3.1.3 to the history. 2016-04-18 14:34:29 -07:00
Parker Moore
40e3a04704 test_document: scopes are based on relative_path 2016-04-18 13:56:02 -07:00
Parker Moore
87825e1e14 Document#read: frontmatter.all should get relative_path not URL 2016-04-18 13:55:57 -07:00
Florian Thomas
46dd5cf5a2 add failing test for scope values in subdirs 
ref #4458
 2016-04-18 13:55:51 -07:00
Henry Wright
adc6a491b9 Fixed typo 
Add an apostrophe.
 2016-04-17 20:39:20 +01:00
Vincent Wochnik
6f794ae320 Add jekyll-autoprefixer plugin 2016-04-16 14:48:35 +02:00
Jordon Bedwell
27366f2e30 Explicitly require Filters rather than implicitly. 2016-04-15 12:02:25 -05:00
jekyllbot
8257f0abd9 Update history to reflect merge of #4786 [ci skip] 2016-04-15 09:15:14 -07:00
jekyllbot
f922e8994a Merge pull request #4786 from jekyll/convertible-use-doc-frontmatter-regexp 
Merge pull request 4786
 2016-04-15 09:15:13 -07:00
jekyllbot
b97d9b688e Update history to reflect merge of #4789 [ci skip] 2016-04-15 09:14:33 -07:00
jekyllbot
5e302d7ec6 Merge pull request #4789 from duksis/master 
Merge pull request 4789
 2016-04-15 09:14:32 -07:00
skim
b122148acf updates example domain in config template 2016-04-15 09:29:39 +01:00
Jordon Bedwell
1e74c7a547 Globalize Jekyll's Filters. 
As it stands Jekyll does not globalize it's filters.  So anybody wishing to go
into Jekyll's context to process their own Liquid (say in a plugin) may be taken
aback when they find out that Jekyll's filters are not available.
See: jekyll/jekyll-assets#252.
 2016-04-14 20:36:22 -05:00
Jordon Bedwell
8144e7620f Update JRuby to 9.0.5.0; Drop the double digit test. 
We've tested enough of the double digit stuff, it's only slowing down our specs and we've got an idea about what's going on with it.
 2016-04-14 14:32:16 -05:00
Hugo Duksis
bb307bf6c1 Update Rack-Jekyll Heroku deployment blog post url 
Failed to deploy to heroku by following old blog post  
but after stumbling up on https://github.com/adaoraul/rack-jekyll/issues/20
managed to do it and would like to avoid the trouble for others.
 2016-04-14 18:24:46 +02:00
Parker Moore
f210cafdf2 convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files 2016-04-13 23:22:05 -04:00
jekyllbot
519c3eb51f Update history to reflect merge of #4734 [ci skip] 2016-04-13 20:18:12 -07:00
jekyllbot
1cf5c8abd7 Merge pull request #4734 from nsgonultas/master 
Merge pull request 4734
 2016-04-13 20:18:12 -07:00
jekyllbot
7635d08ecf Update history to reflect merge of #4478 [ci skip] 2016-04-13 13:37:29 -07:00
jekyllbot
fc0d440201 Merge pull request #4478 from edgemaster/where-exp 
Merge pull request 4478
 2016-04-13 13:37:29 -07:00
Thomas Wood
e470cae6da Fix rubocop warning. 2016-04-12 19:11:59 +01:00
Thomas Wood
1ef7653fed Fix minor code style recommendations and typos. 2016-04-12 18:59:56 +01:00