fccc02be6f
Don't be so verbose in script/test. /cc #3574
2015-03-16 14:55:50 -07:00
506a1db116
Update history to reflect merge of #3574 [ci skip]
2015-03-16 14:55:34 -07:00
6a387b45aa
Merge pull request #3574 from jekyll/remove-legacy-loader
...
Merge pull request 3574
2015-03-16 14:55:12 -07:00
bb57c80478
Perform jekyll-paginate deprecation warning correctly.
...
Fixes #3393
2015-03-16 14:54:31 -07:00
b6424c9197
Update history to reflect merge of #3550 [ci skip]
2015-03-16 14:46:57 -07:00
6a66a3af5a
Merge branch 'stkent-patch-1'
...
* stkent-patch-1:
Restructure excerpt_separator documentation for clarity
2015-03-16 14:46:07 -07:00
10967d8904
Update history to reflect merge of #3556 [ci skip]
2015-03-16 14:26:28 -07:00
3c9e43eb36
Merge pull request #3556 from willnorris/permalinks
...
Merge pull request 3556
2015-03-16 14:26:02 -07:00
0ca5bd3224
update permalinks docs
...
This adds docs for two new permalink features coming in Jekyll 3:
- improved default permalinks for pages and collections (#3538 )
- support for extensionless URLs (#3490 )
2015-03-16 13:47:53 -07:00
0d288c54da
Merge pull request #3576 from jekyll/fix-proofer
...
script/proof: ignore eduardoboucas.com
2015-03-15 18:05:29 -07:00
41fb36a36f
script/proof: ignore eduardoboucas.com
2015-03-15 18:05:13 -07:00
c6d62828ba
Remove loader.rb and utilize "modernize" script/test. Fixes : #3573
2015-03-15 10:08:27 -05:00
29853ab46d
Merge pull request #3567 from chrisfinazzo/grammar
...
Wrap lines
2015-03-14 18:43:24 -07:00
f4a14b60ba
Reflect the merge of #3572 in History.md
2015-03-14 19:23:18 -05:00
045f38d467
Merge pull request #3572 from pathawks/jekyll-smartify
...
Add Jekyll-Smartify plugin
2015-03-14 19:22:17 -05:00
00093b91fa
Add Jekyll-Smartify plugin
2015-03-14 17:11:29 -07:00
2d0d27da73
Merge
2015-03-13 12:11:49 -04:00
7d93e3fdcd
Add the link back in
2015-03-13 11:53:41 -04:00
d3bd81361c
Remove link to Eduardo's site
2015-03-13 11:52:37 -04:00
06785f2bfd
Update history to reflect merge of #3570 [ci skip]
2015-03-12 16:17:45 -07:00
d36c3b0073
Merge pull request #3570 from eduardoboucas/master
...
Change Ajax pagination resource link to use HTTPS
2015-03-12 17:19:54 -05:00
eb064b6684
Change Ajax pagination resource link to use HTTPS
2015-03-12 22:04:17 +00:00
d3e23c2fae
Merge pull request #2 from jekyll/master
...
Get latest master
2015-03-12 21:58:39 +00:00
59add4737b
Use the correct URL
2015-03-12 11:49:19 -04:00
b5a73373ff
Wrap lines
2015-03-11 20:17:23 -04:00
dac2b17123
Fix link to @recurser's jekyll plugins. [ci skip]
2015-03-09 14:15:30 -07:00
007c059315
Update history to reflect merge of #3560 [ci skip]
2015-03-09 11:38:56 -07:00
7a7ecbadea
Merge pull request #3560 from maxbeizer/maxbeizer/fix-collections-docs-grammar
...
Fix grammar on collections docs warning
2015-03-09 11:38:21 -07:00
0d96ad21d2
Fix grammar on collections docs warning
2015-03-09 13:13:21 -05:00
3a3b528014
Merge branch 'master' of github.com:jekyll/jekyll
...
* 'master' of github.com:jekyll/jekyll:
Update history to reflect merge of #3552 [ci skip]
Use rspec-mock instead of rr
2015-03-07 18:11:40 -08:00
1100ca0782
Update link to sublime text plugin.
2015-03-07 17:27:17 -08:00
0e10503259
Update history to reflect merge of #3552 [ci skip]
2015-03-06 18:29:10 -08:00
9021e98721
Merge pull request #3552 from arthurnn/rm_rr
...
Use rspec-mock instead of rr
2015-03-06 18:28:47 -08:00
67ba8ad0cb
Use rspec-mock instead of rr
2015-03-06 20:13:07 -05:00
269bcbb7a8
Update history to reflect merge of #3551 [ci skip]
2015-03-06 16:23:36 -08:00
50a41100e7
Merge pull request #3551 from corysimmons/cs/add-pagination-warning
...
Add permalink warning to pagination docs
2015-03-06 16:23:06 -08:00
b178358cf9
Merge branch 'master' into site_extract_readers
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:28:45 +01:00
00cdcbc184
Separated some more readers from the main reader.rb file.
...
- Draft Reader
- Collection Reader
- Page Reader
- Post Reader
- Static File Reader
Fixed references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:20:25 +01:00
bebd80342e
Extracted draft, post reader into external classes.
...
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 12:39:50 +01:00
013f7edc83
Add permalink warning to pagination docs
...
Fixes https://github.com/jekyll/jekyll-paginate/issues/25
2015-03-06 01:17:10 -05:00
c371926e09
Restructure excerpt_separator documentation for clarity
2015-03-05 23:56:25 -05:00
66785b43ba
Release 💎 3.0.0.beta2
2015-03-05 13:40:18 -08:00
6d9258bcdc
Release 💎 v3.0.0.beta2
2015-03-05 13:40:10 -08:00
6b4219f0e2
Merge branch 'master' of github.com:jekyll/jekyll
...
* 'master' of github.com:jekyll/jekyll:
Update history to reflect merge of #3520 [ci skip]
Corrected error message as suggested by @parkr.
Improved clarity of sort nil input error message.
Added test to check on nil input for sort filter.
Sort will now raise error on nil object array input.
2015-03-05 13:14:29 -08:00
bb4d47b905
Move History declaration for #3528 back up to HEAD.
2015-03-05 13:14:15 -08:00
b41ddbb8a9
Update history to reflect merge of #3520 [ci skip]
2015-03-05 14:35:42 -06:00
02e98f238e
Merge pull request #3520 from delftswa2014/sort-null
2015-03-05 14:35:40 -06:00
2185339ee0
Merge branch 'master' of github.com:jekyll/jekyll
...
* 'master' of github.com:jekyll/jekyll:
Replace `File.exists?` with `File.exist?`
Remove duplicated range from regex
2015-03-05 11:20:55 -08:00
3a4d826852
Update history to reflect merge of #3547 [ci skip]
2015-03-05 11:20:13 -08:00
4a89db2102
Merge pull request #3547 from yous/resolve-warnings
...
Resolve warnings
2015-03-05 11:19:50 -08:00
Parker Moore
Will Norris
Jordon Bedwell
Pat Hawks
chrisfinazzo
Eduardo Bouças
Max Beizer
Arthur Neves
Martin Jorn Rogalla
Cory Simmons
Stuart Kent
Matt Rogers