github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 17:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,359 Commits 60 Branches 160 Tags
fdffc8aaaa2e6e26a6b75919b8020a071bf10481
Commit Graph

6359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Parker Moore
fdffc8aaaa Merge pull request #4299 from pathawks/jekyll-commonmark 
Merge pull request 4299
 2015-12-30 09:24:43 -08:00
Pat Hawks
bf4bfcf4f0 Add link to jekyll-commonmark 2015-12-29 18:02:59 -08:00
Jordon Bedwell
e048e428d1 Update History.markdown 2015-12-27 12:56:42 -06:00
Jordon Bedwell
43618c90c7 Merge pull request #4292 from jekyll/pull/fix-liquid-drop-requires 
Move require "jekyll/drops/drop" to "jekyll.rb"

Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first.
 2015-12-27 12:55:51 -06:00
Jordon Bedwell
f2f88dbd9f Move require "jekyll/drops/drop" to "jekyll.rb" 
Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first.
 2015-12-27 12:48:21 -06:00
Parker Moore
5034216637 Release 💎 3.1.0.pre.beta1 v3.1.0.pre.beta1 2015-12-27 08:32:08 -05:00
Parker Moore
cb342c375d Update history to reflect merge of #4289 
[ci skip]
 2015-12-27 08:27:37 -05:00
Parker Moore
7c4876d2eb Merge pull request #4289 from jekyll/fix-utils-deep-merge-drops 
Merge pull request 4289
 2015-12-27 08:27:25 -05:00
Parker Moore
e302873203 Update history to reflect merge of #3771 
[ci skip]
 2015-12-27 08:25:29 -05:00
Parker Moore
1b73751abf Merge branch 'fixup-custom-markdown' 
* fixup-custom-markdown:
  markdown: minor style fixes
  Add support for underscores.
  Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
 2015-12-27 08:24:16 -05:00
Parker Moore
8e887dcd8b markdown: minor style fixes 
ref: #3771
 2015-12-27 08:24:00 -05:00
Parker Moore
5bf596b239 utils/drops: update Drop to support Utils.deep_merge_hashes 
Fixes #4287
 2015-12-27 08:06:37 -05:00
Pat Hawks
69a6323599 Utils.deep_merge_hashes failing test 2015-12-27 07:48:45 -05:00
Parker Moore
59a5fc64f9 Update history to reflect merge of #4281 
[ci skip]
 2015-12-26 22:09:34 -05:00
Parker Moore
1bc3f63db7 Merge pull request #4281 from jekyll/drop-to_h 
Merge pull request 4281
 2015-12-26 22:09:14 -05:00
Parker Moore
fe690a8377 Merge pull request #4288 from pathawks/calling-setter 
Wrap Arguments in () when used in a setter
 2015-12-26 19:03:54 -05:00
Pat Hawks
a47ce7b655 Wrap Arguments in () when used in a setter 2015-12-26 12:48:20 -08:00
Parker Moore
d138558c1d drops: provide #to_h to allow for hash introspection 
Follow-up to #4277
 2015-12-26 14:25:29 -05:00
Parker Moore
cc5937815e Update history to reflect merge of #4285 
[ci skip]
 2015-12-26 13:53:08 -05:00
Parker Moore
f386752184 Merge pull request #4285 from jekyll/drop-refactor 
Merge pull request 4285
 2015-12-26 13:50:03 -05:00
Parker Moore
ceca1bcf14 site: set the timezone in the config for consistent generation times 2015-12-26 13:49:32 -05:00
Parker Moore
839fd45b9d Update history to reflect merge of #4286 
[ci skip]
 2015-12-26 13:47:31 -05:00
Parker Moore
72c951fd45 Merge pull request #4286 from wildlyinaccurate/patch-1 
Merge pull request 4286
 2015-12-26 13:46:31 -05:00
