Parker Moore
4f4af96e8a
Merge pull request #1055 from MrJoy/allow_short_markdown_extension_redux
...
Allow .md for markdown files.
2013-02-22 04:50:10 -08:00
Jon Frisby
187d86b514
Make it possible to disable the comments section entirely without having to muck with theme files.
2013-02-21 23:58:19 -08:00
Jon Frisby
2919e88237
An update of rretsiem's pull request, for 2.1.
2013-02-21 23:20:45 -08:00
Jon Frisby
7893d88dcf
Removal of apparently unreferenced, dangling method.
...
(A search of the code reveals no reference to 'parse_category'...)
2013-02-21 21:54:02 -08:00
Jon Frisby
ffa9118e9c
Grand whitespace cleanup.
2013-02-21 21:53:04 -08:00
Jon Frisby
fe3ac0b260
Some Jekyll plugins confuse Compass by mucking around with the CWD.
...
This keeps things behaving sanely in such cases.
2013-02-21 21:45:03 -08:00
Jon Frisby
db3d7f50aa
Be more precise about what we ignore to avoid accidentally ignoring things.
...
(... for example, we might want a directory named source/vendor at some point to differentiate theme-provided JS/etc from user-provided...)
2013-02-21 21:43:27 -08:00
Jon Frisby
b555d00fb5
Allow .md for markdown files.
2013-02-21 20:37:58 -08:00
Parker Moore
72579fe9cf
Merge pull request #1042 from MrJoy/fix_compass_integration
...
Fix static reference to instance method in Compass' config.
2013-02-21 16:24:59 -08:00
Parker Moore
b9971676b3
Merge pull request #1043 from MrJoy/gitignore_cleanup
...
Ignore all generated JS bundles, preview-mode flag, generated _config.yml, and most editor temp files.
2013-02-21 16:23:52 -08:00
Parker Moore
d5a422fcde
Merge pull request #1047 from MrJoy/remove_redundant_require
...
Remove redundant require statement from Rakefile.
2013-02-21 16:21:13 -08:00
Parker Moore
97a8ddeb9f
Merge pull request #1051 from MrJoy/patches_from_master
...
Bring over a couple little things from master...
2013-02-21 16:17:05 -08:00
Jon Frisby
27578e1498
Bring over a couple little things from master...
2013-02-21 12:28:51 -08:00
Jon Frisby
82f7d92ef0
Add 'clobber' task for purging generated files.
2013-02-20 11:56:54 -08:00
Jon Frisby
a7d112b38e
Simplifying clean task.
...
* Make it less needlessly noisy (no need to enumerate all files when doing rm_rf).
* Explicitly nuking screen.css is superflous as `compass clean` will do this for us.
* Make task description more accurate about what's happening.
* Make task feedback less redundant (details of what was removed are right above it).
2013-02-20 11:54:20 -08:00
Jon Frisby
5e347e6b2d
Fix static reference to instance method in Compass' config.
2013-02-20 11:40:44 -08:00
Jon Frisby
d6b6b0d80e
Various rsync deployment fixups:
...
1) If ssh_key was absent, you'd get an error.
2) Had to specify full path to key ("/Users/jfrisby/.ssh/...") -- couldn't use "~/.ssh/...". Since SSH demands it be there anyway, let's pre-populate for the user and make their lives easier.
3) Ensure uniform and consistent trailing slashes on source and dest paths to avoid accidentally mucking things up.
2013-02-20 11:38:10 -08:00
Jon Frisby
5da31a2ee1
This task is superfluous AND doesn't respect the presence/absence of "desc" making hidden/internal-use tasks show up.
2013-02-20 11:32:40 -08:00
Jon Frisby
5eeb474e3c
Remove cruft from Gemfile.lock since rspec is no longer specified in the Gemfile.
2013-02-20 11:30:02 -08:00
Jon Frisby
72283fd58d
Ignore all generated JS bundles, preview-mode flag, generated _config.yml, and most editor temp files.
2013-02-20 11:27:33 -08:00
Jon Frisby
8f5dd52157
Remove redundant require statement from Rakefile.
2013-02-20 11:25:37 -08:00
Jon Frisby
3f8e3bd9f4
Bump Rack version to leverage security fixes.
2013-02-20 11:21:31 -08:00
Parker Moore
f64fa33d69
Using the GitHub API to pre-sort repos based on pushed date. #1031 .
2013-02-20 17:44:50 +01:00
Parker Moore
f6fdb92e92
Merge branch '2.1' of github.com:imathis/octopress into 2.1
...
* '2.1' of github.com:imathis/octopress:
Transition missed _config.yml changes to new _config files
2013-02-20 17:41:56 +01:00
Parker Moore
145ae72acd
Ugrading to ruby version 1.9.3-p374
2013-02-20 17:41:24 +01:00
Parker Moore
f5dcc64d67
Merge pull request #1001 from tonyduckles/new-configs-fixes
...
Transition missed _config.yml changes to new _config files
2013-02-19 03:07:30 -08:00
Parker Moore
b75234693f
Testing now in lib/, added a supporting Gemfile and Rakefile
2013-02-17 02:51:07 +01:00
Parker Moore
3a67a634f7
Specifying an exact version for rdiscount.
2013-02-17 02:48:29 +01:00
Parker Moore
4dfc4237d3
Updated Rakefile to handle Octopress::Configuration as a class.
2013-02-17 02:47:31 +01:00
Parker Moore
153ce83527
Octopress::Configuration is now a class, rather than a module.
...
The previous system was very unforgiving about where the configuration directory
lay. This commit allows the configuration directory to be set through a config_directory
instance variable on the Octopress::Configuration class, in the event that this directory
ever needs to be changed (e.g. for testing).
2013-02-17 02:40:38 +01:00
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
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
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
