Commit Graph

185 Commits

Author SHA1 Message Date
Brandon Mathis
2e51d76681 Merge branch '2.1' into site
Conflicts:
	plugins/backtick_code_block.rb
	plugins/code_block.rb
	plugins/include_code.rb
	plugins/pygments_code.rb
2012-05-28 04:32:34 -05:00
Hong Xu
c1b2b43b32 Use a more portable way to create .nojekyll file when deploying to github pages. 2012-05-27 13:49:35 +08:00
Brandon Mathis
b673641d4f Merge branch '2.1' into site 2012-05-26 11:52:27 -05:00
Brandon Mathis
0b088433ca Added configurable array for adding hidden files to be deployed with copydot task 2012-05-26 11:52:23 -05:00
Brandon Mathis
409897f209 Merge branch '2.1' into site 2012-05-24 15:42:40 -05:00
Brandon Mathis
e81e1c8289 Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages 2012-05-24 10:18:28 -05:00
Brandon Mathis
6d482a9771 Merge branch '2.1' into site 2012-05-22 19:54:01 -05:00
Brandon Mathis
934e3b3040 Rake task 'clean' deletes each file inside of specified cache directories and generated stylesheets 2012-05-22 19:21:29 -05:00
Brandon Mathis
7e5ae5ecd8 Merge branch '2.1' into site-2.1 2012-05-22 17:15:30 -05:00
Brandon Mathis
09a2e3754d Copydot rake task now includes .nojekyll and .htaccess files. Since some OSes or applications create unimportant hidden files, this only copies hidden files known to be useful for blogging. This closes #303 #348 #419 2012-05-22 17:13:55 -05:00
Brandon Mathis
58e7489c4b Merge branch '2.1' into site-2.1 2012-05-22 13:18:19 -05:00
Brandon Mathis
439f0a774a Added generate_only task (combines isolate, generate, integrate) for speedier rendering checks on a blog post. Added more optional stdin dialogs to better support zsh. Improved feedback on set_root_dir 2012-05-22 13:12:48 -05:00
Brandon Mathis
53fdadd764 Merge branch '2.1' into site-2.1 2012-05-21 20:16:16 -05:00
Brandon Mathis
bfa5255188 Rake new post now accepts:
- Inline input as in `rake new_post["Your post title"]
- Input from stdin if in-line input isn't given.

This should help zhs users who've been frustrated by globbing issues.
Fixes #117
2012-05-21 08:57:49 -05:00
Brandon Mathis
ad40321eff Merge branch '2.1' into site-2.1 2012-05-20 22:23:42 -05:00
Brandon Mathis
741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 2012-05-20 22:23:18 -05:00
Brandon Mathis
c7d74c0d82 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:27 -05:00
Brandon Mathis
0d2af78693 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:18 -05:00
Brandon Mathis
47b13260cf Merge branch '2.1' into site-2.1 2012-05-20 16:20:00 -05:00
Brandon Mathis
654a2937b8 Improvements to hosting with Github Pages:
1. Push deployment task pulls first, avoiding a --force push
  2. Improvements to rake task setup_github_pages:
    - Now only rewrites _config.yml if in default state
    - Attempts a pull from deploy repo before setting up as a new project
    - Detects conflicts between CNAME and _config.yml url
    - Links to GitHub's help documentation for CNAME setup
Fixes #561
2012-05-20 10:38:56 -05:00
Brandon Mathis
bc717eafe2 Merge branch '2.1' into site 2012-05-19 17:00:33 -05:00
Brandon Mathis
ba98467538 removed poorly implemented monkey patch for compiling draft posts 2012-02-12 17:00:01 -06:00
Brandon Mathis
eb540a4404 update_source now correctly updates the archive page if it has been moved to source/archive and removes empty directories 2012-02-12 13:11:23 -06:00
Brandon Mathis
23c876021e Refactored the template a bit more and improved blog and archive styling for linklogs 2012-02-12 12:27:17 -06:00
Brandon Mathis
101a503f5a Added linklog publishing. 2012-02-12 07:12:22 -06:00
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