Commit Graph

45 Commits

Author SHA1 Message Date
Brandon Mathis 21cd6de44a Sinatra now correctly returns code 404 when a page is not found. Closes #1198 2013-04-09 16:35:54 -05:00
Brandon Mathis 2a647fa804 Updated Jekyll (1.0.0.beta4) and other gems. Added new pagination_path feature to blog index template 2013-04-09 14:42:37 -05:00
Parker Moore d3606e20b6 Update to Jekyll v1.0.0.beta3. 2013-04-05 16:44:55 +02:00
Parker Moore 1a4b0f24f3 Use rspec for testing 2013-04-03 01:27:03 +02:00
Jon Frisby b5dc3367de Updating deps. Notable changes:
chunky_png:
* Fixed an error n 4-bit resampling code.

fast-stemmer:
* Fixed to work with compilers other than gcc.

fssm:
* Remove deprecation message.
* Fix to work with JRuby.

haml:
* Fix for line numbers reported from exceptions in nested blocks.

kramdown:
* BREAKING CHANGE: Code language is now specified via .language-CODELANG instead of lang='CODELANG'
  * See this page for explanation: http://kramdown.rubyforge.org/news.html
2013-04-01 22:20:37 -07:00
Parker Moore 8aa23ebe65 Using Jekyll beta2. 2013-03-20 23:43:18 +01:00
Parker Moore 17311872d6 Initial changes to integrate Jekyll 1.0 2013-03-15 00:55:45 +01:00
Brandon Mathis a4adca5fcd Added sass-globbing, allowing plugin stylesheets to be auto-imported from the assets/stylesheets/plugins directory 2013-03-11 01:38:18 -05: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
Parker Moore 1c28ff0191 Updated Gemfile.lock with results from new Gemfile. 2013-02-28 21:50:11 +01: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
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 3f8e3bd9f4 Bump Rack version to leverage security fixes. 2013-02-20 11:21:31 -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 c3479dca4a Merge 2.1 with new-configs 2013-01-20 23:20:45 -05:00
Parker Moore 6ce4d89bce Updated configuration structure and dependent code. Added Octopress module for easier sharing of helper methods. 2013-01-20 23:13:47 -05:00
Chris Perelstein 4c0cf14344 Modified rake tasks to use iso8601 format dates and added configuration option to force a specfic timezone to be used 2013-01-13 22:01:57 -06:00
Brandon Mathis a3eea15ac5 Switched Markdown processor from rdiscount to redcarpet 2013-01-03 10:28:11 -06:00
Brandon Mathis cb276a40c4 updated gems, bumping rake to 10.0.3 2013-01-01 12:24:09 -06:00
Brandon Mathis 5b99bbb004 updated gems and removed albino support for code plugins since the latest Jekyll uses pygments.rb 2012-12-29 01:52:38 -06:00
Brandon Mathis be53372e20 Upgraded to pygments.rb 0.3.3 and fixed an issue where Gists wouldn't output cached files
I'm actually done. #888. For now.
2012-12-24 22:11:11 -06:00
Brandon Mathis 17368e93c4 Added minification and concatenation of Javascript files 2012-06-16 18:36:58 -05:00
Brandon Mathis 153756fdef After thinking about it, I find little gain, and greater difficulty by not including the Gemfile.lock. It was fun while it lasted. fix #568 2012-05-24 10:36:54 -05:00
Brandon Mathis 3e3a2fcff3 Removed Gemfile.lock. Octopress will only manage the Gemfile, closes #568 2012-05-22 09:05:51 -05:00
Brandon Mathis 99767a4e0c updated Gems, added more liberal definitions to gemfile
Conflicts:

	Gemfile.lock
