121 Commits

Author	SHA1	Message	Date
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