Parker Moore
1306ad83b9
Fail loudly when a pygments highlight fails. #990 .
2013-03-10 00:17:43 +01:00
Brandon Mathis
81ea4ae9bb
Merge pull request #1101 from imathis/bye-twitter
...
Bye, Twitter Timeline
2013-03-09 15:05:11 -08:00
Parker Moore
f562af5e19
Remove mention of ADN in Readme.
2013-03-10 00:04:26 +01:00
Parker Moore
7a897d10d2
Merge pull request #1060 from MrJoy/gitignore_cleanup_redux
...
Be more precise about what we ignore to avoid accidentally ignoring things.
2013-03-06 06:24:27 -08:00
Parker Moore
9087cf125e
Merge pull request #1046 from MrJoy/remove_redundant_rake_task
...
This task is superfluous AND...
2013-03-05 16:32:13 -08:00
Parker Moore
c95867e61c
Merge pull request #1037 from MrJoy/add_clobber_task
...
Add 'clobber' task for purging generated files.
2013-03-05 16:30:20 -08:00
sjml
e59adc9ef9
Just kidding, I don't want the exact changes from #990 in here.
2013-03-06 01:05:08 +01:00
earaya
7a6c53d041
Cherry-picked #664 fix to 2.1 branch.
2013-03-06 00:14:14 +01:00
Kevin Mees
e15b51aae4
Fixed an include bug in page layout
2013-03-06 00:08:35 +01:00
Parker Moore
e7dd5befdc
Merge pull request #658 from kmees/2.1
...
Fixed an include bug in page layout
2013-03-05 15:08:09 -08:00
Parker Moore
22fb2f2652
Actually bringing in the meat of the change from #629 .
2013-03-06 00:05:59 +01:00
Leonardo Saraiva
b0dec8235e
Merge change from @vyper in #629 .
2013-03-06 00:02:42 +01:00
Trey Hunner
11fec7516b
Add EditorConfig file for classic theme
2013-03-05 23:53:36 +01:00
Trey Hunner
b3606b9f67
Add EditorConfig file for Ruby files
2013-03-05 23:53:25 +01:00
Parker Moore
810d7e4d4f
Only include GitHub repo listing if site.github_repo_count is > 0. Fixes #344 .
2013-03-05 23:22:41 +01:00
Parker Moore
bc9d9c2415
Removed twitter sidebar section.
2013-03-05 23:06:45 +01:00
Parker Moore
331987cdfa
Bring back Twitter configs when needed for 'tweet' button (for posts).
2013-03-05 23:05:01 +01:00
Parker Moore
768fa8ed39
Remove Twitter timeline SCSS.
2013-03-05 23:00:21 +01:00
Parker Moore
63391c59dc
Do not require twitter in site.coffee.
2013-03-05 22:55:39 +01:00
Parker Moore
ef13e1ff61
Remove Twitter Timeline CoffeeScript.
2013-03-05 22:53:34 +01:00
Parker Moore
38623c57d5
Remove references to Twitter from non-theme files.
2013-03-05 22:52:43 +01:00
Parker Moore
efd5bb3367
Remove Twitter configuration file.
2013-03-05 22:51:41 +01:00
Parker Moore
a63bb4f701
Merge pull request #1098 from gkarekinian/style
...
Switched code style to a more usual Ruby style
2013-03-05 05:22:15 -08:00
Grégory Karékinian
eda01faac3
Switched code style to a more usual Ruby style
...
* Two spaces indentation
* Got rid of two semicolons
* Added a blank line before the return value
2013-03-04 21:58:54 +01:00
Parker Moore
dfe703b11d
Merge pull request #1081 from MrJoy/rsync_deployment_fixups
...
Various rsync deployment fixups:
2013-03-04 02:46:07 -08:00
Parker Moore
045b2dc546
Merge pull request #1019 from imathis/guard
...
Guard watching + Javascript asset management
2013-03-04 02:39:30 -08:00
Brandon Mathis
7bdab0e65c
Added javascript asset management and improved Rakefiles and configuration for themes and plugins.
...
- Added Guard for file watching
- Configs can be automatically reloaded
- Static asset changes do not trigger Jekyll build
- CommonJS modular js support proved by stich-rb
- Javascript is concatenated and uglified
- Environment variables toggle uglify and fingerprinting
- New Jekyll plugin config_tag
- New Jekyll plugin javascript_assets_tag
- Added theme specific configurations
- Custome Jekyll Guard to the rescue
- Install, Generate, Watch, and Preview work with Guard now.
- Now configs are no longer tracked by Octopress, only theme defauts are.
- Console messages can be colorized.
- misc config reorganization and improvements
2013-03-04 01:12:10 -06:00
Jon Frisby
c20c2a7acd
Eliminating ternary op.
2013-02-28 19:53:11 -08:00
Parker Moore
4972fb6c62
Pointing to the wrong spec folder.
2013-02-28 21:50:24 +01:00
Parker Moore
1c28ff0191
Updated Gemfile.lock with results from new Gemfile.
2013-02-28 21:50:11 +01:00
Parker Moore
922b4cdaac
Using master Gemfile and Rakefile cuz travis sucks.
2013-02-28 21:47:22 +01:00
Parker Moore
4dc371b854
New approach for the travis file.
2013-02-28 21:40:34 +01:00
Parker Moore
470085fd54
New .travis.yml file to handle multiple gemfile and rakefiles.
2013-02-28 21:37:08 +01:00
Parker Moore
7158058311
Merge branch '2.1' of github.com:imathis/octopress into 2.1
...
* '2.1' of github.com:imathis/octopress:
It's 2013. Hi, MIT License.
2013-02-28 21:32:21 +01:00
Parker Moore
d022a05fe9
Being consistent with quote-type usage.
2013-02-28 21:30:39 +01:00
Parker Moore
57bfa12305
Moving to minitest v4.6.
2013-02-28 21:30:07 +01:00
Parker Moore
869b7df158
Merge pull request #1079 from MrJoy/license_update
...
It's 2013. Hi, MIT License.
2013-02-28 11:37:56 -08:00
Parker Moore
35f94ed1d0
It's 2013. Hi, MIT License.
2013-02-28 05:58:19 -08:00
Parker Moore
11fd88e11c
Added lib/ tests to travis file.
2013-02-28 12:48:35 +01:00
Parker Moore
bd6b92a5e3
Merge branch '2.1' of github.com:imathis/octopress into 2.1
...
* '2.1' of github.com:imathis/octopress:
Adding a default for comment disabling.
Make it possible to disable the comments section entirely without having to muck with theme files.
An update of rretsiem's pull request, for 2.1.
Removal of apparently unreferenced, dangling method.
Grand whitespace cleanup.
Some Jekyll plugins confuse Compass by mucking around with the CWD.
Allow .md for markdown files.
Bring over a couple little things from master...
Simplifying clean task.
Fix static reference to instance method in Compass' config.
Remove cruft from Gemfile.lock since rspec is no longer specified in the Gemfile.
Ignore all generated JS bundles, preview-mode flag, generated _config.yml, and most editor temp files.
Remove redundant require statement from Rakefile.
Bump Rack version to leverage security fixes.
2013-02-28 12:23:29 +01:00
Parker Moore
e6e572ff4f
Testing against Ruby 2.0. Closes #1075 .
2013-02-28 12:23:18 +01:00
Parker Moore
214dfb8608
Merge pull request #1066 from MrJoy/enable_disabling_comments
...
Make it possible to disable the comments section entirely without having to muck with theme files.
2013-02-24 14:45:35 -08:00
Parker Moore
a181fc8798
Merge pull request #1048 from MrJoy/simplify_clean
...
Simplifying clean task.
2013-02-24 11:50:25 -08:00
Jon Frisby
c8b5854f0f
Adding a default for comment disabling.
2013-02-23 23:46:55 -08:00
Parker Moore
7c6c7ead16
Merge pull request #1050 from MrJoy/update_rack
...
Bump Rack version to leverage security fixes.
2013-02-22 05:13:01 -08:00
Parker Moore
89eec7efc8
Merge pull request #1041 from MrJoy/cleanup_gemfile_lock
...
Remove cruft from Gemfile.lock since rspec is no longer specified in the Gemfile.
2013-02-22 05:12:46 -08:00
Parker Moore
0de80a299d
Merge pull request #1064 from MrJoy/fb_async_21
...
Make FB JS load synchronously so it doesn't block page rendering.
2013-02-22 05:09:29 -08:00
Parker Moore
517efa204d
Merge pull request #1056 from MrJoy/dead_code_removal
...
Removal of apparently unreferenced, dangling method.
2013-02-22 05:07:47 -08:00
Parker Moore
b849ee56a3
Merge pull request #1058 from MrJoy/grand_whitespace_cleanup
...
Grand whitespace cleanup.
2013-02-22 04:55:38 -08:00
Parker Moore
85c6d71d80
Merge pull request #1059 from MrJoy/compass_rigor
...
Compass rigor.
2013-02-22 04:51:28 -08:00