Commit Graph

8210 Commits

Author SHA1 Message Date
jekyllbot 55257d2a14 Update history to reflect merge of #5256 [ci skip] 2016-10-05 11:34:07 -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 7ea610f8c0 Update history to reflect merge of #5431 [ci skip] 2016-10-05 09:59:02 -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
Parker Moore a138b02b10
Update links in 3.3 release post 2016-10-04 11:35:42 -07:00
Parker Moore 761ddcae24
Add Jekyll 3.3 release post 2016-10-03 17:44:47 -07:00
jekyllbot 274d350d61 Update history to reflect merge of #5441 [ci skip] 2016-10-03 15:13:02 -07:00
jekyllbot 80ae013541 Merge pull request #5441 from mhw/patch-1
Merge pull request 5441
2016-10-03 15:13:01 -07: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 aa901cdaba Update history to reflect merge of #5264 [ci skip] 2016-09-29 14:13:32 -07: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 d716d9b7be Update history to reflect merge of #5411 [ci skip] 2016-09-29 14:02:09 -07:00
jekyllbot 5a31aacfbe Merge pull request #5411 from zdroid/patch-1
Merge pull request 5411
2016-09-29 14:02:08 -07:00
jekyllbot 7118999958 Update history to reflect merge of #5410 [ci skip] 2016-09-29 13:27:12 -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 459bc17019 Update history to reflect merge of #5427 [ci skip] 2016-09-29 13:26:24 -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
jekyllbot b38ac5d938 Update history to reflect merge of #5430 [ci skip] 2016-09-29 13:26:03 -07:00
jekyllbot feddd7daec Merge pull request #5430 from Strangehill/patch-1
Merge pull request 5430
2016-09-29 13:26:02 -07:00
jekyllbot 1c7aa4729e Update history to reflect merge of #5412 [ci skip] 2016-09-29 13:25:30 -07:00
jekyllbot 54927d6522 Merge pull request #5412 from zdroid/editorconfig
Merge pull request 5412
2016-09-29 13:25:29 -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
jekyllbot 69172bcc4a Update history to reflect merge of #5428 [ci skip] 2016-09-29 10:04:47 -07:00
jekyllbot 3d3f310a5e Merge pull request #5428 from ashmaroli/bundle2new
Merge pull request 5428
2016-09-29 10:04:47 -07:00
Jordon Bedwell 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
Ashwin Maroli 5b4269eca5 document automatic bundle install 2016-09-29 08:47:26 +05:30
Parker Moore 8e91263031
StaticFile#copy_entry: don't mark modified time if path is a symlink 2016-09-28 16:55:57 -07:00
Parker Moore fd5f2eb399
Add failing test for File.utime of a symlink in staticfile. 2016-09-28 16:54:58 -07:00
jekyllbot 682c0fc98f Update history to reflect merge of #5157 [ci skip] 2016-09-28 16:39:45 -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 b6d4ba56b7 Update history to reflect merge of #5210 [ci skip] 2016-09-28 16:38:00 -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 79b0f27bf6 Update history to reflect merge of #5408 [ci skip] 2016-09-28 16:31:09 -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 d57b04782d
Fix reference to #5413 2016-09-28 16:28:12 -07:00
jekyllbot 2f5b7dc1dc Update history to reflect merge of #5413 [ci skip] 2016-09-28 16:25:27 -07:00
jekyllbot 8138e67ffb Merge pull request #5413 from tf2manu994/patch-1
Merge pull request 5413
2016-09-28 16:25:26 -07:00
jekyllbot 719c0938a5 Update history to reflect merge of #5416 [ci skip] 2016-09-28 16:09:07 -07:00
jekyllbot 93c7cdf0d0 Merge pull request #5416 from ashmaroli/win-tz
Merge pull request 5416
2016-09-28 16:09:07 -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
jekyllbot a920cf040b Update history to reflect merge of #5421 [ci skip] 2016-09-27 11:06:44 -07:00
jekyllbot 6c5a371b92 Merge pull request #5421 from crispgm/fix-logo
Merge pull request 5421
2016-09-27 11:06:43 -07:00
jekyllbot 157c8e888e Update history to reflect merge of #5420 [ci skip] 2016-09-27 11:06:17 -07:00
jekyllbot a69919ecbe Merge pull request #5420 from DirtyF/site_template
Merge pull request 5420
2016-09-27 11:06:17 -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