Parker Moore
3fa8af2a18 drops: create one base Drop class which can be set as mutable or not 2015-12-26 13:43:42 -05:00
Joseph Wynn
95b05cd0c5 Add jekyll-responsive_image to plugins list 
[jekyll-responsive_image](https://github.com/wildlyinaccurate/jekyll-responsive-image) has been gaining popularity recently. I thought it would be worth adding it to the documentation.
 2015-12-26 18:38:32 +00:00
Parker Moore
57613b31dd Slightly restructure rake helper files 
Ref #4282
 2015-12-26 12:53:30 -05:00
Parker Moore
75be388487 Update history to reflect merge of #4282 
[ci skip]
 2015-12-26 12:48:18 -05:00
Parker Moore
e3da5a3f9f Merge pull request #4282 from leethomas/refactor-rake-tasks 
Merge pull request 4282
 2015-12-26 12:47:30 -05:00
Parker Moore
1f298e0d9d url: move setter outside of if statement 
Addresses @envygeeks's comment:
d070a77716 (commitcomment-15164169)
 2015-12-26 12:32:21 -05:00
Parker Moore
b70ea3ca5c immutable_drop/errors: consolidate errors & fix syntax for raising 
Addresses @envygeeks's comments:
bff1726a5a
 2015-12-26 12:27:07 -05:00
Parker Moore
1afbe9967d document: return nil if bad arg in #<=> 
Addresses @envygeek's comment:

233589e150 (commitcomment-15164178)
 2015-12-26 12:23:21 -05:00
leethomas
b05b174b87 moved namespaced rake tasks to separate .rake files under lib/tasks 2015-12-25 22:50:23 -08:00
Parker Moore
c63b51b661 document: revert comparison of Documents to old style & add nil check 
@envygeeks, this should address your comment: fcce0d5482 (commitcomment-15162261)
 2015-12-25 22:54:12 -05:00
Parker Moore
debdb15171 Move 'forwardable' require to earlier in the program start up. 2015-12-25 22:45:51 -05:00
Parker Moore
b34e8e0bc0 Update history to reflect merge of #4277 
[ci skip]
 2015-12-25 21:32:46 -05:00
Parker Moore
ec25ddee17 Merge pull request #4277 from jekyll/document-drops 
Merge pull request 4277
 2015-12-25 21:32:01 -05:00
Parker Moore
3effae59d8 Update history to reflect merge of #4273 
[ci skip]
 2015-12-24 15:09:26 -05:00
Parker Moore
9ab232fd70 Merge pull request #4273 from midnightSuyama/add_plugin 
Merge pull request 4273
 2015-12-24 15:08:45 -05:00
Parker Moore
b2b634e767 drops: use def_delegator more liberally where acceptable 2015-12-24 15:07:48 -05:00
Parker Moore
fcce0d5482 document: fix issue with bad comparison 2015-12-24 15:07:31 -05:00
Parker Moore
d070a77716 url: fix issue with bad URL escaping when using Drop 2015-12-24 15:07:20 -05:00
Parker Moore
bff1726a5a immutable_drop: use custom error for bad set 2015-12-24 15:06:32 -05:00
Parker Moore
6a72d4a986 features/post_data: Fix undefined feature step. 2015-12-22 22:44:56 -05:00
Parker Moore
cd2688ab66 test_excerpt & _page: use Drop instead of Hash to mock payload 2015-12-22 22:37:48 -05:00
Parker Moore
9bb59e9999 features/post_data: do NOT allow page.path to be overridden 2015-12-22 21:36:29 -05:00
Parker Moore
30ceda52ef features/hooks: global payload _is_ global -- not new for each page 2015-12-22 21:36:15 -05:00
Parker Moore
659f0869e0 features/collections: drops don't output like a hash -- update accordingly 2015-12-22 21:35:28 -05:00
Parker Moore
233589e150 document: throw ArgumentError if compared to non-doc 2015-12-22 21:34:24 -05:00
Parker Moore
532bb9e9cb Further consolidation in the Drops. 2015-12-22 21:33:42 -05:00
Alfred Xing
bbbe6479e5 Update history to reflect merge of #4275 
[ci skip]
 2015-12-22 09:14:51 -08:00