Tony Duckles
3e9e68e0a4
Transition missed _config.yml changes to new _config files
...
With the transition to the new "_config" directory structure, some
of the changes from _config.yml were missed. Integrating all changes
based on _config.yml@9659a45.
* _config/defaults/classic.yml: Add missed blog_index_sidebar,
page_sidebar, post_sidebar entries; remove duplicate excerpt_link
entry.
* _config/defaults/disqus.yml: Add missed disqus_developer entry.
* _config/defaults/google_plus.yml: Add missed
google_plus_image_size entry.
* _config/defaults/jekyll.yml: Add missed include entry; add missed
markdown=redcarpet and supporting entries.
* _config/defaults/sharing_buttons.yml: Add missed
respectfully_social entry.
2013-02-02 14:21:46 -06:00
Brandon Mathis
bda5ee1e10
Merge pull request #985 from FranklinChen/fix-timezone
...
Update reference to timezone using new config system.
2013-01-28 21:10:42 -08:00
Franklin Chen
a5e7ed82db
Update reference to timezone using new config system.
2013-01-28 23:39:51 -05:00
Parker Moore
3336dc43f1
Merge pull request #973 from Eric-Guo/fix_typo
...
Just typo fix
2013-01-27 14:41:45 -08:00
Brandon Mathis
0065592cfb
Merge pull request #959 from imathis/env-handling
...
Handle Octopress Environment
2013-01-27 14:37:07 -08:00
Eric Guo
6bd6d572e5
fix typo
2013-01-27 14:33:00 +08:00
Parker Moore
c7de7e7d3a
Merge branch '2.1' of github.com:imathis/octopress into 2.1
...
* '2.1' of github.com:imathis/octopress:
Added Travis badge to README.
2013-01-21 00:09:57 -05:00
Parker Moore
3369635c9e
Added 2 updates to the History file: configs & draft management
2013-01-21 00:09:38 -05:00
Parker Moore
4f7d5bcbe0
Using proper Markdown syntax in History file.
2013-01-21 00:09:07 -05:00
Parker Moore
b0f0770bf8
Adding History file with layout. No content yet.
2013-01-20 23:58:05 -05:00
Parker Moore
9690617041
Changed Configuration back to a Module, for a Class
2013-01-20 23:44:45 -05:00
Parker Moore
7e68382f53
Declaring Octopress before declaring the child class Configuration
2013-01-20 23:43:47 -05:00
Parker Moore
fa2aa4913d
Added Octopress.env
2013-01-20 23:43:22 -05:00
Parker Moore
33885dd791
Setting default env
2013-01-20 23:43:10 -05:00
Parker Moore
f02304cce8
Added Travis badge to README.
2013-01-20 23:24:20 -05:00
Parker Moore
61bb92debf
No longer testing on 1.8.7
2013-01-20 23:21:45 -05:00
Parker Moore
c3479dca4a
Merge 2.1 with new-configs
2013-01-20 23:20:45 -05:00
Parker Moore
6ce4d89bce
Updated configuration structure and dependent code. Added Octopress module for easier sharing of helper methods.
2013-01-20 23:13:47 -05:00
Brandon Mathis
9659a45da3
Merge pull request #903 from mneorr/ssh_key
...
added ssh keys support (e.g. for Amazon ec2)
2013-01-13 21:06:42 -08:00
Brandon Mathis
9994770225
Made it easy to optionally use RubyPython for pygments, closes #923
2013-01-13 23:03:55 -06:00
Brandon Mathis
5251313aa6
Improved timezone support
...
- Rake task list_drafts fixes
- Added link to timezone documentation
2013-01-13 22:54:47 -06:00
Chris Perelstein
4c0cf14344
Modified rake tasks to use iso8601 format dates and added configuration option to force a specfic timezone to be used
2013-01-13 22:01:57 -06:00
Brandon Mathis
5ba5b4760b
Improvements to the regexes in setup_github_pages task
2013-01-13 10:00:43 -06:00
Brandon Mathis
38353f216c
Improved draft management options
...
- rake list_drafts shows current drafts. Closes #645
- Rake generate, watch, and preview can compile future dated posts (defaults to false). Closes #837
2013-01-13 00:50:38 -06:00
Vaz Allen
ec07a5d7f8
setup_github_pages: allow for clones missing .git extension
...
Conflicts:
Rakefile
2013-01-12 21:28:21 -06:00
Brandon Mathis
ef9119089d
Video tag plugin now supports mp4,ogv,webm formats, closes #931
2013-01-12 19:23:59 -06:00
Brandon Mathis
ab2776b9a2
Merge pull request #932 from zellux/2.1
...
Hide Google Plus link if google_plus_hidden is true
2013-01-12 15:24:06 -08:00
Sean Kerr
cfcbd7261a
Fixed blockquote plugin (author alone would not show up without title)
...
Conflicts:
plugins/blockquote.rb
2013-01-12 16:40:26 -06:00
Brandon Mathis
1d5b9f803f
Improved error message for category_generator plugin. Addresses #116
2013-01-12 16:21:50 -06:00
Yuanxuan Wang
c4ed411690
Hide Google Plus link if google_plus_hidden is true
2013-01-09 12:52:23 +08:00
Parker Moore
a532fab583
Merge pull request #919 from imathis/unified-rb-vers
...
Unified .ruby-version file
2013-01-05 13:21:43 -08:00
Parker Moore
45e30de354
Using .ruby-version instead of .rbenv-version
2013-01-04 18:45:38 -05:00
Parker Moore
d3262e9f05
Removing .rvmrc
2013-01-04 18:45:18 -05:00
Brandon Mathis
e694250234
Enabled nice default extensions for redcarpet
2013-01-03 16:53:39 -06:00
Brandon Mathis
a25787a204
Fixes for Redcarpet
...
- Removed unnecessary content filtering for escaping markdown
- Escaping codeblocks defaults to false and can be enabled by passing escape:true
- Backtick codeblocks are automatically escaped when using Textile
- Scoped styling of .highlight divs to figure elements
2013-01-03 11:36:51 -06:00
Brandon Mathis
a3eea15ac5
Switched Markdown processor from rdiscount to redcarpet
2013-01-03 10:28:11 -06:00
Brandon Mathis
277dc6a558
Merge pull request #916 from Keithbsmiley/2.1
...
Fix nil path when not using gist cache
2013-01-03 08:18:15 -08:00
Brandon Mathis
8c0aa043fe
Added safe_wrap (escaping markdown and textile) to cached gists. Closes #917
2013-01-03 09:45:16 -06:00
Keith Smiley
fb27cae6be
fix nil path when not using gist cache
2013-01-03 08:45:59 -05:00
Brandon Mathis
418ed0cbcf
Merge pull request #911 from Keithbsmiley/2.1
...
Fix crash with nil passes
2013-01-02 20:52:39 -08:00
Keith Smiley
5442c90e48
Fix crash with nil passes
2013-01-02 14:42:18 -05:00
Brandon Mathis
cb276a40c4
updated gems, bumping rake to 10.0.3
2013-01-01 12:24:09 -06:00
Brandon Mathis
234e92852f
Category Archive now supports category slugs and titles
...
For example, in the YAML header set categories like this
categories:
- awesome [Awesome Posts]
- news
Octopress will parse out '[Awesome Posts]' and 'news' as the title and display it in
the category list, but the category index urls will be awesome/ and news/
Fixes #902
2012-12-31 13:43:58 -06:00
Josep del Rio
cc6e1aca0d
Added robots.txt, with sitemap link
2012-12-29 17:00:22 -06:00
Marin Usalj
7c9c4bad48
added ssh keys support (e.g. for Amazon ec2)
2012-12-29 09:58:34 -08:00
David Tchepak
1b9fc7901e
added category link method #408
2012-12-29 02:10:59 -06:00
Brandon Mathis
5b99bbb004
updated gems and removed albino support for code plugins since the latest Jekyll uses pygments.rb
2012-12-29 01:52:38 -06:00
Brandon Mathis
970d4d56a4
Merge pull request #895 from parkr/remove-copydot
...
Remove copydot task in favor of Jekyll's include config (Fixes #894 )
2012-12-28 08:33:53 -08:00
Brandon Mathis
50105a6049
Merge pull request #896 from parkr/remove-jsfiddle
...
Remove jsFiddle plugin from default selection
2012-12-28 08:32:46 -08:00
Parker Moore
087461a06c
Removed dependencies upon :copydot from other tasks
2012-12-28 02:57:56 -05:00
