github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-12 16:38:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,181 Commits 60 Branches 160 Tags
pull/markdownify-inline
Commit Graph

2618 Commits

Author SHA1 Message Date
Pat Hawks
b0c591a3f2 Add Inline Markdown converter 2016-10-27 20:30:32 -05:00
David Stosik
3cc4bef2e6 Fix Rubocop errors 2016-10-24 00:39:09 +09:00
David Stosik
4785f6f71f Provide an "inline" mode to markdownify filter 2016-10-24 00:01:09 +09:00
jekyllbot
eca7f46749 Merge pull request #5495 from jekyll/pr/layouts-error 
Merge pull request 5495
 2016-10-19 21:24:11 -07:00
Pat Hawks
51d9be83a1 Do not swallow all exceptions on render 2016-10-18 19:45:03 -05:00
Pat Hawks
c4a23b4ced Collapse gsub 2016-10-18 18:53:54 -05:00
Michael Large
6cec4aebc6 Additional typo related to pull request #5472 2016-10-11 09:05:39 -04:00
Michael Large
f2fcd17627 Fix typo in theme_template README 2016-10-10 11:10:41 -04:00
Parker Moore
5e93ca6353 Release 💎 3.3.0 2016-10-06 11:12:15 -07:00
jekyllbot
21cd382409 Merge pull request #5456 from jekyll/revert-server-address-sig-change 
Merge pull request 5456
 2016-10-06 10:36:49 -07:00
jekyllbot
6f05ebb520 Merge pull request #5433 from ayastreb/5429-data-dir-with-period-in-name 
Merge pull request 5433
 2016-10-06 10:22:23 -07:00
Parker Moore
ed042de6c4 Oh fine, rubocop. 2016-10-06 10:15:45 -07:00
Parker Moore
63e4e750ec New site: lock minima to v2.x 2016-10-06 09:58:16 -07:00
Parker Moore
6d1bc6c6ea Revert Commands::Serve#server_address signature change. 2016-10-06 09:48:37 -07:00
Parker Moore
6f2d1591fc Release 💎 3.3.0.pre.rc1 2016-10-05 11:47:43 -07:00
jekyllbot
3de78877c0 Merge pull request #4873 from mlocher/bug-post-url 
Merge pull request 4873
 2016-10-05 11:40:04 -07:00
jekyllbot
22a7714bba Merge pull request #5212 from eloyesp/fix-excerpt-link-finder 
Merge pull request 5212
 2016-10-05 11:34:52 -07:00
jekyllbot
275f5a6209 Merge pull request #5256 from kwokfu/patch-1 
Merge pull request 5256
 2016-10-05 11:34:06 -07:00
jekyllbot
d879840cc5 Merge pull request #5431 from Crunch09/update_url_in_dev_environment 
Merge pull request 5431
 2016-10-05 09:59:01 -07:00
Florian Thomas
a945a65818 refactor to use server_address 2016-10-04 20:47:36 +02:00
Anatoliy Yastreb
e27a65d9e3 Sanitize directory name as a key 2016-10-04 19:39:41 +01:00
Florian Thomas
01c33907a3 default site.url in dev environment to http://localhost:4000 
take `host`, `port` and `ssl` options into account
 2016-10-04 20:38:46 +02:00
Mark H. Wilkinson
a0a351aa7a Remove autoload of Draft which no longer exists. 2016-10-03 22:21:35 +01:00
Anatoliy Yastreb
cff8f2994c Fix loading data from subdir with a period in name #5429 2016-10-01 13:09:50 +01:00
jekyllbot
ef3f9d0e7a Merge pull request #5264 from DirtyF/static-file-name 
Merge pull request 5264
 2016-09-29 14:13:31 -07:00
jekyllbot
553fae8f17 Merge pull request #5410 from jekyll/pr/i18n-url-filters 
Merge pull request 5410
 2016-09-29 13:27:11 -07:00
jekyllbot
f0574e047e Merge pull request #5427 from jekyll/don-t-utime-if-symlink 
Merge pull request 5427
 2016-09-29 13:26:24 -07:00
Antonio
91ef3a7cc9 prepend 'jekyll serve' with 'bundle exec' 
Best not to send mixed messages and jekyllrb's quickstart message is "bundle exec jekyll serve"
 2016-09-30 02:17:08 +08:00
Parker Moore
8e91263031 StaticFile#copy_entry: don't mark modified time if path is a symlink 2016-09-28 16:55:57 -07:00
jekyllbot
6847b604c8 Merge pull request #5157 from stevecheckoway/fix-hooks-priority-order 
Merge pull request 5157
 2016-09-28 16:39:44 -07:00
jekyllbot
9c197d9555 Merge pull request #5210 from jekyll/node-must-die 
Merge pull request 5210
 2016-09-28 16:38:00 -07:00
jekyllbot
0f70bb1320 Merge pull request #5408 from ashmaroli/bundle2new 
Merge pull request 5408
 2016-09-28 16:31:08 -07:00
Parker Moore
06651c960a Merge pull request #5325 from ashmaroli/gemspec-template-patch 
update gemspec template to include only required theme files
 2016-09-27 11:30:58 -07:00
Frank Taillandier
6dbb5e2df1 add contextual help for overriding theme's default 2016-09-27 11:27:29 +02:00
Frank Taillandier
c4ccfae3af rename index.html to index.md 
fix https://github.com/jekyll/minima/issues/13
 2016-09-27 11:12:29 +02:00
Frank Taillandier
8321b14b29 Move contents of the index.html page to the 'home' layout 2016-09-27 08:24:58 +02:00
Pat Hawks
2b30c06140 Use Addressable to better deal with i18n URLs 2016-09-24 15:34:00 -05:00
Ashwin Maroli
3966a37d71 swallow bundle output in CI 2016-09-24 13:48:22 +05:30
Heng Kwokfu
db53213d16 Merge remote-tracking branch 'jekyll/master' into patch-1 2016-09-24 08:46:24 +08:00
jekyllbot
aaa062b047 Merge pull request #5402 from ashmaroli/jekyll-new-assets 
Merge pull request 5402
 2016-09-23 14:30:39 -07:00
jekyllbot
8197e17495 Merge pull request #5399 from jekyll/relative_url_and_absolute_url 
Merge pull request 5399
 2016-09-23 14:18:01 -07:00
Ashwin Maroli
0dc15dba88 remove css/ from new site scaffolding 
css directory and its contents to be handled by theme's `assets/`
directory.
The directory removed here wil be added to minima gem.
 2016-09-23 18:00:13 +05:30
Parker Moore
fa96843555 URLFilters: Simplify ensure_leading_slash calls. 2016-09-22 20:58:26 -07:00
jekyllbot
992be253a6 Merge pull request #5338 from ashmaroli/config-patch 
Merge pull request 5338
 2016-09-22 20:50:47 -07:00
Parker Moore
eab6752f52 Consolidate ensure_leading_slash to 2 lines. 2016-09-22 14:40:20 -07:00
Parker Moore
aa86651650 Add absolute_url and relative_url filters. 2016-09-22 14:16:00 -07:00
Ashwin Maroli
99fc60e28c update template to include theme files 2016-09-21 06:29:34 +05:30
jekyllbot
3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight 
Merge pull request 5375
 2016-09-20 17:05:49 -07:00
jekyllbot
ee84a95a38 Merge pull request #5376 from jonblatho/master 
Merge pull request 5376
 2016-09-20 17:04:57 -07:00
jekyllbot
cfe61771e0 Merge pull request #5380 from ethomson/coderay_deprecation 
Merge pull request 5380
 2016-09-20 16:39:33 -07:00