899 Commits

This Branch

This Branch

All Branches

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