Commit Graph

911 Commits

Author SHA1 Message Date
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
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
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
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
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