Commit Graph

7479 Commits

Author SHA1 Message Date
Daniel Hilgarth
cc83501489 Fix broken post_url with posts with a time in their YAML front matter. 2013-03-03 14:56:18 +01:00
scribu
1a351284ca rename get_base() to containing_dir() 2013-03-03 12:56:12 +02:00
Parker Moore
17c875f6f5 Fixed plugin test error. 2013-03-02 18:51:42 +01:00
Marcus Stollsteimer
053373de27 Update Readme to link to the Plugins wiki page 2013-03-02 13:00:37 +01:00
Parker Moore
7258b10f88 We don't need YAML in the new command. 2013-02-28 22:19:38 +01:00
Parker Moore
149b95d767 Typos in sample post. 2013-02-28 22:17:24 +01:00
Parker Moore
5c788582a8 Update history to reflect merge of #826. 2013-02-28 21:57:01 +01:00
Parker Moore
e827797440 Merge pull request #826 from chapmajs/patch-1
Explicitly require HTTPS rubygems source
2013-02-28 12:55:56 -08:00
Fotos Georgiadis
441eddf1ca Fix pretty url style paths.
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
chapmajs
3a34957b41 Explicitly require HTTPS rubygems source
Use HTTPS rubygems.org source to help prevent MITM attacks
2013-02-27 20:28:09 -05:00
Parker Moore
c648bc1157 Update history to reflect merge of #785. 2013-02-27 01:59:36 +01:00
Parker Moore
bd9a112ff1 Merge pull request #785 from lenniboy/master
Improve debugability of error message for a malformed highlight tag
2013-02-26 16:58:36 -08:00
Parker Moore
3fbb615d19 Update history to reflect merge of #824. 2013-02-27 01:56:06 +01:00
Parker Moore
63d0eef646 Merge pull request #824 from sinamt/symlinked_folders
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
2013-02-26 16:54:52 -08:00
Paul Leitmanis
849c34e913 Add tests for filtering symlink entries when safe mode enabled 2013-02-27 10:39:46 +11:00
Parker Moore
3253e4132e Update history to reflect merge of #654 2013-02-26 21:35:48 +01:00
Parker Moore
465e25021b Merge pull request #654 from mattr-/issue-653
Look for plugins under the source directory. Fixes #653.
2013-02-26 12:34:11 -08:00
Matt Rogers
d58859570d Fix up the whitespace.
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers
5a9c20983d Rename setup_plugins to plugins_path 2013-02-25 13:20:32 -06:00
Matt Rogers
ffc42310b4 Add back a test that was mistakenly removed. 2013-02-25 13:19:45 -06:00
Matt Rogers
d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore
83675ee095 Updated history to reflect merge of #822. 2013-02-24 02:01:10 +01:00
Parker Moore
e0870fa178 Merge pull request #822 from mojombo/gist-tag
Add 'gist' liquid tag to master
2013-02-23 16:59:53 -08:00
Parker Moore
f8a90d711f Using https protocol instead of http. 2013-02-24 01:54:13 +01:00
Parker Moore
cdd3c0ef0c Remove 'type' attribute from script tag in gist liquid tag. 2013-02-24 01:30:41 +01:00
Parker Moore
7e7cee6e56 Strip space from the gist number, add test for gist tag 2013-02-24 00:58:13 +01:00
sterebooster
425f466842 'gist' liquid tag by @stereobooster. Fixes #463. 2013-02-24 00:38:19 +01:00
Parker Moore
cc0f84197a Updated history to reflect merge of #820. 2013-02-22 14:20:05 +01:00
Parker Moore
f2299a2bf5 Merge pull request #820 from mojombo/fix-autoregen-loop
Fix issue with watching (auto-regeneration) continuously running
2013-02-22 05:19:11 -08:00
Parker Moore
7457cbae25 Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457. 2013-02-22 00:59:44 +01:00
Parker Moore
a22527c7ff Update history to reflect merge of #795. Fixes #790. 2013-02-20 23:16:56 +01:00
Parker Moore
02da17b769 Merge pull request #795 from mojombo/new-log-format
New log format
2013-02-20 14:15:36 -08:00
Parker Moore
db5d27639e Fixed merge conflicts: rebasing on master. 2013-02-20 23:14:58 +01:00
Parker Moore
a19bb1815a Fixed merge conflicts in test/test_configuration.rb 2013-02-20 23:13:06 +01:00
Parker Moore
5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore
9eb79ff135 Improved output for auto-regeneration. 2013-02-20 23:09:54 +01:00
Parker Moore
bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore
388e0c8077 Fixed typo in History file 2013-02-20 22:15:23 +01:00
Parker Moore
090bbbe4f6 Update history to reflect merge of #788. 2013-02-20 22:15:03 +01:00
Parker Moore
c042a77496 Merge pull request #788 from mojombo/add-opts
Add 2 opts back into bin/jekyll
2013-02-20 13:13:42 -08:00
Parker Moore
d0d947995a Update history to reflect merge of #815. 2013-02-20 22:01:12 +01:00
Parker Moore
3b156d21af Merge pull request #815 from bhardin/fixing_help
Changing help message to reflect what actually happens
2013-02-20 12:17:19 -08:00
Brett Hardin
03e2e8d063 Changing help message to reflect what actually happens when running build and serve 2013-02-20 09:37:19 -08:00
Parker Moore
151ec1a487 Update history to reflect merge of #807. 2013-02-19 12:02:10 +01:00
Parker Moore
d361a70391 Merge pull request #807 from mojombo/safeyaml-warnings
Fix SafeYAML Warnings
2013-02-19 03:01:27 -08:00
Parker Moore
ac8c7a0944 Relax Kramdown version to 0.14. Fixes #808. 2013-02-19 02:38:18 +01:00
Parker Moore
35c3ef05bf Update history to reflect merge of #801. 2013-02-10 21:38:02 +01:00
Parker Moore
ac502d175a Merge pull request #801 from kevinSuttle/master
Bump .ruby-version to 1.9.3-p374
2013-02-10 12:36:38 -08:00
Parker Moore
c7c0a9432c Updating tests for safe_yaml. 2013-02-10 19:09:36 +01:00
Parker Moore
11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00