4cd7c22ee7
Now uses the more semantically correct AND operator
2013-02-04 22:17:03 +01:00
7512e6bb66
Allow symlinked folders in unsafe mode
2013-02-04 17:16:01 +01:00
e4042e56b7
Update history to reflect merge of #792 . Closes #789 .
2013-02-03 18:56:42 +01:00
f002ee4f9f
Merge pull request #792 from mojombo/alias-serve-to-server
...
Aliased jekyll server to jekyll serve
2013-02-03 09:55:14 -08:00
7a44965c88
Updated history to reflect merge of #793 . Closes #787 .
2013-02-03 01:54:52 +01:00
9ea1becf13
Merge pull request #793 from mojombo/remove-migrators
...
Remove migrators - move to jekyll-import gem.
2013-02-02 16:34:07 -08:00
f5137850e4
Using abort instead of puts & exit when jekyll-import gem isn't available.
2013-02-03 01:24:38 +01:00
9bb0bfc0b2
Eliminating migrator tests (in this repo).
2013-01-31 01:19:56 +01:00
e8384e6a97
Eliminating migrator dependencies.
2013-01-31 01:19:34 +01:00
82f29bb627
The jekyll-import gem provides Jekyll::Commands::Import, not Jekyll::Commands::Migrate.
2013-01-31 00:18:54 +01:00
28a074ff7a
Remove Jekyll::Commands::Migrate
2013-01-31 00:18:22 +01:00
b70c59667c
Requiring jekyll-import gem. Printing error and exiting if it does not exist.
2013-01-30 23:43:26 +01:00
221c2f4c0e
Aliased jekyll server to jekyll serve
2013-01-30 23:30:04 +01:00
2e73671cf4
Updated Kramdown tests to reflect numeral HTML entities.
2013-01-30 23:25:49 +01:00
1cfd0c8b15
Updated history to reflect merging of #744 .
2013-01-30 23:21:23 +01:00
04b60ffe7f
Merge pusewicz/bump-gems from #744
2013-01-30 23:20:23 +01:00
62bba37c1f
Update history to reflect merge of #768
2013-01-30 22:19:24 +01:00
b4bea4a586
Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup
...
Module Cleanup
* 'code-cleanup' of git://github.com/tombell/jekyll:
Remove new lines between module and class
Update tag classes moving into a module
Update pagination classes moving into a module
Update converter classes moving into a module
Strip extra newlines
Update command classes moving into a module
Conflicts:
lib/jekyll/commands/serve.rb
2013-01-27 23:13:16 +01:00
35165d19f8
Update history to reflect merge of #775 .
2013-01-27 23:08:44 +01:00
b736676904
Merge pull request #775 from metamatt/issue773
...
Address issue 773 (bugs preventing tumblr.rb from running)
2013-01-27 14:06:41 -08:00
1d85664340
Update history to reflect merge of #767 .
2013-01-26 22:35:13 +01:00
409eedafd8
Merge pull request #767 from mojombo/string-categories
...
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
c95c5e3b7d
Use Dir.pwd instead of "." as the source argument to Post.new, since
...
this has historically supplied an absolute path in this call.
2013-01-25 15:57:45 -08:00
cd2f3b8dce
Updated history to reflect merge of #777 .
2013-01-25 17:23:40 +01:00
4041579b70
Merge pull request #777 from mastahyeti/safe_yaml
...
Safe YAML
2013-01-25 08:22:10 -08:00
2b8c85cd9d
Reflect merge of #407
2013-01-25 06:22:35 +01:00
4f7881ba40
Add SVG support to Jekyll/Webrick. Fixes #406 .
2013-01-25 06:20:07 +01:00
2c76311ada
Updated history to reflect merge of #776 .
2013-01-25 06:06:33 +01:00
130406a101
Merge pull request #776 from tombell/script-bootstrap
...
Add a bootstrap script
2013-01-24 21:04:46 -08:00
d758d424b4
deleted junk
2013-01-23 17:19:32 -06:00
d82179048e
adding files
2013-01-23 11:31:59 -06:00
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
c85d834036
lets try this differently
2013-01-23 11:07:44 -06:00
507f1c3995
Add a bootstrap script
2013-01-22 23:10:51 +00:00
799c997b45
adding gem
2013-01-22 15:21:10 -06:00
073bac6047
using sane_yaml to prevent code execution
2013-01-22 15:18:46 -06:00
fbc9d0c663
Fix truncation of overly long post names.
...
Delete the old truncate_post_name; it was called too late (if url rewriting
is enabled which it is by default), didn't run (it tried to use + to concat
a Fixnum onto a String), and even with those problems fixed, didn't actually
shorten the string enough to use as a pathname.
Instead, apply simple string truncation at the point we generate the slug,
which is used in the filename and is the part that could be unboundedly
long. I arbitrarily chose 200 as the maximum length; even shorter might be
better (really long slugs are just visually ugly); it might also be nicer
to truncate at a hyphen boundary.
This fixes the rest of issue #773 (subissue 4).
2013-01-22 10:25:07 -08:00
863643c7e8
Look for _posts directory relative to cwd, not relative to tumblr.rb.
...
That's where we put it earlier, so that's where we'll find it now.
This addresses part of issue #773 (subissue 3).
2013-01-22 10:24:33 -08:00
adce57e9e1
Updated history to reflect merge of #771 .
2013-01-21 22:20:00 -05:00
8d05e1ea5a
Merge pull request #771 from mojombo/fix-coverage
...
Fix SimpleCov Execution
2013-01-21 19:01:52 -08:00
607b4c84fd
Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true'
2013-01-20 22:16:23 -05:00
914f1e834d
Added simplecov-gem-adapter dev dependency.
2013-01-20 22:15:44 -05:00
517e6f81d3
Remove new lines between module and class
2013-01-20 00:00:49 +00:00
2c45150545
Update tag classes moving into a module
2013-01-19 23:50:44 +00:00
10d980b6e1
Update pagination classes moving into a module
2013-01-19 23:42:40 +00:00
663a1321d2
Update converter classes moving into a module
2013-01-19 23:07:38 +00:00
6514fe2d22
Strip extra newlines
2013-01-19 22:38:51 +00:00
e03f48085a
Update command classes moving into a module
2013-01-19 22:36:46 +00:00
065b251383
Added note in gemspec for easy extraction of dev dependencies to migrator gem.
2013-01-18 10:35:21 -05:00
f231ef7644
Merge pull request #684 from mattr-/issue-680.
2013-01-18 10:28:14 -05:00
Alexander Ekdahl
Parker Moore
Matt Ginzton
Jordon Bedwell
Ben Toews
Tom Bell