dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,568 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2568 Commits

Author SHA1 Message Date
Anatol Broder 891ea8f604 People can symlink it if they want in unsafe mode 2013-09-16 08:37:07 +02:00
Anatol Broder 081b974114 Resolve conflict 2013-09-16 08:19:56 +02:00
Anatol Broder 79f50b0568 Resolve conflict 2013-09-16 08:15:10 +02:00
Parker Moore 79c2d5c8f7 Update history to reflect merge of #1555 2013-09-15 20:19:38 -04:00
Parker Moore 1aacda28b0 Merge pull request #1555 from davidensinger/patch-1 
Add link to Jekyll Suggested Tweet liquid tag to list of Tags plugins.
 2013-09-15 17:19:03 -07:00
David Ensinger ed92d1c4c2 Add link to Jekyll Suggested Tweet liquid tag to list of Tags plugins. 2013-09-15 18:56:18 -04:00
Parker Moore 6d28d5f95f Update history to reflect merge of #1554 2013-09-15 17:26:15 -04:00
Parker Moore ede0d6bd24 Merge pull request #1554 from grobmeier/patch-1 
It's dbname, not database
 2013-09-15 14:21:46 -07:00
Parker Moore ab4fb89043 Fix params on JekyllImport::WordPress.process so it's using hash 2013-09-15 23:13:02 +02:00
Parker Moore 30bce38ef2 Fix JekyllImport::WordPress instructions on docs site to use hash as parameter. 
See comment by @grobmeier on 97cb3f1336
 2013-09-15 23:11:22 +02:00
Christian Grobmeier f15f29a34b It's dbname, not database 2013-09-15 13:06:00 +02:00
Anatol Broder d761338c2c Change links to Liquid documentation 2013-09-15 07:44:49 +02:00
Matt Rogers 94eed46436 Release 1.2.1 2013-09-14 22:21:15 -05:00
Matt Rogers a8c03ae3ec Merge pull request #1551 from mojombo/release-1-2-1 
Release v1.2.1
 2013-09-14 20:20:04 -07:00
Parker Moore 6f053fbc8c Update gemspec & version to v1.2.1 2013-09-14 20:59:06 -04:00
Parker Moore be9c0dcc7e Update docs/history.md for v1.2.1 2013-09-14 20:57:10 -04:00
Parker Moore f169e37c81 Add release post. 2013-09-14 20:56:42 -04:00
Parker Moore f922ae10e5 Update the History file 2013-09-14 20:49:23 -04:00
Parker Moore d445798330 Fix site:releases:new rake task. 2013-09-14 20:48:20 -04:00
Parker Moore a1e16b3d58 Update history to reflect merge of #1518 2013-09-14 20:45:24 -04:00
Parker Moore 3ddc33c4bf Merge pull request #1518 from mojombo/fix-serve-detatch 
Print better messages for detached server. Mute output on detach.
 2013-09-14 17:44:20 -07:00
Parker Moore 97cb3f1336 Update JekyllImport::WordPress instructions on docs site. 
Closes #1548.
 2013-09-14 20:16:26 -04:00
Parker Moore 5355fcf02d Update Contributing page in the docs to match the new CONTRIBUTING.markdown. #1537. 2013-09-14 20:09:26 -04:00
maul.esel b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
Matt Rogers 1473448dfd Update history to reflect merge of #1537 2013-09-14 08:00:35 -05:00
Matt Rogers 46da09694d Merge pull request #1537 from mojombo/better-pr 
Update CONTRIBUTING docs for better PRs
 2013-09-14 05:59:50 -07:00
maul.esel aa10f8c89e add status badge to README 2013-09-12 21:19:36 +02:00
maul.esel 66606a7e82 enable coveralls on Travis-CI 2013-09-12 21:19:36 +02:00
maul.esel a12227c07a setup coveralls for unit tests 2013-09-12 21:19:36 +02:00
maul.esel 5ee41cd3bb setup coveralls for cucumber 2013-09-12 21:19:36 +02:00
maul.esel 699627e708 add coveralls to gemfile 2013-09-12 21:19:30 +02:00
Parker Moore 4b8bb68e56 Cleanup newlines in Commands::Serve 2013-09-12 14:05:16 -04:00
Parker Moore c926596be7 Print better messages for detached server. Mute output on detach. 2013-09-12 14:02:52 -04:00
Parker Moore 214c851be5 Update history to reflect merge of #1536 2013-09-12 14:02:22 -04:00
Parker Moore 34a888e7b0 Merge pull request #1536 from mojombo/liquid-2.5.2 
Upgrade to Liquid >= 2.5.2, < 2.6
 2013-09-12 11:01:55 -07:00
Parker Moore c38220f45c Update history to reflect merge of #1531 2013-09-12 12:45:19 -04:00
Parker Moore 097779a19f Merge pull request #1531 from maul-esel/mute-tests 
mute LSI output in tests
 2013-09-12 09:42:40 -07:00
Parker Moore 0090227487 Update CONTRIBUTING docs for better PRs. 2013-09-12 10:48:42 -04:00
Parker Moore c219323384 Update history to reflect merge of #1516 2013-09-12 10:38:02 -04:00
Parker Moore 3fde4f796c Merge pull request #1516 from penibelst/fix-post-title 
Fix 1.2.0 release post title
 2013-09-12 07:37:04 -07:00
Parker Moore db397dacdd Upgrade to Liquid 2.5.2 2013-09-12 10:23:24 -04:00
maul.esel 87de8ddeb4 fix test muting to work for Ruby > 1.9 2013-09-12 13:26:32 +02:00
Parker Moore e65305990a Update history to reflect merge of #1525 2013-09-11 23:45:01 -04:00
Parker Moore 5c23ae158e Merge pull request #1525 from zerobase/issue1519 
Force rendering of Include tag. Fixes #1519.
 2013-09-11 20:43:37 -07:00
Parker Moore 3e936e8b75 Update site/docs/history.md as per #1512. 2013-09-11 19:15:47 -04:00
maul.esel 0afe79d1cb mute LSI output in tests 2013-09-11 18:00:28 +02:00
Parker Moore 70d9225d9c Update history to reflect merge of #1515 2013-09-10 11:57:14 -04:00
Parker Moore 9422fe63fc Merge pull request #1515 from drewish/redcarpet-2.3 
Update redcarpet to 2.3.0
 2013-09-10 08:55:40 -07:00
Ishibashi Hideto 421e58ad59 a patch for the issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 23:12:15 +09:00
Parker Moore 94e001e549 Update gemspec 2013-09-09 20:23:30 -04:00