1066 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brandon Mathis	e8e1b7e352	updated facebook link share url pattern	2012-06-05 00:25:04 -05:00
Brandon Mathis	6ba5fce061	updated to latest theme	2012-06-05 00:08:10 -05:00
Brandon Mathis	92194e2d01	fixed the embedded example in include_code plugin	2012-06-05 00:07:40 -05:00
Brandon Mathis	d353d3de8b	Added support for using text based social sharing links instead of javascript widgets which may track users and do trigger crazy high http requests. Also added a custom sharing template file for injecting any other sharing widget into the sharing section after a post	2012-06-05 00:07:23 -05:00
Brandon Mathis	0d2aac5676	Added video and css masks to modernizer tests. Updated styles to work with new image mask classname	2012-06-04 23:13:56 -05:00
Brandon Mathis	467de0c0ce	Removing .sass-cache in update_style task to ensure that Sass caches don't cause problems when users update. Related to issue #555	2012-06-03 17:21:58 -05:00
Brandon Mathis	eaef2ec33e	Merge branch '2.1' into site	2012-06-03 09:47:13 -05:00
Brandon Mathis	3994e0d6f3	updated to latest style	2012-06-03 00:27:42 -05:00
Brandon Mathis	9b7958eab1	Syntax highlighting theme now defaults to the light color scheme. I also added new styles for marking lines of code, and a better custom/_colors.scss file	2012-06-03 00:27:20 -05:00
Brandon Mathis	09c3cd32f2	Syntax highlighting theme now defaults to the light color scheme. I also added new styles for marking lines of code, and a better custom/_colors.scss file	2012-06-03 00:26:39 -05:00
Brandon Mathis	120b4f7f0f	update docs to encourage 1.9.3 with rvm setup	2012-06-03 00:24:46 -05:00
Brandon Mathis	758687f9bd	updated documentation for code plugins	2012-06-03 00:24:03 -05:00
Brandon Mathis	020ec2f773	fixed indentation on code blocks, updated include_code example	2012-06-03 00:23:34 -05:00
Brandon Mathis	cf0d5b80cf	Improvements to code plugins ... - Range options are now properly stripped out of code plugin markup - Markers now add start and end class names for more style control - code_block plugin properly passes markings in highlight options - Deprecated title before file name syntax for include_code	2012-06-03 00:19:06 -05:00
Brandon Mathis	e4cd278e0c	Improvements to code plugins ... - Range options are now properly stripped out of code plugin markup - Markers now add start and end class names for more style control - code_block plugin properly passes markings in highlight options - Deprecated title before file name syntax for include_code	2012-06-03 00:13:39 -05:00
Brandon Mathis	2e51d76681	Merge branch '2.1' into site ... Conflicts: plugins/backtick_code_block.rb plugins/code_block.rb plugins/include_code.rb plugins/pygments_code.rb	2012-05-28 04:32:34 -05:00
Brandon Mathis	b867b0877d	Refactored code plugins so that shared regexes are mixed in methods ... Added option to mark one line or groups of lines in a code block Relates to issue #584	2012-05-28 04:29:18 -05:00
Brandon Mathis	2867208bef	added a test for marks	2012-05-28 04:22:41 -05:00
Brandon Mathis	ec900d5af7	Merge branch '2.1' of github.com:imathis/octopress into 2.1	2012-05-27 02:32:58 -05:00
Brandon Mathis	e16844af29	Improvements to Code embedding features ... 1. Removed lots of duplication 2. Added warnings and fixed some dim regex 3. New: set a start line number for any code snippet 4. New: set a start, end, or range for include_code 5. New: added option to disable line numbers linenos:false Fixes #478 #484	2012-05-27 02:30:17 -05:00
Brandon Mathis	b3a5d2bf48	Merge branch '2.1' into site	2012-05-27 02:16:45 -05:00
Brandon Mathis	5c9a470515	Improvements to Code embedding features ... 1. Removed lots of duplication 2. Added warnings and fixed some dim regex 3. New: set a start line number for any code snippet 4. New: set a start, end, or range for include_code 5. New: added option to disable line numbers linenos:false Closes #478 Closes #484	2012-05-27 02:14:37 -05:00
Brandon Mathis	d336604c3d	update docs heading	2012-05-27 02:09:48 -05:00
Brandon Mathis	8bf5b8a25c	updated docs with description of new code start, end and range options	2012-05-27 02:04:45 -05:00
Brandon Mathis	3b26147aef	Merge pull request #583 from xuhdev/deploy-nojekyll ... Use a more portable way to create .nojekyll file when deploying to github pages.	2012-05-26 22:54:41 -07:00
Hong Xu	c1b2b43b32	Use a more portable way to create .nojekyll file when deploying to github pages.	2012-05-27 13:49:35 +08:00
Brandon Mathis	b673641d4f	Merge branch '2.1' into site	2012-05-26 11:52:27 -05:00
Brandon Mathis	0b088433ca	Added configurable array for adding hidden files to be deployed with copydot task	2012-05-26 11:52:23 -05:00
Brandon Mathis	c5f0443126	updated to latest, changed code highlighting to light theme	2012-05-25 12:52:50 -05:00
Brandon Mathis	60698fd742	Merge branch '2.1' into site ... Conflicts: .themes/classic/sass/base/_solarized.scss	2012-05-25 12:48:13 -05:00
Brandon Mathis	ae967b264d	improved flexability of styling code blocks. Improved the light theme.	2012-05-25 11:36:57 -05:00
Brandon Mathis	a15cecf323	updated source to latest	2012-05-24 23:05:33 -05:00
Brandon Mathis	4efb88c72a	Merge branch '2.1' into site	2012-05-24 23:04:08 -05:00
Brandon Mathis	d40eaab07c	Switched out ender.js in favor of jQuery. Some small improvements to sidebar feed scripts	2012-05-24 23:03:59 -05:00
Brandon Mathis	6c8b51bd16	Merge branch '2.1' into site	2012-05-24 22:49:13 -05:00
Maxwell Swadling	b69e876828	Fixed paths in GitHub api lists from using api urls instead of HTML urls. ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Maxwell Swadling	693fc29572	Updated GitHub repos list to use GitHub Api v3 ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Brandon Mathis	409897f209	Merge branch '2.1' into site	2012-05-24 15:42:40 -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	af40b0aa13	Removed unnecessary line breaks from beginning and end of blockquotes	2012-05-24 10:24:37 -05:00
Brandon Mathis	4de8189651	Fixed collision with render on pygments_code.rb	2012-05-24 10:18:44 -05:00
Brandon Mathis	e81e1c8289	Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages	2012-05-24 10:18:28 -05:00
Brandon Mathis	e41d0dde13	Swithced the order or RVM and rbenv in setup documentation to put rbenv first (favored). Added rake update task to updating docs	2012-05-22 23:34:53 -05:00
Rainer Dreyer	98a372da9e	rvm install already updates .bash_profile and includes newest rubygems. ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-22 23:33:11 -05:00
Brandon Mathis	586439fbb2	updated to latest	2012-05-22 21:35:46 -05:00
Brandon Mathis	1eca86fa3f	Merge branch '2.1' into site	2012-05-22 21:19:07 -05:00
Brandon Mathis	47573af6c6	Improved mobile navigation injection script to work when search is not present. Fixes #380	2012-05-22 21:18:55 -05:00
Brandon Mathis	6d482a9771	Merge branch '2.1' into site	2012-05-22 19:54:01 -05:00
Brandon Mathis	934e3b3040	Rake task 'clean' deletes each file inside of specified cache directories and generated stylesheets	2012-05-22 19:21:29 -05:00
Brandon Mathis	7e5ae5ecd8	Merge branch '2.1' into site-2.1	2012-05-22 17:15:30 -05:00