Commit Graph

555 Commits

Author SHA1 Message Date
Brandon Mathis
247aae2026 Improved support for non Latin characters in category names. Fixes #128 2011-09-04 08:52:32 -05:00
Brandon Mathis
e65a2bc02e fixed bug where update_source Rake task was not copying over changes from .themes 2011-09-04 08:51:46 -05:00
Brandon Mathis
3c21a7907d fixed bug with twitter feed where it would sometimes say "undefined" if the post was more than a month old 2011-09-04 08:50:15 -05:00
Brandon Mathis
412997a1be Merge branch 'site' of github.com:imathis/octopress into site
Conflicts:
	Rakefile
2011-08-28 23:13:45 -05:00
Brandon Mathis
1a0077d1dd updated layout styles to latest 2011-08-28 22:44:54 -05:00
Brandon Mathis
5ec6db0f1f removed right border from #content when sidebar has been removed 2011-08-28 22:44:28 -05:00
Brandon Mathis
0bd33ad27e Merge branch 'master' into site 2011-08-28 22:29:57 -05:00
Brandon Mathis
5efd0fb08e Merge pull request #123 from rtgibbons/master
rsync deploy broken (fix included)
2011-08-28 20:29:23 -07:00
Ryan Gibbons
aa095689e4 not using cd in copydot, breaks chained task when further cd's are called 2011-08-28 22:29:30 -05:00
Brandon Mathis
3bede9ab87 Merge branch 'master' into site 2011-08-28 22:26:47 -05:00
Brandon Mathis
9b52d40a54 removed octopress.org rsync deploy config from Rakefile. Oops 2011-08-25 16:58:02 -04:00
masukomi
e20e68139c sitemap_generator dies if public dir doesn't exist yet
this tests for the presence of the public dir and creates
it if needed. This situation can arise in a new install.
2011-08-25 12:35:06 -04:00
Brandon Mathis
49381c9f11 Merge branch 'master' into site
Conflicts:
	Rakefile
2011-08-25 10:54:54 -04:00
Brandon Mathis
35a158dd14 Somehow I replaced Rakefile with oder version, oops 2011-08-25 10:52:43 -04:00
Brandon Mathis
b38b613908 Added warning if users try to add posts, pages, or generate their site
before installing an Octopress theme, fixes #116
2011-08-25 10:45:01 -04:00
Brandon Mathis
ee004e5fb2 Added warning if users try to add posts, pages, or generate their site
before installing an Octopress theme, fixes #116
2011-08-25 10:44:06 -04:00
Brandon Mathis
94fcb60958 removed unnecessary mkdir_p in update_style, fixed #67 2011-08-25 10:25:41 -04:00
Brandon Mathis
ff5a362fb5 removed unnecessary mkdir_p in update_style, fixed #67 2011-08-25 10:25:31 -04:00
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