Commit Graph

Select branches

Hide Pull Requests

2.1

colorize

gh-pages

guard

linklog

master

migrator

plugins

refactor_with_tests

rubygemcli

site

site-2.1

v2.0

Mono Color

• bfeeecea71 Improved error formatting and valid syntax directions. Brandon Mathis 2013-03-10 00:03:30 -06:00
• dee2900ba2 Mobile nav fixed. peterboni 2013-03-10 13:23:52 +08:00
• 0efbec7daa Remove stray test file. Parker Moore 2013-03-10 02:28:37 +01:00
• 95a3e46254 Colorized error for sitemap_generator.rb colorize Parker Moore 2013-03-10 02:25:20 +01:00
• 9a9c4a09b1 Colorized error for pagination.rb Parker Moore 2013-03-10 02:25:12 +01:00
• 5012652fb2 Colorized error for haml.rb Parker Moore 2013-03-10 02:25:04 +01:00
• 628e0a7471 Add colors to include_code warning/error output Parker Moore 2013-03-10 02:19:33 +01:00
• b456865c8c #highlight_failed now accepts tag name, and proper syntax Parker Moore 2013-03-10 02:06:02 +01:00
• 6c58529532 Rescuing errors issued by Pygments and raising our own with helpful info Parker Moore 2013-03-10 01:45:05 +01:00
• 66e7fb0bfb #highlight_failed in PygmentsCode Parker Moore 2013-03-10 01:44:32 +01:00
• 8f7106c39b Colorizing fail message in Pygments code highlighting. Parker Moore 2013-03-10 00:24:52 +01:00
• e6faef6257 Added .gitattributes file to keep CRLF's out of the codebase. Parker Moore 2013-03-06 01:29:24 +01:00
• 1306ad83b9 Fail loudly when a pygments highlight fails. #990. Parker Moore 2013-03-06 01:09:40 +01:00
• 98013543d9 Removed Twitter and Ender.js. Added jQuery and updated Modernizr Brandon Mathis 2013-03-09 17:14:33 -06:00
• 81ea4ae9bb Merge pull request #1101 from imathis/bye-twitter Brandon Mathis 2013-03-09 15:05:11 -08:00
• f562af5e19 Remove mention of ADN in Readme. Parker Moore 2013-03-10 00:04:26 +01:00
• 8d7ef9ad71 Merge branch 'site-2.1' of github.com:imathis/octopress into site-2.1 site-2.1 Parker Moore 2013-03-10 00:03:16 +01:00
• a867228ace Travis config for site-2.1 branch. Parker Moore 2013-03-09 23:31:00 +01:00
• 1a4a2be8f8 Merge pull request #1113 from stevekochscience/site-2.1 Brandon Mathis 2013-03-09 11:03:45 -08:00
• c8bd510976 same minor "for example" fix, on correct branch Steve Koch 2013-03-09 11:39:18 -07:00
• 7a897d10d2 Merge pull request #1060 from MrJoy/gitignore_cleanup_redux Parker Moore 2013-03-06 06:24:27 -08:00
• 9087cf125e Merge pull request #1046 from MrJoy/remove_redundant_rake_task Parker Moore 2013-03-05 16:32:13 -08:00
• c95867e61c Merge pull request #1037 from MrJoy/add_clobber_task Parker Moore 2013-03-05 16:30:20 -08:00
• cf5e909626 Merge branch 'master' of github.com:imathis/octopress Parker Moore 2013-03-06 01:29:52 +01:00
• 3548752af0 Added .gitattributes file to keep CRLF's out of the codebase. Parker Moore 2013-03-06 01:29:24 +01:00
• 16c18e4191 Merge pull request #991 from rretsiem/patch-2 Parker Moore 2013-03-05 16:11:33 -08:00
• e59adc9ef9 Just kidding, I don't want the exact changes from #990 in here. sjml 2013-01-30 01:53:04 -05:00
• 392e32bef0 Merge pull request #990 from sjml/patch-1 Parker Moore 2013-03-05 16:03:33 -08:00
• 7a6c53d041 Cherry-picked #664 fix to 2.1 branch. earaya 2012-07-11 18:29:21 -06:00
• 524e337aec Merge pull request #664 from earaya/master Parker Moore 2013-03-05 15:12:23 -08:00
• e15b51aae4 Fixed an include bug in page layout Kevin Mees 2012-07-09 09:36:37 +02:00
• e7dd5befdc Merge pull request #658 from kmees/2.1 Parker Moore 2013-03-05 15:08:09 -08:00
• 22fb2f2652 Actually bringing in the meat of the change from #629. Parker Moore 2013-03-06 00:05:59 +01:00
• b0dec8235e Merge change from @vyper in #629. Leonardo Saraiva 2012-06-19 01:05:15 -03:00
• e2596c02cb Merge pull request #629 from vyper/master Parker Moore 2013-03-05 14:58:55 -08:00
• 11fec7516b Add EditorConfig file for classic theme Trey Hunner 2012-02-26 11:08:38 -08:00
• b3606b9f67 Add EditorConfig file for Ruby files Trey Hunner 2012-02-26 11:08:16 -08:00
• 880b0fbdac Merge pull request #452 from treyhunner/topic/editorconfig Parker Moore 2013-03-05 14:52:02 -08:00
• 7f4cf25546 Merge branch 'master' of github.com:imathis/octopress Parker Moore 2013-03-05 23:44:02 +01:00
• de8e79f348 Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 Parker Moore 2013-03-05 23:39:27 +01:00
• e7a9b3fe40 Merge pull request #448 from NSError/list-fix Parker Moore 2013-03-05 14:40:29 -08:00
• 407a242f2d Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438 Parker Moore 2013-03-05 23:39:27 +01:00
• 51905b6a90 Merge pull request #438 from roman-yepishev/gist_error Parker Moore 2013-03-05 14:37:08 -08:00
• 810d7e4d4f Only include GitHub repo listing if site.github_repo_count is > 0. Fixes #344. Parker Moore 2013-03-05 23:22:41 +01:00
• bc9d9c2415 Removed twitter sidebar section. Parker Moore 2013-03-05 23:06:45 +01:00
• 331987cdfa Bring back Twitter configs when needed for 'tweet' button (for posts). Parker Moore 2013-03-05 23:05:01 +01:00
• 768fa8ed39 Remove Twitter timeline SCSS. Parker Moore 2013-03-05 23:00:21 +01:00
• 63391c59dc Do not require twitter in site.coffee. Parker Moore 2013-03-05 22:55:39 +01:00
• ef13e1ff61 Remove Twitter Timeline CoffeeScript. Parker Moore 2013-03-05 22:53:34 +01:00
• 38623c57d5 Remove references to Twitter from non-theme files. Parker Moore 2013-03-05 22:52:43 +01:00
• efd5bb3367 Remove Twitter configuration file. Parker Moore 2013-03-05 22:51:41 +01:00
• a63bb4f701 Merge pull request #1098 from gkarekinian/style Parker Moore 2013-03-05 05:22:15 -08:00
• eda01faac3 Switched code style to a more usual Ruby style Grégory Karékinian 2013-03-04 21:58:54 +01:00
• dfe703b11d Merge pull request #1081 from MrJoy/rsync_deployment_fixups Parker Moore 2013-03-04 02:46:07 -08:00
• 045b2dc546 Merge pull request #1019 from imathis/guard Parker Moore 2013-03-04 02:39:30 -08:00
• 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 guard Brandon Mathis 2013-02-10 02:47:53 -06:00
• c20c2a7acd Eliminating ternary op. Jon Frisby 2013-02-28 19:53:11 -08:00
• f4f42823f6 Merge pull request #1074 from joneslee85/bump-sinatra Parker Moore 2013-02-28 12:55:13 -08:00
• 4972fb6c62 Pointing to the wrong spec folder. Parker Moore 2013-02-28 21:50:24 +01:00
• 1c28ff0191 Updated Gemfile.lock with results from new Gemfile. Parker Moore 2013-02-28 21:50:07 +01:00
• 922b4cdaac Using master Gemfile and Rakefile cuz travis sucks. Parker Moore 2013-02-28 21:47:22 +01:00
• 4dc371b854 New approach for the travis file. Parker Moore 2013-02-28 21:40:34 +01:00
• 470085fd54 New .travis.yml file to handle multiple gemfile and rakefiles. Parker Moore 2013-02-28 21:37:08 +01:00
• 7158058311 Merge branch '2.1' of github.com:imathis/octopress into 2.1 Parker Moore 2013-02-28 21:32:21 +01:00
• d022a05fe9 Being consistent with quote-type usage. Parker Moore 2013-02-28 21:30:39 +01:00
• 57bfa12305 Moving to minitest v4.6. Parker Moore 2013-02-28 21:30:07 +01:00
• 869b7df158 Merge pull request #1079 from MrJoy/license_update Parker Moore 2013-02-28 11:37:56 -08:00
• 35f94ed1d0 It's 2013. Hi, MIT License. Parker Moore 2013-02-22 14:56:42 +01:00
• 11fd88e11c Added lib/ tests to travis file. Parker Moore 2013-02-28 12:48:35 +01:00
• bd6b92a5e3 Merge branch '2.1' of github.com:imathis/octopress into 2.1 Parker Moore 2013-02-28 12:23:29 +01:00
• e6e572ff4f Testing against Ruby 2.0. Closes #1075. Parker Moore 2013-02-28 12:23:18 +01:00
• 960145fa20 Bump sinatra to 1.3.5 Trung Lê 2013-02-26 00:13:28 +11:00
• 2fe9da91f5 Merge branch 'master' of github.com:imathis/octopress Leonardo Saraiva 2013-02-24 20:51:31 -03:00
• 214dfb8608 Merge pull request #1066 from MrJoy/enable_disabling_comments Parker Moore 2013-02-24 14:45:35 -08:00
• a181fc8798 Merge pull request #1048 from MrJoy/simplify_clean Parker Moore 2013-02-24 11:50:25 -08:00
• c8b5854f0f Adding a default for comment disabling. Jon Frisby 2013-02-23 23:46:55 -08:00
• 4790b93980 It's 2013. Hi, MIT License. Parker Moore 2013-02-22 14:56:42 +01:00
• 7c6c7ead16 Merge pull request #1050 from MrJoy/update_rack Parker Moore 2013-02-22 05:13:01 -08:00
• 89eec7efc8 Merge pull request #1041 from MrJoy/cleanup_gemfile_lock Parker Moore 2013-02-22 05:12:46 -08:00
• 0de80a299d Merge pull request #1064 from MrJoy/fb_async_21 Parker Moore 2013-02-22 05:09:29 -08:00
• 517efa204d Merge pull request #1056 from MrJoy/dead_code_removal Parker Moore 2013-02-22 05:07:47 -08:00
• b849ee56a3 Merge pull request #1058 from MrJoy/grand_whitespace_cleanup Parker Moore 2013-02-22 04:55:38 -08:00
• 85c6d71d80 Merge pull request #1059 from MrJoy/compass_rigor Parker Moore 2013-02-22 04:51:28 -08:00
• 4f4af96e8a Merge pull request #1055 from MrJoy/allow_short_markdown_extension_redux Parker Moore 2013-02-22 04:50:10 -08:00
• 187d86b514 Make it possible to disable the comments section entirely without having to muck with theme files. Jon Frisby 2013-02-21 23:58:19 -08:00
• 2919e88237 An update of rretsiem's pull request, for 2.1. Jon Frisby 2013-02-21 23:20:45 -08:00
• 7893d88dcf Removal of apparently unreferenced, dangling method. Jon Frisby 2013-02-21 21:54:02 -08:00
• ffa9118e9c Grand whitespace cleanup. Jon Frisby 2013-02-21 21:53:04 -08:00
• fe3ac0b260 Some Jekyll plugins confuse Compass by mucking around with the CWD. Jon Frisby 2013-02-21 21:45:03 -08:00
• db3d7f50aa Be more precise about what we ignore to avoid accidentally ignoring things. Jon Frisby 2013-02-21 21:43:27 -08:00
• b555d00fb5 Allow .md for markdown files. Jon Frisby 2013-02-20 11:39:07 -08:00
• 72579fe9cf Merge pull request #1042 from MrJoy/fix_compass_integration Parker Moore 2013-02-21 16:24:59 -08:00
• b9971676b3 Merge pull request #1043 from MrJoy/gitignore_cleanup Parker Moore 2013-02-21 16:23:52 -08:00
• d5a422fcde Merge pull request #1047 from MrJoy/remove_redundant_require Parker Moore 2013-02-21 16:21:13 -08:00
• 97a8ddeb9f Merge pull request #1051 from MrJoy/patches_from_master Parker Moore 2013-02-21 16:17:05 -08:00
• 27578e1498 Bring over a couple little things from master... Jon Frisby 2013-02-21 12:15:39 -08:00
• 82f7d92ef0 Add 'clobber' task for purging generated files. Jon Frisby 2013-02-20 11:56:54 -08:00
• a7d112b38e Simplifying clean task. Jon Frisby 2013-02-20 11:54:20 -08:00
• 5e347e6b2d Fix static reference to instance method in Compass' config. Jon Frisby 2013-02-20 11:40:44 -08:00
• d6b6b0d80e Various rsync deployment fixups: Jon Frisby 2013-02-20 11:38:10 -08:00