Commit Graph

1029 Commits

Author SHA1 Message Date
Daniel Grieve 22d1fdab54 tie down the regex match on gist filenames 2013-03-17 11:29:42 +00:00
Daniel Grieve 6c5d001986 replace \s with space 2013-03-16 19:20:54 +00:00
Daniel Grieve 92d9c4301b display single files from gist 2013-03-15 22:37:14 +00:00
Parker Moore f8a90d711f Using https protocol instead of http. 2013-02-24 01:54:13 +01:00
Parker Moore cdd3c0ef0c Remove 'type' attribute from script tag in gist liquid tag. 2013-02-24 01:30:41 +01:00
Parker Moore 7e7cee6e56 Strip space from the gist number, add test for gist tag 2013-02-24 00:58:13 +01:00
sterebooster 425f466842 'gist' liquid tag by @stereobooster. Fixes #463. 2013-02-24 00:38:19 +01:00
Parker Moore cc0f84197a Updated history to reflect merge of #820. 2013-02-22 14:20:05 +01:00
Parker Moore f2299a2bf5 Merge pull request #820 from mojombo/fix-autoregen-loop
Fix issue with watching (auto-regeneration) continuously running
2013-02-22 05:19:11 -08:00
Parker Moore 7457cbae25 Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457. 2013-02-22 00:59:44 +01:00
Parker Moore a22527c7ff Update history to reflect merge of #795. Fixes #790. 2013-02-20 23:16:56 +01:00
Parker Moore 02da17b769 Merge pull request #795 from mojombo/new-log-format
New log format
2013-02-20 14:15:36 -08:00
Parker Moore db5d27639e Fixed merge conflicts: rebasing on master. 2013-02-20 23:14:58 +01:00
Parker Moore a19bb1815a Fixed merge conflicts in test/test_configuration.rb 2013-02-20 23:13:06 +01:00
Parker Moore 5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore 9eb79ff135 Improved output for auto-regeneration. 2013-02-20 23:09:54 +01:00
Parker Moore bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore 388e0c8077 Fixed typo in History file 2013-02-20 22:15:23 +01:00
Parker Moore 090bbbe4f6 Update history to reflect merge of #788. 2013-02-20 22:15:03 +01:00
Parker Moore c042a77496 Merge pull request #788 from mojombo/add-opts
Add 2 opts back into bin/jekyll
2013-02-20 13:13:42 -08:00
Parker Moore d0d947995a Update history to reflect merge of #815. 2013-02-20 22:01:12 +01:00
Parker Moore 3b156d21af Merge pull request #815 from bhardin/fixing_help
Changing help message to reflect what actually happens
2013-02-20 12:17:19 -08:00
Brett Hardin 03e2e8d063 Changing help message to reflect what actually happens when running build and serve 2013-02-20 09:37:19 -08:00
Parker Moore 151ec1a487 Update history to reflect merge of #807. 2013-02-19 12:02:10 +01:00
Parker Moore d361a70391 Merge pull request #807 from mojombo/safeyaml-warnings
Fix SafeYAML Warnings
2013-02-19 03:01:27 -08:00
Parker Moore ac8c7a0944 Relax Kramdown version to 0.14. Fixes #808. 2013-02-19 02:38:18 +01:00
Parker Moore 35c3ef05bf Update history to reflect merge of #801. 2013-02-10 21:38:02 +01:00
Parker Moore ac502d175a Merge pull request #801 from kevinSuttle/master
Bump .ruby-version to 1.9.3-p374
2013-02-10 12:36:38 -08:00
Parker Moore c7c0a9432c Updating tests for safe_yaml. 2013-02-10 19:09:36 +01:00
Parker Moore 11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00
Parker Moore 0c6d56365a Upgrading to safe_yaml v0.7 2013-02-10 19:07:05 +01:00
Parker Moore 382b1b5a11 Updated History to reflect merge of #806 2013-02-10 17:06:46 +01:00
Parker Moore 78c37180f2 Merge pull request #806 from scribu/patch-1
Explicitly mention defacto styleguide
2013-02-10 08:05:32 -08:00
Cristi Burcă 311bcbb7ed mention styleguide to new contributors 2013-02-10 17:19:22 +02:00
Parker Moore 372628c22a Merge pull request #799 from apodlaski/remove-migrators-from-gemspec
Remove migrator files from jekyll.gemspec
2013-02-07 14:36:05 -08:00
Kevin Suttle b4c5d707a5 Bump .ruby-version to 1.9.3-p374 2013-02-07 15:19:33 -05:00
Aleksander Podlaski fae771d1a0 Remove migrator files from jekyll.gemspec
Some files no longer exists but was not removed from jekyll.gemspec:
- lib/jekyll/commands/migrate.rb 
- lib/jekyll/migrators/*.rb
2013-02-07 07:21:55 +01:00
Parker Moore 8e48848b7a Removed migrate tasks from Rakefile. 2013-02-07 00:42:37 +01:00
Parker Moore a3d95957dd Updating tests for new config output. 2013-02-03 21:31:05 +01:00
Parker Moore f6d38def5a Reworking errors with configuration file. 2013-02-03 21:30:52 +01:00
Parker Moore 90fa3f2921 Improved output for auto-regeneration. 2013-02-03 20:36:34 +01:00
Parker Moore dd7c5870d9 Cleaner output when generating site. 2013-02-03 20:29:58 +01:00
Parker Moore e4042e56b7 Update history to reflect merge of #792. Closes #789. 2013-02-03 18:56:42 +01:00
Parker Moore f002ee4f9f Merge pull request #792 from mojombo/alias-serve-to-server
Aliased jekyll server to jekyll serve
2013-02-03 09:55:14 -08:00
Parker Moore 7a44965c88 Updated history to reflect merge of #793. Closes #787. 2013-02-03 01:54:52 +01:00
Parker Moore 9ea1becf13 Merge pull request #793 from mojombo/remove-migrators
Remove migrators - move to jekyll-import gem.
2013-02-02 16:34:07 -08:00
Parker Moore f5137850e4 Using abort instead of puts & exit when jekyll-import gem isn't available. 2013-02-03 01:24:38 +01:00
Parker Moore 9bb0bfc0b2 Eliminating migrator tests (in this repo). 2013-01-31 01:19:56 +01:00
Parker Moore e8384e6a97 Eliminating migrator dependencies. 2013-01-31 01:19:34 +01:00
Parker Moore 82f29bb627 The jekyll-import gem provides Jekyll::Commands::Import, not Jekyll::Commands::Migrate. 2013-01-31 00:18:54 +01:00