36c5017300
Merge pull request #2575 from alfredxing/test-document-permalink
2014-07-09 23:43:01 -07:00
e8e245e20f
Fix Data Files example around iterative over files in a subfolder of _data.
...
Addresses @fkostadinov's comment in #2395 :
https://github.com/jekyll/jekyll/pull/2395#issuecomment-48151478
2014-07-09 08:24:33 -07:00
2141ea6564
Update history to reflect merge of #2578 [ci skip]
2014-07-08 23:16:58 -07:00
d3959d5899
Merge pull request #2578 from juthilo/patch-1
2014-07-08 23:16:37 -07:00
cbb4b10ce6
Update Maruku dependency to allow use of the latest version.
...
All Maruku releases post-0.6 follow semver, so they should be backwards-compatible on minor versions. In this case, the only test that needed to change was one that was asserting buggy behavior that was fixed in 0.7.1.
2014-07-08 19:44:40 -07:00
861c81b590
Update link to Windows installation guide
...
I've just released a new version of Run Jekyll on Windows and it's now got its own domain!
2014-07-09 01:44:11 +02:00
28131624b8
Don't use old `@url` variable
...
Fix for #2557
2014-07-07 10:54:19 -07:00
ce1f01c494
Modify tests a bit
2014-07-07 10:49:36 -07:00
a13a4ca532
Solidify document permalink tests
2014-07-07 10:39:22 -07:00
f830120044
Add test for document permalink
2014-07-07 10:28:03 -07:00
7645a72b2f
Update history to reflect merge of #2572 [ci skip]
2014-07-05 13:46:14 -07:00
ff8a8b8302
Merge pull request #2572 from AJ-Acevedo/master
2014-07-05 13:44:58 -07:00
a7cc026e2c
Fixed broken link to Permalinks page [ci skip]
...
The Permalinks link was generating a 404 error due to the link using a capital P in the link path.
2014-07-05 14:20:30 -04:00
c78bf2775f
Update history to reflect merge of #2567 [ci skip]
2014-07-04 03:19:41 -04:00
0082bb22fb
Merge pull request #2567 from austinpray/beefUpDox
2014-07-04 03:19:09 -04:00
febf80cccd
Merge branch 'master' of github.com:jekyll/jekyll into beefUpDox
2014-07-03 10:36:16 -05:00
4d8dab6e33
Update history to reflect merge of #2563 [ci skip]
2014-07-01 20:15:54 -04:00
f385fd9efd
Merge pull request #2563 from jekyll/fix-read-vuln
2014-07-01 20:14:45 -04:00
a66d96ce0a
Use Jekyll.sanitized_path more.
2014-07-01 18:29:15 -04:00
05f1fac2a7
Add feature for layouts vuln.
2014-07-01 18:29:01 -04:00
03ae38a41e
Merge pull request #2561 from jshawl/fix-typo
...
Fix typo
2014-06-30 14:12:17 -04:00
fbb8c056d4
Fix typo
2014-06-30 13:26:22 -04:00
0e68d34e1b
Update history to reflect merge of #2558 [ci skip]
2014-06-29 02:52:49 -04:00
a62027d5f3
Merge pull request #2558 from kleinfreund/patch-1
2014-06-29 02:52:19 -04:00
db38498d06
Add vertical margin to `highlight`
...
…so multiple code blocks are distinctive.
2014-06-29 08:41:59 +02:00
af11f66646
Minor improvements to the rakefile.
2014-06-28 22:49:03 -04:00
2a422e1d83
Add contributor list to 2.1.0 release post.
...
I forgot! I'm really sorry!
2014-06-28 22:48:44 -04:00
f463aea399
Release 2.1.0
2014-06-28 22:27:57 -04:00
f93da3cfb1
Add 3 more lines to 2.1.0 release post.
2014-06-28 21:54:56 -04:00
253b10818c
add #2554 to history on site
2014-06-28 21:38:17 -04:00
2c0e086761
Update history to reflect merge of #2554 [ci skip]
2014-06-28 21:37:59 -04:00
8882f4dd14
Merge pull request #2554 from alfredxing/fix-build-tomdoc
2014-06-28 21:37:25 -04:00
2cf76cb701
Merge pull request #2553 from jekyll/release-2.1.0
...
Release 2.1.0
2014-06-28 21:37:01 -04:00
bb9517b73f
Fill in a bit of missing TomDoc
...
Fill in a piece of missing doc for the `build` function in `commands/build.rb`
2014-06-28 17:48:19 -07:00
f681b35b65
Booooom, 2.1.0 in history on site.
2014-06-28 17:42:53 -04:00
8c5d36f0ee
update history to reflect release of 2.1.0
2014-06-28 17:42:33 -04:00
08d0ff0922
Bump version in gem.
2014-06-28 17:41:29 -04:00
e5683b1da5
Release post for 2.1.0
2014-06-28 17:41:22 -04:00
3dffa8284f
Update history to reflect closing of #2520 .
2014-06-28 17:20:09 -04:00
e332197660
Be quiet very quickly. Fixes #2520 .
2014-06-28 17:19:40 -04:00
8b36b71833
Update history to reflect merge of #2552 [ci skip]
2014-06-28 16:59:08 -04:00
7eb5e07e9d
Merge pull request #2552 from jekyll/collections-with-dots
2014-06-28 16:58:11 -04:00
0b9eb3c111
Ensure collections with dots work.
2014-06-28 16:51:44 -04:00
5f7a3f2b69
Filter out directories from entries in the collection
2014-06-28 16:51:30 -04:00
02676572dd
Allow dots in collection labels.
2014-06-28 16:51:19 -04:00
404661fc72
You need NodeJS in order to install jekyll-coffeescript.
2014-06-28 16:09:19 -04:00
5c3f013325
Upgrade to jekyll-watch 1.0.
2014-06-27 17:52:54 -04:00
ea4aa4f149
Update history to reflect merge of #2550 [ci skip]
2014-06-27 17:51:16 -04:00
0c8fc63b33
Merge pull request #2550 from jekyll/extract-watch
2014-06-27 17:50:51 -04:00
c239746363
Use bundle exec in CI guide. [ci skip]
...
h/t @ndarville
Ref: #2432
2014-06-27 17:10:06 -04:00
Parker Moore
Ben Hollis
Julian Thilo
Alfred Xing
AJ Acevedo
Austin Pray
Ben Balter
Jesse Shawl
Philipp Rudloff