2012-05-21 16:18:42 -05:00
Brandon Mathis d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -05:00
Frederic Hemberger 06e8c51a1a Set Liquid version explicitly to 2.2.2, fixes #243
Obviously Liquid 2.3.0 seems to cause problems, see:
http://www.yodi.me/blog/2011/10/24/github-custom-domain-with-octopress-in-ubuntu-oneiric-11-dot-10/
http://stackoverflow.com/questions/7801197/syntax-highlighting-with-pygments-is-failing-via-liquid-templates-string-error
2011-10-24 08:05:03 +02:00
Brandon Mathis 7e75d2f654 updated Gemfile.lock 2011-09-08 10:39:49 -05:00
Brandon Mathis 71ad7185bc Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server
Conflicts:
	Gemfile
	Gemfile.lock
2011-09-08 10:31:36 -05:00
Brandon Mathis c604af28da removed unicode_utils as a dependency 2011-09-05 07:53:04 -05:00
fhemberger 80f8a609f6 Improved support for non Latin characters in category names. Fixes #128 2011-09-04 12:56:54 +02:00
Brandon Mathis 282723ef3e updated Gemfile.lock, fixes #59 2011-08-22 17:14:37 -04:00
Scott Watermasysk 423e8ecbda Static Server based on Sinatra
Using Sinatra provides better handling of mime types and supports
304's/etc.

Also updated the Gemfile to exclude most gem outside of developemnt
(default).
2011-08-21 21:06:21 -04:00
Pavel Pravosud 5ec1f014a0 added stringex gem for permalink url generation 2011-08-20 10:24:15 +07:00
Brandon Mathis 7b81aab5ac added support for pygments.rb removing dependency on pygments, added support for caching highlighted code from pygments.rb and added default line numbering. Javascript auto line numbering now only occurs for embedded gists 2011-07-26 23:36:42 -04:00
Stephen Tudor 1d9e20ddfb Update Gemfile.lock to more recent gems 2011-07-16 22:17:17 -04:00
Brandon Mathis ef3ff431e5 1. Added html5 video with flash fallback.
2. Added Rack support
3. Disqus support
4. Improved Readme
5. Improved Syntax flexibility and styling
6. Improved blockquote styling
2011-06-24 17:17:35 -04:00
Brandon Mathis f77db80077 1. Switched back to Rdiscount
2. Improved Blockquote comment header
3. Added Include File and Pullquote plugins
4. Improved blog typography
5. Simplified "Read more" link
2011-06-19 15:14:01 -04:00
Brandon Mathis 21813059f2 1. Replaced Rdiscount in favor of Kramdown (better html5 support) for markdown processing.
2. Added updated instructions to the README
3. Removed unused media css directories
4. Improved use of color variables for page theming.
5. Improved Typography and blog styling.
6. Added support for simple pre and code styles
7. Misc styling and markup improvements.
2011-06-17 22:24:48 -04:00
Brandon Mathis 814be44c15 1. Improved responsive navigation styling when email subscription is present
2. Refactored subscription styling to be more DRY
3. Added an image for email subscriptions
4. Added assets directory to the gitignore for stashing working files
5. Improved gem list in the Gemfile
2011-06-11 15:23:54 -04:00
Brandon Mathis 14ba4cfd3c 1. Reduced dependencies and updated the gemfile
2. Added whole vendor directory to .gitignore for `bundle package` users
3. Removed guard tasks and replaced serve tasks in Rakefile.
3. Reorganized rake tasks and cleaned up the Rakefile.
2011-06-11 07:56:04 -04:00
Brandon Mathis 8698a276f9 Cleaned out public from repository, updated gitignore, added syntax
highlighting tests, improved syntax highlighting and styling of pre
blocks.
Overriding dynamic gist styling.
Added a plugin for pygments caching which should speed things up
terrifically.
added ender.js as a lightweight way of scripting the DOM, events, etc.
Some general typography and semantic html improvements.
2011-05-30 00:30:16 -04:00
Brandon Mathis c7d5365f81 major refactoring, improved file watching, changed site to public to support rack via pow (http://pow.cx) also implemented the basics of a 320 and up design refresh on the classic theme. This should make it great for mobile reading 2011-05-15 18:33:00 -04:00
Brandon Mathis e4c2d5790b irrisponsibly massive commit 2011-04-17 22:49:30 -05:00