f0574e047e
Merge pull request #5427 from jekyll/don-t-utime-if-symlink
...
Merge pull request 5427
2016-09-29 13:26:24 -07:00
b38ac5d938
Update history to reflect merge of #5430 [ci skip]
2016-09-29 13:26:03 -07:00
feddd7daec
Merge pull request #5430 from Strangehill/patch-1
...
Merge pull request 5430
2016-09-29 13:26:02 -07:00
1c7aa4729e
Update history to reflect merge of #5412 [ci skip]
2016-09-29 13:25:30 -07:00
54927d6522
Merge pull request #5412 from zdroid/editorconfig
...
Merge pull request 5412
2016-09-29 13:25:29 -07:00
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
69172bcc4a
Update history to reflect merge of #5428 [ci skip]
2016-09-29 10:04:47 -07:00
3d3f310a5e
Merge pull request #5428 from ashmaroli/bundle2new
...
Merge pull request 5428
2016-09-29 10:04:47 -07:00
51695b2165
Travis is entirely broken.
...
I'm tired of getting emails from forks I don't even control or have commit to, it's not cool... at all.
2016-09-29 11:17:17 -05:00
5b4269eca5
document automatic bundle install
2016-09-29 08:47:26 +05:30
1fb4dce2f5
add a step to check contents in assets directory
2016-09-29 06:47:29 +05:30
1b4b51236a
add theme-gem feature for bonafide theme gems
...
this cucumber feature follows the likely steps a theme designer would take
to build a Rubygem of his theme starting from the scaffolding generated by
`jekyll new-theme` command and further checks if the gem built actually
has the files he planned to include.
2016-09-29 06:36:24 +05:30
8e91263031
StaticFile#copy_entry: don't mark modified time if path is a symlink
2016-09-28 16:55:57 -07:00
fd5f2eb399
Add failing test for File.utime of a symlink in staticfile.
2016-09-28 16:54:58 -07:00
682c0fc98f
Update history to reflect merge of #5157 [ci skip]
2016-09-28 16:39:45 -07:00
6847b604c8
Merge pull request #5157 from stevecheckoway/fix-hooks-priority-order
...
Merge pull request 5157
2016-09-28 16:39:44 -07:00
b6d4ba56b7
Update history to reflect merge of #5210 [ci skip]
2016-09-28 16:38:00 -07:00
9c197d9555
Merge pull request #5210 from jekyll/node-must-die
...
Merge pull request 5210
2016-09-28 16:38:00 -07:00
79b0f27bf6
Update history to reflect merge of #5408 [ci skip]
2016-09-28 16:31:09 -07:00
0f70bb1320
Merge pull request #5408 from ashmaroli/bundle2new
...
Merge pull request 5408
2016-09-28 16:31:08 -07:00
d57b04782d
Fix reference to #5413
2016-09-28 16:28:12 -07:00
2f5b7dc1dc
Update history to reflect merge of #5413 [ci skip]
2016-09-28 16:25:27 -07:00
8138e67ffb
Merge pull request #5413 from tf2manu994/patch-1
...
Merge pull request 5413
2016-09-28 16:25:26 -07:00
719c0938a5
Update history to reflect merge of #5416 [ci skip]
2016-09-28 16:09:07 -07:00
93c7cdf0d0
Merge pull request #5416 from ashmaroli/win-tz
...
Merge pull request 5416
2016-09-28 16:09:07 -07:00
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
a920cf040b
Update history to reflect merge of #5421 [ci skip]
2016-09-27 11:06:44 -07:00
6c5a371b92
Merge pull request #5421 from crispgm/fix-logo
...
Merge pull request 5421
2016-09-27 11:06:43 -07:00
157c8e888e
Update history to reflect merge of #5420 [ci skip]
2016-09-27 11:06:17 -07:00
a69919ecbe
Merge pull request #5420 from DirtyF/site_template
...
Merge pull request 5420
2016-09-27 11:06:17 -07:00
6dbb5e2df1
add contextual help for overriding theme's default
2016-09-27 11:27:29 +02:00
c4ccfae3af
rename index.html to index.md
...
fix https://github.com/jekyll/minima/issues/13
2016-09-27 11:12:29 +02:00
481901b413
Bugfix on logo in JSON-LD
2016-09-27 15:38:25 +08:00
8321b14b29
Move contents of the index.html page to the 'home' layout
2016-09-27 08:24:58 +02:00
81b16b24fc
Change to 2.2.5 instead of 2.2.2
...
We don't need 2.2.2 exactly, switching to 2.2.5 shaves a solid 30 seconds off build time, as it is preinstalled on travis
2016-09-26 16:38:00 +10:00
6b6ce3cf18
use UTC format in timezone
2016-09-25 23:11:51 +05:30
6366f56c21
Fix Travis.ci documentation
2016-09-25 16:26:43 +10:00
5df8ef5717
Add .editorconfig
2016-09-24 23:21:33 +02:00
d79ca534e4
Update history to reflect merge of #5405 [ci skip]
2016-09-24 13:38:44 -07:00
5c55d95446
Merge pull request #5405 from jekyll/relative_url_and_absolute_url
...
Merge pull request 5405
2016-09-24 13:38:43 -07:00
2b30c06140
Use Addressable to better deal with i18n URLs
2016-09-24 15:34:00 -05:00
fc6f7802a2
Replace classic box-sizing reset with inheritance reset
...
Reference: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
2016-09-24 22:14:49 +02:00
aebf711c61
Failing tests: URL filters choke on i18n
2016-09-24 15:11:04 -05:00
bacb300876
Skip Windows tests in non-Windows environment.
2016-09-24 21:55:02 +08:00
3966a37d71
swallow bundle output in CI
2016-09-24 13:48:22 +05:30
93c5f71faf
Update history to reflect merge of #5403 [ci skip]
2016-09-23 17:46:41 -07:00
59fa8549f9
Merge pull request #5403 from chrisfinazzo/macOS
...
Merge pull request 5403
2016-09-23 17:46:41 -07:00
db53213d16
Merge remote-tracking branch 'jekyll/master' into patch-1
2016-09-24 08:46:24 +08:00
9564782054
Update history to reflect merge of #5402 [ci skip]
2016-09-23 14:30:39 -07:00
aaa062b047
Merge pull request #5402 from ashmaroli/jekyll-new-assets
...
Merge pull request 5402
2016-09-23 14:30:39 -07:00
jekyllbot
jekyllbot
Antonio
Jordon Bedwell
Ashwin Maroli
Parker Moore
Frank Taillandier
David Zhang
Manmeet Gill
Zlatan Vasović
Pat Hawks
Heng Kwokfu