Commit Graph

1379 Commits

Author SHA1 Message Date
Parker Moore 8ed092ed94 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Moving comparison for PostUrl tag to the PostComparer class
  Fail if destination directory for jekyll new exists and is not empty. Fixes #981.
  Remove code duplication: #write in Page and Post is the same.
2013-04-23 01:41:43 +02:00
Parker Moore 24aabbe05f Moving comparison for PostUrl tag to the PostComparer class 2013-04-22 12:57:52 +02:00
Parker Moore ba64a9fe30 Fail if destination directory for jekyll new exists and is not empty. Fixes #981. 2013-04-16 18:24:10 +02:00
Parker Moore 6ed41e373c Remove code duplication: #write in Page and Post is the same. 2013-04-16 02:55:31 +02:00
Parker Moore aba0e3a79e Release 1.0.0.rc1 2013-04-16 00:49:31 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore 82f32d5c02 Merge configuration properly. Closes #978. 2013-04-16 00:41:10 +02:00
Parker Moore e7546a98f6 Remove unnecessary override of #read_yaml in Page. 2013-04-15 19:24:23 +02:00
Parker Moore f6f3aa6218 Update history to reflect merge of #977. Repealed #580. 2013-04-15 19:21:15 +02:00
Parker Moore 9571e4c536 Merge pull request #977 from maul-esel/no-layout-defaults
No layout defaults (reverts #580)
2013-04-15 10:19:32 -07:00
Parker Moore e4b8dbc112 Add files to the manifest in the gemspec 2013-04-15 19:15:55 +02:00
maul.esel cc5ce06d78 remove tests for default layouts 2013-04-15 17:24:18 +02:00
maul.esel b7064a4bc3 remove 'post' and 'page' default layouts 2013-04-15 17:24:09 +02:00
Parker Moore 5a8a04391c Update history to reflect merge of #957. 2013-04-15 16:25:42 +02:00
Parker Moore afa3ef90b9 Merge pull request #957 from mojombo/timezonify
Set Timezone in _config.yml
2013-04-15 07:23:53 -07:00
Parker Moore 457e90fd41 Just remove the darn TEST_DIR 2013-04-15 15:42:21 +02:00
Parker Moore b4f68baafb Jekyll.set_timezone accepts just the timezone, not the config 2013-04-15 15:39:36 +02:00
Parker Moore b68d33ed8b Remove 'shell' from description of changing TZ 2013-04-15 14:37:37 +02:00
Parker Moore aa1f52fce8 Renamed timezone feature scenarios 2013-04-15 14:35:28 +02:00
Parker Moore 83cb01dd59 Using File.exists? more generally instead of File.directory? so /tmp/jekyll is always removed before running tests 2013-04-15 14:34:06 +02:00
Parker Moore 88e68e038a Extract out date parsing in feature steps 2013-04-15 14:32:14 +02:00
Parker Moore 9c57fad430 Finished feature for timezone shifting. 2013-04-15 00:42:14 +02:00
Parker Moore df868b308a Set Jekyll path relative to the env file, not to CWD 2013-04-15 00:42:14 +02:00
Parker Moore 48795462c2 Cucumber: remove test dir if it's there 2013-04-15 00:42:14 +02:00
Parker Moore b51b796a1e Feature for timezone switching 2013-04-15 00:42:13 +02:00
Parker Moore fbf818b618 Add example TZ and default value note. 2013-04-15 00:42:13 +02:00
Parker Moore d6a08b093a Add docs for timezone setting. 2013-04-15 00:42:13 +02:00
Parker Moore c0a2d0f888 Fixed syntax error 2013-04-15 00:42:13 +02:00
Parker Moore b249289b9d Set the timezone for the process 2013-04-15 00:42:13 +02:00
Parker Moore 5bcce7a1f1 Fix unit tests for Configuration#backwards_compatibilize 2013-04-15 00:41:46 +02:00
Parker Moore d33f45ff05 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
  Fixes multiple config loading. Closes #973. Rel: #945.
2013-04-15 00:32:17 +02:00
Parker Moore f7310f554e Whitespace in post.rb 2013-04-15 00:32:04 +02:00
Parker Moore 55a964a7da Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972 2013-04-14 23:18:47 +02:00
Parker Moore e531925cae Fixes multiple config loading. Closes #973. Rel: #945. 2013-04-14 23:04:20 +02:00
Parker Moore e0335e2167 .formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it 2013-04-14 20:21:39 +02:00
Parker Moore 85fc27bdd5 Update history to reflect merge of #959. 2013-04-14 20:06:58 +02:00
Parker Moore 398cd633b6 Merge pull request #959 from mojombo/deprecator
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore 6a4a607aea Merge pull request #968 from maul-esel/cucumber-fix
minor test fix: the variable is named page.path
2013-04-14 10:42:27 -07:00
Parker Moore 4ef107f3e8 Remove Logger methods from main Jekyll module. 2013-04-14 19:27:19 +02:00
maul.esel 64702f2faf minor test fix: the variable is named page.path 2013-04-14 09:52:30 +02:00
Parker Moore 91b9d974b2 Update history to reflect merge of #955 2013-04-14 05:26:32 +02:00
Parker Moore 81e44bf5f4 Merge pull request #955 from mojombo/refactor-markdown
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore 7a7990fb9a Moved markdown converters into lib/jekyll/converters/markdown 2013-04-14 05:23:42 +02:00
Parker Moore 30b49e7d4d Update history to reflect merge of #907 2013-04-14 04:22:29 +02:00
Parker Moore c708d1d71b Merge pull request #907 from advatar/pkpass_mime_type_support
Added pkpass to the list
2013-04-13 19:17:35 -07:00
Parker Moore 7557e732a2 Update history to reflect addition of docs for page.path #951 2013-04-13 20:42:35 +02:00
Parker Moore 0ba7bc12b0 Update history to reflect merge of #956 2013-04-13 20:41:43 +02:00
Parker Moore db3a2ab941 Update history to reflect merge of #966 2013-04-13 20:39:52 +02:00
Parker Moore 10c2445003 Merge pull request #966 from benbalter/quick-start-scaffold
Update quickstart instructions with `new` command
2013-04-13 11:38:56 -07:00
Parker Moore ef51b0f9e4 Error message is red 2013-04-13 20:27:44 +02:00