Commit Graph

160 Commits

Author SHA1 Message Date
Brandon Mathis
f698e85343 fixed a few innacuracies in the docs, and saved deployment to github setup 2011-12-30 10:56:23 -06:00
Brandon Mathis
479d36332c Merge branch 'master' into site
Conflicts:
	_config.yml
2011-12-19 10:39:51 -06:00
Brandon Mathis
ce0d25100b now Github repo url can be specified inline setup_github_pages command 2011-12-18 15:38:11 -06:00
Brandon Mathis
51ba8170b5 Merge branch 'master' into site 2011-12-10 18:30:40 -06:00
Brandon Mathis
39ec55b605 Removed offending paren in Rakefile 2011-12-10 18:30:33 -06:00
Brandon Mathis
a4ea559ec9 fixed merge in rakefile 2011-12-10 18:19:39 -06:00
Brandon Mathis
bdc3cb8bd3 Rsync --delete option can be turned off in Rakefile configuration and users can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247 2011-12-10 18:18:34 -06:00
Brandon Mathis
284c5f98f8 fixed merge of _config 2011-12-10 10:36:19 -06:00
Frederic Hemberger
e220fcc610 Merge branch 'master' of github.com:imathis/octopress 2011-12-10 14:48:35 +01:00
Frederic Hemberger
254cdd35d6 :copydot ignores thumbnail files starting with '._' 2011-12-10 14:46:13 +01:00
Frederic Hemberger
e5c262cb8f Merge pull request #225 from imathis/post_names
Add more flexibility to :new_page task
2011-12-10 04:04:48 -08:00
Frederic Hemberger
6714e5c7f5 Set flag in preview mode and re-generate files before deployment if necessary 2011-11-29 15:13:50 +01:00
Frederic Hemberger
f1ebf35869 Introduce distinction between preview/productive site generation
Posts which contain the YAML attribute `published: false` are usually
not generated by Jekyll. With this patch they can be previewed just
like published posts on localhost using `rake watch`or `rake preview`.

NOTICE: Before pushing to the productive environment, use `rake generate`
to update the public directory and remove posts which are flagged not to be
published.
2011-11-23 14:37:30 +01:00
Frederic Hemberger
ffa68a1fe3 Fixes typo in :push task 2011-10-17 08:18:41 +02:00
Frederic Hemberger
fc138b2e35 Adds more flexibility to :new_page task
Page filenames/directories are lowercased and sanitized by default to
allow a greater flexibility:

- new_page["/path/to/file"] # => source/path/to/file/index.markdown
- new_page["path/to/file"] # => source/path/to/file/index.markdown
- new_page["my path/my file"] # => source/my-path/my-file/index.markdown
- new_page["lorem.ipsum.dolor"] # => source/lorem-dot-ipsum.dolor
- new_page["Questions & Answers"] # => source/questions-and-answers/index.markdown
2011-10-16 16:22:37 +02:00
Frederic Hemberger
82942bd088 Replaces system call with cross-platform cp_r, fixes #200 2011-10-16 13:07:31 +02:00
Frederic Hemberger
4b87a2fb7d Removes 'titlecase' from page name, fixes #202 2011-10-16 11:49:18 +02:00
Frederic Hemberger
fe19c2aaae Removes duplicate mkdir_p 2011-10-16 11:43:55 +02:00
Brandon Mathis
86c72a4ca6 ensures compiled /source/stylesheets/screen.css exists before running watch and preview tasks, fixes #214 2011-10-11 15:14:41 -05:00
Frederic Hemberger
35ebe0d647 Allows '-' in deployment branch names, fixes #213 2011-10-11 14:20:52 +02:00
Brandon Mathis
09057190d9 fixed issue where update_source failed if source/index was any extension other than .html 2011-10-01 23:36:52 -05:00
Brandon Mathis
d833d9fe78 wildcards broke rake update_source. fixes that 2011-10-01 21:42:24 -05:00
Brandon Mathis
bdf904adff Retains customized favicon on update_source fixes #189, Copies index.* from source.old fixes #188 2011-09-30 08:08:07 -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