Commit Graph

  • 02da17b769 Merge pull request #795 from mojombo/new-log-format Parker Moore 2013-02-20 14:15:36 -0800
  • db5d27639e Fixed merge conflicts: rebasing on master. Parker Moore 2013-02-20 23:14:58 +0100
  • a19bb1815a Fixed merge conflicts in test/test_configuration.rb Parker Moore 2013-02-20 23:13:06 +0100
  • 5d8e012899 Fixed merge with new log output in lib/jekyll.rb Parker Moore 2013-02-20 23:10:42 +0100
  • 9eb79ff135 Improved output for auto-regeneration. Parker Moore 2013-02-03 20:36:34 +0100
  • bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb Parker Moore 2013-02-20 23:09:34 +0100
  • 388e0c8077 Fixed typo in History file Parker Moore 2013-02-20 22:15:23 +0100
  • 090bbbe4f6 Update history to reflect merge of #788. Parker Moore 2013-02-20 22:15:03 +0100
  • c042a77496 Merge pull request #788 from mojombo/add-opts Parker Moore 2013-02-20 13:13:42 -0800
  • d0d947995a Update history to reflect merge of #815. Parker Moore 2013-02-20 22:01:12 +0100
  • 3b156d21af Merge pull request #815 from bhardin/fixing_help Parker Moore 2013-02-20 12:17:19 -0800
  • 03e2e8d063 Changing help message to reflect what actually happens when running build and serve Brett Hardin 2013-02-20 09:37:19 -0800
  • 151ec1a487 Update history to reflect merge of #807. Parker Moore 2013-02-19 12:02:10 +0100
  • d361a70391 Merge pull request #807 from mojombo/safeyaml-warnings Parker Moore 2013-02-19 03:01:27 -0800
  • ac8c7a0944 Relax Kramdown version to 0.14. Fixes #808. Parker Moore 2013-02-19 02:38:18 +0100
  • 35c3ef05bf Update history to reflect merge of #801. Parker Moore 2013-02-10 21:38:02 +0100
  • ac502d175a Merge pull request #801 from kevinSuttle/master Parker Moore 2013-02-10 12:36:38 -0800
  • c7c0a9432c Updating tests for safe_yaml. Parker Moore 2013-02-10 19:09:36 +0100
  • 11eb1ecae1 Safe loading of files and YAML. Parker Moore 2013-02-10 19:07:38 +0100
  • 0c6d56365a Upgrading to safe_yaml v0.7 Parker Moore 2013-02-10 19:07:05 +0100
  • 382b1b5a11 Updated History to reflect merge of #806 Parker Moore 2013-02-10 17:06:46 +0100
  • 78c37180f2 Merge pull request #806 from scribu/patch-1 Parker Moore 2013-02-10 08:05:32 -0800
  • 311bcbb7ed mention styleguide to new contributors Cristi Burcă 2013-02-10 17:19:22 +0200
  • 538c2086a5 whitespace fixes scribu 2013-02-10 04:49:27 +0200
  • 3e164d6daf don't check if draft is published or if its date is in the future scribu 2013-02-09 23:47:17 +0200
  • 2588d681c9 fix draft filename processing scribu 2013-02-09 23:38:13 +0200
  • 78831d94cd don't mess with dir parameter scribu 2013-02-09 22:49:49 +0200
  • 642349f797 implement and use Draft.valid? scribu 2013-02-09 22:41:47 +0200
  • 1ac46b17c4 Don't require date in draft filenames. scribu 2013-02-09 18:01:19 +0200
  • 372628c22a Merge pull request #799 from apodlaski/remove-migrators-from-gemspec Parker Moore 2013-02-07 14:36:05 -0800
  • b4c5d707a5 Bump .ruby-version to 1.9.3-p374 Kevin Suttle 2013-02-07 15:19:33 -0500
  • fae771d1a0 Remove migrator files from jekyll.gemspec Aleksander Podlaski 2013-02-07 07:21:55 +0100
  • 8e48848b7a Removed migrate tasks from Rakefile. Parker Moore 2013-02-07 00:42:37 +0100
  • 4cd7c22ee7 Now uses the more semantically correct AND operator Alexander Ekdahl 2013-02-04 22:17:03 +0100
  • 7512e6bb66 Allow symlinked folders in unsafe mode Alexander Ekdahl 2013-02-04 17:16:01 +0100
  • a3d95957dd Updating tests for new config output. Parker Moore 2013-02-03 21:31:05 +0100
  • f6d38def5a Reworking errors with configuration file. Parker Moore 2013-02-03 21:30:52 +0100
  • 90fa3f2921 Improved output for auto-regeneration. Parker Moore 2013-02-03 20:36:34 +0100
  • dd7c5870d9 Cleaner output when generating site. Parker Moore 2013-02-03 20:29:58 +0100
  • e4042e56b7 Update history to reflect merge of #792. Closes #789. Parker Moore 2013-02-03 18:56:42 +0100
  • f002ee4f9f Merge pull request #792 from mojombo/alias-serve-to-server Parker Moore 2013-02-03 09:55:14 -0800
  • 7a44965c88 Updated history to reflect merge of #793. Closes #787. Parker Moore 2013-02-03 01:54:52 +0100
  • 9ea1becf13 Merge pull request #793 from mojombo/remove-migrators Parker Moore 2013-02-02 16:34:07 -0800
  • f5137850e4 Using abort instead of puts & exit when jekyll-import gem isn't available. Parker Moore 2013-02-03 01:24:38 +0100
  • daa9e11994 fix whitespace in drafts.feature scribu 2013-01-31 05:35:19 +0200
  • 9bb0bfc0b2 Eliminating migrator tests (in this repo). Parker Moore 2013-01-31 01:19:56 +0100
  • e8384e6a97 Eliminating migrator dependencies. Parker Moore 2013-01-31 01:19:34 +0100
  • 82f29bb627 The jekyll-import gem provides Jekyll::Commands::Import, not Jekyll::Commands::Migrate. Parker Moore 2013-01-31 00:18:54 +0100
  • 28a074ff7a Remove Jekyll::Commands::Migrate Parker Moore 2013-01-31 00:18:22 +0100
  • b70c59667c Requiring jekyll-import gem. Printing error and exiting if it does not exist. Parker Moore 2013-01-30 23:43:26 +0100
  • 221c2f4c0e Aliased jekyll server to jekyll serve Parker Moore 2013-01-30 23:30:04 +0100
  • 2e73671cf4 Updated Kramdown tests to reflect numeral HTML entities. Parker Moore 2013-01-30 23:25:49 +0100
  • 1cfd0c8b15 Updated history to reflect merging of #744. Parker Moore 2013-01-30 23:21:23 +0100
  • 04b60ffe7f Merge pusewicz/bump-gems from #744 Parker Moore 2013-01-30 23:20:23 +0100
  • 62bba37c1f Update history to reflect merge of #768 Parker Moore 2013-01-30 22:19:24 +0100
  • 6e8202f9a6 Added in --limit-posts Parker Moore 2013-01-30 22:04:56 +0100
  • 7023a5e622 Added the --future switch back to the CLI Parker Moore 2013-01-30 21:56:54 +0100
  • cff4ec72ea Using .erb file for the new post Parker Moore 2013-01-30 21:05:52 +0100
  • a7f0d04bda Improve error message for malformed highlight tags Leonard Ehrenfried 2013-01-29 12:16:33 +0100
  • 704307d7fe Added very basic code snippet example to sample post Parker Moore 2013-01-27 23:30:32 +0100
  • bf78fe9b75 Move post scaffold content to a separate method. Parker Moore 2013-01-27 23:23:53 +0100
  • a68b67c65e Added newline to New command for stylistic congruence. Parker Moore 2013-01-27 23:21:31 +0100
  • ac691a1465 removed related posts segment of scaffold site. Parker Moore 2013-01-27 23:21:02 +0100
  • a8671ed52b Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge Parker Moore 2013-01-27 23:17:45 +0100
  • f3856a444a Added command to primary binary. Parker Moore 2013-01-16 21:19:15 -0500
  • 2bc04e4a60 Added the site_template files to the gemspec manifest. Parker Moore 2013-01-16 21:19:02 -0500
  • 272dd5ef35 Added the NewCommand class Parker Moore 2013-01-16 21:17:43 -0500
  • ce7e307cba Scaffold site, based on @mojombo's site (with permission). Parker Moore 2013-01-16 21:17:21 -0500
  • b4bea4a586 Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup Module Cleanup Parker Moore 2013-01-27 23:13:16 +0100
  • 35165d19f8 Update history to reflect merge of #775. Parker Moore 2013-01-27 23:08:44 +0100
  • b736676904 Merge pull request #775 from metamatt/issue773 Parker Moore 2013-01-27 14:06:41 -0800
  • 1d85664340 Update history to reflect merge of #767. Parker Moore 2013-01-26 22:35:13 +0100
  • 409eedafd8 Merge pull request #767 from mojombo/string-categories Parker Moore 2013-01-26 13:32:26 -0800
  • c95c5e3b7d Use Dir.pwd instead of "." as the source argument to Post.new, since this has historically supplied an absolute path in this call. Matt Ginzton 2013-01-25 15:57:45 -0800
  • cd2f3b8dce Updated history to reflect merge of #777. Parker Moore 2013-01-25 17:23:40 +0100
  • 4041579b70 Merge pull request #777 from mastahyeti/safe_yaml Parker Moore 2013-01-25 08:22:10 -0800
  • 2b8c85cd9d Reflect merge of #407 Parker Moore 2013-01-25 06:22:35 +0100
  • 4f7881ba40 Add SVG support to Jekyll/Webrick. Fixes #406. Jordon Bedwell 2013-01-25 06:19:48 +0100
  • 2c76311ada Updated history to reflect merge of #776. Parker Moore 2013-01-25 06:06:33 +0100
  • 130406a101 Merge pull request #776 from tombell/script-bootstrap Parker Moore 2013-01-24 21:04:46 -0800
  • d758d424b4 deleted junk Ben Toews 2013-01-23 17:19:32 -0600
  • d82179048e adding files Ben Toews 2013-01-23 11:31:59 -0600
  • 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml Ben Toews 2013-01-23 11:30:24 -0600
  • c85d834036 lets try this differently Ben Toews 2013-01-23 11:07:44 -0600
  • 507f1c3995 Add a bootstrap script Tom Bell 2013-01-22 23:10:51 +0000
  • 799c997b45 adding gem Ben Toews 2013-01-22 15:21:10 -0600
  • 073bac6047 using sane_yaml to prevent code execution Ben Toews 2013-01-22 15:18:46 -0600
  • fbc9d0c663 Fix truncation of overly long post names. Matt Ginzton 2013-01-22 10:07:19 -0800
  • 863643c7e8 Look for _posts directory relative to cwd, not relative to tumblr.rb. Matt Ginzton 2013-01-22 09:27:17 -0800
  • adce57e9e1 Updated history to reflect merge of #771. Parker Moore 2013-01-21 22:20:00 -0500
  • 8d05e1ea5a Merge pull request #771 from mojombo/fix-coverage Parker Moore 2013-01-21 19:01:52 -0800
  • 607b4c84fd Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true' Parker Moore 2013-01-20 22:16:23 -0500
  • 914f1e834d Added simplecov-gem-adapter dev dependency. Parker Moore 2013-01-20 22:15:44 -0500
  • c48de6b320 add drafts.feature scribu 2013-01-20 04:38:23 +0200
  • 2df63e5b9d fix tests scribu 2013-01-20 03:14:11 +0200
  • 0ad623fb85 first pass at --drafts flag scribu 2013-01-20 02:20:00 +0200
  • 517e6f81d3 Remove new lines between module and class Tom Bell 2013-01-20 00:00:49 +0000
  • 2c45150545 Update tag classes moving into a module Tom Bell 2013-01-19 23:50:44 +0000
  • 10d980b6e1 Update pagination classes moving into a module Tom Bell 2013-01-19 23:42:40 +0000
  • 663a1321d2 Update converter classes moving into a module Tom Bell 2013-01-19 23:07:38 +0000