Parker Moore
2db84f0db6
Ruby development console.
2013-02-17 02:36:19 +01:00
Parker Moore
7265683c33
Merge pull request #1022 from gkarekinian/patch-2
...
Fixed configuration overriding
2013-02-16 17:12:00 -08:00
Parker Moore
4672f4b665
Upgrade history to reflect merge of #1021 .
2013-02-17 01:25:20 +01:00
Parker Moore
28e25cacb0
Merge pull request #1021 from gkarekinian/patch-1
...
full_configuration in Rakefile was uninitialized
2013-02-16 16:22:59 -08:00
Floyd Pink
f674b8e764
Fixed issue with mobile nav choosing the last option by default. Fixes #950 .
2013-02-15 02:26:11 +01:00
Floyd Pink
ccd9b57233
Cherry-pick fail.
2013-02-15 02:24:55 +01:00
Parker Moore
1661d5bfe1
Merge pull request #1026 from gkarekinian/undefined_timezone_variable
...
Fixed undefined variable timezone in Rakefile
2013-02-14 17:18:39 -08:00
Grégory Karékinian
a6f2fdccd5
Fixed undefined variable timezone in Rakefile
...
It made it impossible to create a new page on 2.1
2013-02-14 17:44:39 +01:00
Floyd Pink
9254c233b9
fixed issue #949 using @alexkirmse's patch
2013-02-13 13:50:34 +01:00
Grégory Karékinian
e18fba9456
Added initial test coverage
2013-02-12 12:08:29 +01:00
Greg Karékinian
fb9b6f8150
Fixed configuration overriding
...
The deep merge was made the wrong way around
2013-02-12 11:57:30 +01:00
Jonathan Stroebele
9959683a03
Add Goolge+ author profile with <link> element in <head>
...
Adds #1024 to branch 2.1.
2013-02-11 21:11:08 +01:00
Parker Moore
055d85e44e
Returning an empty Hash if no config exists. Fixes #1005 .
2013-02-11 21:07:50 +01:00
Greg Karékinian
cc97ac61fc
full_configuration in Rakefile was uninitialized
...
Switched to a variable instead and reusing it in `integrate` task as well.
2013-02-11 12:42:47 +01:00
Parker Moore
6864387784
Merge pull request #976 from Eric-Guo/config_compass_fix
...
To fix compass clean, which will cause rake clean/generate block
2013-02-03 08:59:17 -08:00
Eric Guo
b738c588df
Fix expend problem in Windows, ruby-1.9.3-p374, thanks @parkr
2013-01-29 16:41:32 +08: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
