Commit Graph

5252 Commits

Author SHA1 Message Date
Alfred Xing
58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Alfred Xing
29aabd84bd Fix up tests 2015-01-19 16:23:51 -08:00
Alfred Xing
fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Parker Moore
e58f8776b9 Update history to reflect merge of #3319 [ci skip] 2015-01-17 17:08:33 -08:00
Parker Moore
c378f741a8 Merge pull request #3319 from jekyll/split-off-textile 2015-01-17 17:08:15 -08:00
Parker Moore
6f440f55e0 Update history to reflect merge of #3321 [ci skip] 2015-01-17 16:56:24 -08:00
Parker Moore
cbe5f8e4dd Merge pull request #3321 from jekyll/performance-upgrades 2015-01-17 16:55:51 -08:00
Parker Moore
dec27bc166 Fix last feature 2015-01-17 16:52:12 -08:00
Parker Moore
2b29e09177 Fix some cucumber features. 2015-01-17 16:52:12 -08:00
Parker Moore
9d547f74cc Make all the tests happy. 2015-01-17 16:52:12 -08:00
Parker Moore
c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore
877cba9811 Remove direct baked-in support for Textile. 2015-01-17 16:51:28 -08:00
Parker Moore
2547d8adf3 Update history to reflect merge of #3322 [ci skip] 2015-01-17 16:50:30 -08:00
Parker Moore
091e86aa22 Merge pull request #3322 from pborreli/patch-1 2015-01-17 16:50:09 -08:00
Parker Moore
f11837dd7b Fix cucumber failures due to merge of #3134. 2015-01-17 16:48:12 -08:00
Pascal Borreli
d28fb07bb9 Fixed typo [ci skip] 2015-01-18 00:45:28 +00:00
Parker Moore
aaf0ba15cc Use frozen regular expressions for Utils#slugify 2015-01-17 16:25:33 -08:00
Parker Moore
ef2d558874 Markdown#matches should avoid regexp 2015-01-17 16:25:10 -08:00
Parker Moore
f7271a6ef9 Update history to reflect merge of #2918 [ci skip] 2015-01-17 16:06:55 -08:00
Parker Moore
10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore
aaea08e094 Remove superfluous Sass declarations. 2015-01-17 16:02:33 -08:00
Parker Moore
6081fcd75a Move the slugify options out to their own section so as to fix the formatting. 2015-01-17 16:00:35 -08:00
Parker Moore
18fb1bafa0 Update history to reflect merge of #3320 [ci skip] 2015-01-17 15:47:18 -08:00
Parker Moore
cf2f439db1 Merge pull request #3320 from jekyll/mcallan83-test_global_post_permalinks_with_template_variables 2015-01-17 15:47:03 -08:00
Parker Moore
87500addd5 Move the test & fix it. 2015-01-17 15:46:35 -08:00
Mike Callan
5868ba1691 new test to prove permalinks in global config do not respect template variables 2015-01-17 15:28:52 -08:00
Parker Moore
3fe80929ad We have 47 posts now in the tests. 2015-01-17 15:28:03 -08:00
Parker Moore
57b43e2229 Update history to reflect merge of #3134 [ci skip] 2015-01-17 15:25:17 -08:00
Parker Moore
b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore
c7d92c4e6d Move YAML Front Matter regexp into a constant. 2015-01-17 15:23:33 -08:00
Parker Moore
7f44500b4b Update history to reflect merge of #2774 [ci skip] 2015-01-17 15:17:26 -08:00
Parker Moore
6d9b4c2aba Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path 2015-01-17 15:16:50 -08:00
Parker Moore
1715956baa Update history to reflect merge of #3014 [ci skip] 2015-01-17 15:13:46 -08:00
Parker Moore
a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore
3d69582d36 Update history to reflect merge of #3274 [ci skip] 2015-01-17 15:01:58 -08:00
Parker Moore
84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore
153db8a230 Update site history. [ci skip] 2015-01-17 15:01:08 -08:00
Parker Moore
18f3d76603 Ensure Post#excerpt_separator always returns a string. 2015-01-17 14:59:44 -08:00
Parker Moore
8692822631 Update history to reflect merge of #3314 [ci skip] 2015-01-17 14:56:59 -08:00
Parker Moore
07ccbd9fac Merge pull request #3314 from yoshyosh/master 2015-01-17 14:56:41 -08:00
Parker Moore
1fc3887d4f Update history to reflect merge of #2571 [ci skip] 2015-01-17 14:56:13 -08:00
Parker Moore
ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Joseph Anderson
a1ea8b9798 Added versioning comment to configuration file
# previously `post` in Jekyll 2.2.
2015-01-16 15:58:21 -08:00
Parker Moore
f5fbf4ffd1 Update history to reflect merge of #3312 [ci skip] 2015-01-15 13:40:12 -08:00
Parker Moore
02aa2a1c33 Merge pull request #3312 from omegahm/fix-weird-spacing 2015-01-15 13:39:50 -08:00
Mads Ohm Larsen
60da4ef010 Fix weird spacing 2015-01-15 22:04:00 +01:00
Parker Moore
b1fd7377fd Update history to reflect merge of #3306 [ci skip] 2015-01-14 15:07:09 -08:00
Parker Moore
5d6fe236b2 Merge pull request #3306 from adamzr/patch-1 2015-01-14 15:06:36 -08:00
Adam Richeimer
3cb0f4f590 Formatting fixes
- Add command to list of types of plugins
- Made "command" plural to be consistent with other types
- Made the types into links within the page
2015-01-14 11:20:03 -08:00
Jordon Bedwell
2547df81a1 Allow test to be aliased as spec. 2015-01-14 06:58:08 -06:00