Brandon Mathis
3bd4ed026e
Merge branch 'master' of github.com:imathis/octopress into compass
2011-09-28 14:51:24 -05:00
Brandon Mathis
5f81677cf5
updated rsync user
2011-09-27 16:27:52 -05:00
Brandon Mathis
2afb62b297
Merge branch 'master' into site
...
Conflicts:
Rakefile
2011-09-26 08:34:50 -05:00
Brandon Mathis
fd1c54bae6
Merge branch 'master' into site
2011-09-26 07:55:42 -05:00
Manu
af1f2af48f
Typo.
2011-09-26 00:16:15 +03:00
Manu
a4177e1471
Changed it so the ssh port is configurable as well. (As I ran into the same issue already described at https://github.com/imathis/octopress/issues/30 )
2011-09-26 00:13:42 +03:00
Frederic Hemberger
3ad7715901
Fix generation of stylesheets
2011-09-24 11:31:57 +02:00
Brandon Mathis
aa1abd0827
now Github pages :push task forces
2011-09-22 16:16:54 -05:00
Brandon Mathis
4d49149404
renamed github pages configuration task
2011-09-22 04:45:44 -05:00
Frederic Hemberger
ab61a62d30
Removes compass_compiler.rb
2011-09-22 11:43:33 +02:00
Brandon Mathis
fcb730b5bf
Restored copying public into _deploy. fixes #169
2011-09-22 04:43:09 -05:00
Brandon Mathis
4efb29394f
improved github configuration raketask
2011-09-22 04:41:40 -05:00
Brandon Mathis
d1faf7656a
Merge branch 'master' into site
2011-09-22 04:28:40 -05:00
Frederic Hemberger
92ff4a9c67
copydot task can be called with parameters, no need for separate copydot_deploy
2011-09-22 10:17:31 +02:00
Brandon Mathis
a5d55fe80f
Fixed issue where dotfiles were not being copied to _deploy for github pages deployments
2011-09-21 18:54:54 -05:00
Brandon Mathis
5b2b0c508b
fixed issue where public was being copied into _deploy
2011-09-21 18:44:21 -05:00
Brandon Mathis
480b60ddf1
Merge branch 'master' into site
...
Conflicts:
_config.yml
2011-09-21 14:01:11 -05:00
Tom Miller
ec91c370d5
Removing glob because globbing does not pick up dotfiles.
2011-09-19 22:46:21 -05:00
Frederic Hemberger
31adeee1df
Wraps git commit message in double quotes, fixes #139
2011-09-18 14:07:43 +02:00
Frederic Hemberger
f6bf894387
Aligns naming of .pygments-cache, .gist-cache and .sass-cache
2011-09-18 13:45:25 +02:00
Chris Sims
1a562b9580
Fixes #150 . Strip leading path before checking for excluded file.
2011-09-17 18:34:09 -05:00
Brandon Mathis
b5df8f9ae9
Merge branch 'master' into site
2011-09-17 14:15:23 -05:00
Brandon Mathis
48cd2793cf
added itegration to gen_deploy
2011-09-12 14:51:49 -05:00
fhemberger
565648300b
Fix an issue in 'watch' and 'preview' where main process is terminated with child processes still running
2011-09-12 21:36:14 +02:00
fhemberger
04973e0948
Move generate + deploy to separate task
2011-09-12 20:48:26 +02:00
fhemberger
960a57c256
Generate site before deploying, execute tasks in sequence
2011-09-12 19:49:18 +02:00
fhemberger
5c275542c3
Copy dotfiles also for subdirectories
2011-09-12 19:46:11 +02:00
Brandon Mathis
7c1c24f899
moved from Posix::Span to Process.span, fixing #46
2011-09-08 11:54:18 -05:00
Brandon Mathis
47fa2f0705
moved from Posix::Span to Process.span, fixing #46
2011-09-08 11:54:07 -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
b812500f39
Updated new_post and new_page taks to use new ask method for dialogs
2011-09-04 08:47:36 -05:00
Brandon Mathis
ed0c220523
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
...
Conflicts:
plugins/category_generator.rb
2011-09-04 08:37:22 -05:00
fhemberger
f03c4cdb2a
install: Adds confirmation before overwriting existing source_dir
2011-09-04 14:25:04 +02:00
Brandon Mathis
3f07677276
Added prompt for overwriting posts and pages when a new_post and new_page tasks are run and the file already exists. Fixes #130
2011-09-03 08:06:36 -05:00
Brandon Mathis
724fd1dbc8
fixed bug where update_source Rake task was not copying over changes from .themes
2011-09-02 17:24:42 -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
0bd33ad27e
Merge branch 'master' into site
2011-08-28 22:29:57 -05: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
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
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
143520898a
Merge branch 'master' into site
2011-08-21 16:41:05 -04:00
Pavel Pravosud
5ec1f014a0
added stringex gem for permalink url generation
2011-08-20 10:24:15 +07:00
Brandon Mathis
59521e3db8
added blog_index_dir configuration and improved update_source
2011-08-16 01:50:34 -04:00
Brandon Mathis
75c76fcfd4
added blog_index_dir configuration and improved update_source
2011-08-16 01:49:49 -04:00
Brandon Mathis
ed88bb430a
Merge branch 'master' into site
2011-08-12 00:07:10 -04:00
Brandon Mathis
5958810eb2
Merge branch 'master' of github.com:imathis/octopress
2011-08-11 19:56:54 -04:00
Brandon Mathis
313c3859aa
now using rack instead of Jekyll's webrick server, fixes #90
2011-08-11 19:56:25 -04:00
marutanm
a817f99785
fix rake-list
2011-08-11 21:13:30 +09:00
Brandon Mathis
0e072543da
added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html
2011-08-10 18:15:10 -04:00
Brandon Mathis
cc4e51db8b
added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html
2011-08-10 18:14:56 -04:00
Brandon Mathis
5d24e0ba2b
udpated rake udpate_source task to preserve custom includes instaed of preserving navigation and footer
2011-07-31 13:24:56 -04:00
Brandon Mathis
6c2db74762
udpated rake udpate_source task to preserve custom includes instaed of preserving navigation and footer
2011-07-31 13:24:38 -04:00
Brandon Mathis
400c8d2700
Merge branch 'master' into site
2011-07-29 09:12:02 -04:00
Brandon Mathis
df86e647b1
Rake task update_source now preserves footer as well as navigation
2011-07-28 22:12:50 -04:00
Brandon Mathis
84e4979d8b
Merge branch 'master' into site
2011-07-28 11:00:17 -04:00
Brandon Mathis
0911eabb9b
fixed update style
2011-07-27 18:34:50 -04:00
Luke Armstrong
6244feae22
Fixed rake update_source and rake update_style
2011-07-28 00:22:57 +02:00
Luke Armstrong
3d238313a7
Fixed [cp: cannot stat `.themes/classic/source/*.': No such file or directory]
2011-07-27 23:50:35 +02:00
Brandon Mathis
e771fe940d
updated and reorganized docs
2011-07-27 16:41:43 -04:00
Brandon Mathis
73287e95ef
added Octopress.org theme and customizations
2011-07-27 16:41:42 -04:00
Brandon Mathis
25704fe355
improved new_post title substitutions, fixed directories in rake update tasks
2011-07-27 16:39:50 -04:00
Mike Ballou
9189548e9d
Changed description of new_page rake task, to what it does
2011-07-26 16:10:16 -07:00
Brandon Mathis
a12b0b7f6e
updated push rake task to copy contents of public directory into _deploy
2011-07-26 14:32:15 -04:00
Brandon Mathis
12aed03eea
updated rakefile and config to support url mapping in previous commit
2011-07-22 00:03:11 -04:00
Brandon Mathis
19df7e84d6
added source_update and sass_update rake tasks, for easily updating a blog to the latest theme
2011-07-19 22:18:34 -04:00
Brandon Mathis
cc1cfa56b2
fixed regular expression for new_page rake task
2011-07-19 17:29:23 -04:00
Brandon Mathis
6006ac8a01
new_page rake task now creates pages as page_name/index.[default_format] if no file extension is passed. By default this creates nicer urls
2011-07-19 17:01:14 -04:00
Brandon Mathis
98cfd74d9a
In new_post and new_page rake tasks: adding quotes around title attribute for better compatibility with yaml
2011-07-19 16:18:40 -04:00
Brandon Mathis
4a40323166
Changed rake task 'post' to 'new_post' and updated the yaml front matter. Added 'new_page' rake task for easily adding new pages with a default yaml block
2011-07-19 16:09:42 -04:00
Brandon Mathis
17c59fb1d1
Moved plugins to root directory. I'm ditching the idea of shipping plugins with themes until it's more obviously necessary. This way it's easier to merge and update plugins.
2011-07-19 09:06:54 -04:00
Brandon Mathis
7c71582990
Merge branch 'edge' of github.com:imathis/octopress into edge
2011-07-16 14:55:37 -04:00
Brandon Mathis
1f9b596b82
1. Added rake task for simple configuration of subdirectory deployment.
...
2. Updated READEME documentation regarding deploying to subdirectories.
3. Fixed related mistake in pagination and header links
2011-07-16 14:52:50 -04:00
Kent Fenwick
922472517f
Updated path to plugins.
2011-07-16 11:27:16 -07:00
Brandon Mathis
9e6a951826
Updated install rake task (now properly copies directory contents) Thanks @pw for the pull request fixes #32
2011-07-11 11:55:56 -04:00
Brandon Mathis
ee7b9dd958
Changed _plugins folder to plugins and updated rake tasks accordingly
2011-07-11 11:17:15 -04:00
Brandon Mathis
ea349cdfbf
Moved themes to .themes to get it out of the way. Updated Rakefile to support .themes dir and remove duplication. Improved deploy task. Renamed init_deploy to cofig_deploy and rewrote it to update configurations in the Rakefile for easier deploy use
2011-06-29 14:01:06 -04:00
Brandon Mathis
ce6621724c
Improved the post and init_deploy rake tasks
2011-06-27 22:47:40 -04:00
Brandon Mathis
6f4c842bdf
fixed a bug in init_deploy task
2011-06-27 18:17:15 -04:00
Brandon Mathis
353ccfd4eb
1. Added Category support
...
2. Designed blog archives pages
3. Restructured Sass
4. Added Categories to rake post metadata
5. Some general style improvements
2011-06-27 15:59:21 -04:00
Brandon Mathis
a128d4990b
1. Improved Deployment and setup tasks in Rakefile
...
2. Improved README setup instructions
2011-06-22 23:44:02 -04:00
Brandon Mathis
a2ab1d4802
1. Reordered configs in Rakefile based on importance.
...
2. Refactored stylesheets to simplify dreictory trees.
2011-06-22 12:29:23 -04:00
Brandon Mathis
b9b9eb09c1
improved rake tasks for deployment, updated .gitignore
2011-06-21 16:11:07 -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
913fa105c4
1. Moved _plugins into themes/classic/_plugins
...
I think it's probably better to ship plugins with themes to make it
easier to update them.
2. Improved 'install' rake task and made nicer output
2011-06-11 15:58:53 -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
519e234aab
Improved theme install process
...
added missing assets
2011-06-08 16:36:10 -04:00
Brandon Mathis
d8b796acb9
Another massive commit:
...
1. Major improvements to the responsive styling.
2. Toggleable sidebar
3. Upgraded to modernizr 2.0 which includes Respond.js
4. IE7-9 testing and fixes
5. New theming system which should make forkers happy
6. New rake task for installing Octopress themes
7. Magic
2011-06-07 10:45:01 -04:00
