Brandon Mathis
|
fb80e90838
|
Merge branch 'master' into site
|
2011-09-29 14:54:05 -05:00 |
|
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 |
|