Commit Graph

650 Commits

Author SHA1 Message Date
Tom Preston-Werner 851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner cae0eaf19c Merge remote-tracking branch 'mjschultz/master'
Conflicts:
	lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
Tom Preston-Werner 70b1112cca Update history. 2011-05-30 11:45:30 -07:00
Tom Preston-Werner da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00
Tom Preston-Werner 13f1cf5832 Merge pull request #328 from shoaibkamil/master
Bugfix in tumblr importer
2011-05-30 11:22:23 -07:00
Tom Preston-Werner 5568e5698c Merge remote-tracking branch 'vazexqi/patch-1' 2011-05-30 11:20:29 -07:00
Tom Preston-Werner 14f371c792 Update gemspec so bundler installs work. 2011-05-30 11:18:15 -07:00
Tom Preston-Werner 56ddf6a3c8 Merge branch 'next' 2011-05-29 22:46:10 -07:00
Tom Preston-Werner 897d3e4e30 Update history. 2011-05-29 22:44:04 -07:00
Tom Preston-Werner e7135a669f Require cucumber 0.10.3 to fix tests with Ruby 1.9.2. 2011-05-29 22:43:36 -07:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Aman Gupta 22585d4b7f avoid infinite recursion while rendering layouts 2011-05-23 17:23:21 -04:00
Nicholas Chen 5788ca88f8 Changed [:state] check RE and required YAML
1) The published state is actually stored as "published" in the database but the regular expression checks for "Published" and thus will actually skip all published posts.

2) The to_yaml method is not immediately available without the "require 'yaml'" directive. This caused the migration script to fail while executing it following the instructions. 

Tested with Typo 5.3
2011-05-14 10:09:59 -07:00
shoaibkamil 1f4dd4ed61 Fixed bug in "conversation" importing where <section> and <dialog> tags were not being closed. 2011-05-11 22:06:53 -07:00
Tom Preston-Werner f808c98232 Clean up Enki importer and update History. 2011-05-09 00:59:40 -07:00
Tom Preston-Werner 0dc55aacff Merge remote-tracking branch 'rodrigopinto/master' 2011-05-09 00:55:55 -07:00
Tom Preston-Werner b86bc97c5f Clean up Tumblr importer and update History. 2011-05-09 00:54:26 -07:00
Tom Preston-Werner 9cc9c233d0 Merge remote-tracking branch 'tonycosentini/master' 2011-05-09 00:41:07 -07:00
Tom Preston-Werner 2de18d31ab Merge remote-tracking branch 'guilleiguaran/patch-1' into devel 2011-05-09 00:35:06 -07:00
Guillermo Iguaran 02b1d996d2 default_executable= have been deprecated 2011-05-09 00:11:52 -07:00
Tom Preston-Werner 0ce425443f Better Pager.calculate_pages implementation. 2011-05-08 23:44:20 -07:00
Tom Preston-Werner 82bd83fe7f More TomDoc and formatting cleanup. 2011-05-08 23:40:35 -07:00
Tom Preston-Werner aa0d82fa96 Clean up migrators formatting. 2011-05-08 15:08:53 -07:00
Tom Preston-Werner a428acec1c TomDoc some things. 2011-05-08 14:49:19 -07:00
Tony Cosentini e12cbdbea2 Added Tumblr migrator. 2011-05-02 14:31:01 -04:00
Rodrigo Pinto 55f42d26be adding enki migrator 2011-04-28 21:28:13 -03:00
Tom Preston-Werner 155cbd1463 All tests/features run in 1.8 and 1.9. 2011-04-24 19:16:13 +08:00
Tom Preston-Werner 6a31e650f3 Tests and specs run under 1.9. 2011-04-24 18:39:27 +08:00
Tom Preston-Werner 093a5efbe1 Merge remote-tracking branch 'jbw/ruby-v1.9' into devel 2011-04-23 18:08:34 +08:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Derek Prior d2377b2581 Fixed mistake in default markdown extensions 2011-04-12 17:30:56 -04:00
Derek Prior 5801220a98 Added the ability to configure the file extensions to be processed by each converter. Test cases included. 2011-04-12 17:03:28 -04:00
Tom Preston-Werner 0f71bdb540 Ignore .bundle dir. 2011-03-13 16:57:35 -07:00
Tom Preston-Werner dce4ccc5a4 Better error message for invalid post date. 2011-03-11 17:52:25 -08:00
Tom Preston-Werner 6c94db1486 TomDoc convertible.rb. 2011-03-11 16:00:32 -08:00
Tom Preston-Werner 68eaadd13a Merge remote-tracking branch 'MattHall/cli' into test 2011-03-10 23:01:18 -08:00
Tom Preston-Werner 01a90904e2 Merge remote-tracking branch 'phatblat/master' into test 2011-03-10 22:51:58 -08:00
Tom Preston-Werner d2814cf750 Merge remote-tracking branch 'elia/master' into devel 2011-03-10 22:38:17 -08:00
Tom Preston-Werner f58a821e20 Merge remote-tracking branch 'MattHall/posterous' into devel 2011-03-10 21:20:38 -08:00
Tom Preston-Werner 38844cd3bc Merge remote-tracking branch 'ab9/master' into devel 2011-03-10 21:17:51 -08:00
Tom Preston-Werner a31780a1ec Move require to jekyll.rb and update history. 2011-03-10 21:15:29 -08:00
Tom Preston-Werner 5f4dfe388f Merge remote-tracking branch 'zenspider/master' into devel 2011-03-10 21:10:18 -08:00
Tom Preston-Werner f82c51df7a Update history. 2011-03-10 21:10:12 -08:00
Aman Gupta 13cc44fb12 sanitize urls and ignore symlinks 2011-03-10 20:14:38 -08:00
Aman Gupta be8b7715d3 speed up cleanup 2011-03-10 20:11:45 -08:00
Aman Gupta edef0251d3 make kramdown a runtime dep so people can use it instead of maruku 2011-03-07 22:08:08 -08:00
Aman Gupta 9da714dbe1 rdiscount is a dev dependency 2011-03-07 19:13:57 -08:00
Aman Gupta 8cc7f06b36 work around cucumber issue (closes #296) 2011-03-07 18:50:02 -08:00
Aman Gupta 4b5a4e8713 open4 is not required 2011-03-06 16:32:10 -08:00
Aman Gupta 08725eb234 use the new albino gem 2011-03-06 01:57:08 -08:00