Commit Graph

537 Commits

Author SHA1 Message Date
Brandon Mathis
cfff0a2481 Merge branch 'master' into site 2011-08-25 10:11:02 -04:00
Brandon Mathis
ebd5fb002b sleeps wait, cleaned up rake preview and rake watch a bit 2011-08-25 10:05:22 -04:00
Benjamin R Doerr
efb7522491 Do not rely on system specifc syntax for preview or watch. 2011-08-23 22:56:06 -04:00
Benjamin R Doerr
5f08abe6dd Removes system specific File IO from Rakefile, rather we make use of FileUtils. 2011-08-22 23:05:55 -04:00
Ben Doerr
9d57455e0f Makes update_source and update_style much more windows friendly. 2011-08-23 03:22:18 -03:00
Brandon Mathis
599cd4e07c updated date now shows up properly 2011-08-22 17:24:02 -04:00
Brandon Mathis
d3c6ded158 Merge branch 'master' into site 2011-08-22 17:19:34 -04:00
Brandon Mathis
282723ef3e updated Gemfile.lock, fixes #59 2011-08-22 17:14:37 -04:00
Brandon Mathis
105e446bd2 updated to latest octopress 2011-08-22 16:30:40 -04:00
Brandon Mathis
806d27db13 using @extend for responsive blocks, added shadow-box mixin to utlities for configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes #109 2011-08-22 16:29:08 -04:00
Brandon Mathis
7527a9fda4 using @extend for responsive blocks, added shadow-box mixin to utlities for configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes #109 2011-08-22 16:28:50 -04:00
Brandon Mathis
baa0a1ad6b added gem install rake as recommended in issue #80 2011-08-22 12:11:43 -04:00
Brandon Mathis
23f05c1158 Merge branch 'master' of github.com:imathis/octopress 2011-08-21 18:38:33 -04:00
Brandon Mathis
9f830dd96f added support for deploying "dot" files (eg. .htaccess), fixes #104 2011-08-21 18:38:18 -04:00
Brandon Mathis
2644f3cea0 added support for deploying "dot" files (eg. .htaccess), fixes #104 2011-08-21 18:38:10 -04:00
Brandon Mathis
9e5e6f604c Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589
minor tweak to _typography.scss to have pp, code, and tt extend style that exists
2011-08-21 14:58:26 -07:00
Brandon Mathis
143520898a Merge branch 'master' into site 2011-08-21 16:41:05 -04:00
Brandon Mathis
b40d2fb2a4 Merge branch 'master' of https://github.com/rwz/octopress into rwz-master 2011-08-21 16:37:14 -04:00
Brandon Mathis
16773b4514 improved code docs a bit 2011-08-21 16:31:10 -04:00
Brandon Mathis
1e26b77a0d added files for documentation on include_code 2011-08-21 16:21:59 -04:00
Brandon Mathis
2ff46f3711 Added documentation and tests for forcing Pygments lexers with lang:language. 2011-08-21 16:20:10 -04:00
Brandon Mathis
11c6e1f7a7 include_code now defaults to relative urls for easy testing on a development server 2011-08-21 16:16:03 -04:00
Brandon Mathis
3ea1e4edab include_code now defaults to relative urls for easy testing on a development server 2011-08-21 16:15:46 -04:00
Brandon Mathis
089af26b02 improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace. 2011-08-21 10:31:58 -04:00
Brandon Mathis
6db1a5ada5 improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace. 2011-08-21 10:31:14 -04:00
Brandon Mathis
2e4f95212a Merge branch 'site' of github.com:imathis/octopress into site 2011-08-21 09:15:44 -04:00
Brandon Mathis
83d87f98cc added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108 2011-08-20 20:25:07 -04:00
Brandon Mathis
cbd6f8d8de added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108 2011-08-20 20:24:51 -04:00
Brandon Mathis
67211edd97 Merge branch 'master' of github.com:imathis/octopress 2011-08-20 18:40:07 -04:00
Brandon Mathis
358d02a4a7 centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108 2011-08-20 18:39:47 -04:00
Brandon Mathis
d5e4bf2d8c added test for .ru pygments alias 2011-08-20 18:39:35 -04:00
Brandon Mathis
6b586af8a5 centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108 2011-08-20 18:39:00 -04:00
Brandon Mathis
516bb8174d added excerpt_link to article include. fixes #97 2011-08-20 17:34:10 -04:00
Brandon Mathis
9e8eec332c added excerpt_link to article include. fixes #97 2011-08-20 17:31:22 -04:00
Brandon Mathis
1722c503f7 updated to latest octopress source 2011-08-20 16:03:37 -04:00
Brandon Mathis
596ec87c37 now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml 2011-08-20 16:02:50 -04:00
Brandon Mathis
9a81a6ecf9 now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml 2011-08-20 16:02:37 -04:00
Brandon Mathis
01c4e37ea4 Merge branch 'site', remote branch 'origin' into site 2011-08-20 15:57:05 -04:00
Pavel Pravosud
5ec1f014a0 added stringex gem for permalink url generation 2011-08-20 10:24:15 +07:00
Brandon Mathis
178a198ea7 updated blog theme to default to left aligned images. To center images, use classname "center" 2011-08-18 15:01:00 -04:00
Brandon Mathis
3186b0fcfe updated blog theme to default to left aligned images. To center images, use classname "center" 2011-08-18 15:00:47 -04:00
Brandon Mathis
1fe17a4cb1 changed to absolute development link to relative fixes #102 2011-08-18 14:40:54 -04:00
Brandon Mathis
cf31601d4b reordered arguments in pagination 2011-08-18 14:30:59 -04:00
Brandon Mathis
3e1674c3c0 reordered arguments in pagination 2011-08-18 14:30:36 -04:00
Brandon Mathis
c248cffe6a Merge pull request #101 from scompt/patch-1
Fix typo in URL in permalink example.
2011-08-17 08:06:22 -07:00
Brandon Mathis
bc1de6209b Merge pull request #99 from NJAldwin/site
Documentation Fixes
2011-08-17 06:32:22 -07:00
Edward Dale
c9482a7257 Fixing a typo in the URL of the permalink example. 2011-08-17 14:39:43 +03:00
Nick Aldwin
8c0aa92636 Fix grammatical error 2011-08-17 03:06:55 -03:00
Nick Aldwin
98ceed81e8 Fix codeblock link 2011-08-17 03:04:10 -03:00
Brandon Mathis
ef4a42f977 Codeblock regex improved to better detect extensions fixes #96, added support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks 2011-08-16 02:41:28 -04:00