Commit Graph

130 Commits

Author SHA1 Message Date
Brian Kim 028e580bb8 Remove short-circuits from Site 2013-04-13 12:39:49 -04:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Parker Moore 0f2c9d29ee Merge pull request #875 from mojombo/posts-cant-be-dirs
Directories with valid post names should be filtered out
2013-04-07 12:54:42 -07:00
Lucas Jenss 2c7325223f Fix symlinked assets not being included, even in unsafe mode 2013-03-31 20:49:43 +02:00
Parker Moore 6f6ad001d2 Ignore entries if they are directories. 2013-03-19 21:59:06 +01:00
Parker Moore 4400e89898 Expect a 'baseurl' to be passed in to Site 2013-03-17 21:18:45 +01:00
Parker Moore d5ed4fc5d0 Add baseurl to Site attr_accessor list. 2013-03-17 20:42:11 +01:00
Parker Moore eef13d7d43 Expose site.baseurl to Liquid templates. 2013-03-17 17:26:33 +01:00
Tommy Sullivan caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers 10ee5c8999 Remove the duplication when creating Converters and Generators
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Matt Rogers 6399ec9b2b Remove duplication when aggregating post information 2013-03-05 19:11:07 -06:00
Matt Rogers 2dd98816d4 Remove duplication when generating list of entries to process
Posts and Drafts share the same logic to get the list of files to
process into objects when generating the site. Factor this logic into
its own method and use it when reading posts and reading drafts.
2013-03-05 19:06:20 -06:00
Tom Preston-Werner 2b9b613687 Normalize CLI options to match configuration expectations. 2013-03-03 18:23:02 -08:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Parker Moore 63d0eef646 Merge pull request #824 from sinamt/symlinked_folders
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
2013-02-26 16:54:52 -08:00
Matt Rogers d58859570d Fix up the whitespace.
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers 5a9c20983d Rename setup_plugins to plugins_path 2013-02-25 13:20:32 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
scribu 538c2086a5 whitespace fixes 2013-02-10 04:49:27 +02:00
scribu 3e164d6daf don't check if draft is published or if its date is in the future 2013-02-09 23:48:38 +02:00
scribu 78831d94cd don't mess with dir parameter 2013-02-09 23:19:35 +02:00
scribu 642349f797 implement and use Draft.valid? 2013-02-09 22:41:47 +02:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Alexander Ekdahl 4cd7c22ee7 Now uses the more semantically correct AND operator 2013-02-04 22:17:03 +01:00
Alexander Ekdahl 7512e6bb66 Allow symlinked folders in unsafe mode 2013-02-04 17:16:01 +01:00
scribu 0ad623fb85 first pass at --drafts flag 2013-01-20 05:23:56 +02:00
Tom Bell 517e6f81d3 Remove new lines between module and class 2013-01-20 00:00:49 +00:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
mccxj 3cf29eeee2 add Enumerable#glob_include? 2013-01-11 15:33:11 +08:00
Matt Rogers 151275d09e Add TomDoc 2013-01-10 21:53:21 -06:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
xiaojian cai b3e27f2c5d fixed a syntax error 2013-01-10 19:41:11 +08:00
xiaojian cai c627cd3519 use any? instead 2013-01-10 09:16:09 +08:00
xiaojian cai 1e892678bc Update lib/jekyll/site.rb 2013-01-09 16:06:43 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
xiaojian cai 44822a252e add regexp support for option 'include','exclude' 2013-01-06 21:23:31 +08:00
Tom Preston-Werner dd0e208daa Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1 2013-01-03 22:26:09 -08:00
Tom Preston-Werner c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
edeustace 4bae42a671 use Array.join instead of Array.inject, add .svn to defaults 2012-12-09 11:43:49 +01:00
edeustace 7c800d3b07 Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 2012-08-23 12:07:30 +02:00
Tom Preston-Werner 202894c196 Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
Conflicts:
	lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
Tom Preston-Werner 47090ffd2a Fix up a few TomDocs. 2012-06-06 11:59:49 -07:00
Tom Preston-Werner 0e9e7fbc85 Simplify Site#read_layouts. 2012-06-06 11:59:49 -07:00
Tom Bell df2ad2ac59 Allow a custom 'layouts' directory
* Add 'layouts' option to change the dir from '_layouts' to anything relative
  to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
Luca Grulla 7d88f72409 avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%. 2012-04-29 00:27:11 -07:00
Jason Roelofs 604b60c9ba Add checks to prevent accidental deletion of the source directory 2012-04-03 22:05:18 -05:00
Jason Roelofs 8368485fa0 Remove deletion of dot files on cleanup.
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.

All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
Jérémy Lecour 41f2805b7f No need to have a variable assignment, especially if it has the same name as the method parameter. 2012-02-11 09:05:59 +01:00