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

8151 Commits

Author SHA1 Message Date
Zlatan Vasović 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
Pat Hawks aebf711c61
Failing tests: URL filters choke on i18n 2016-09-24 15:11:04 -05:00
Heng Kwokfu bacb300876 Skip Windows tests in non-Windows environment. 2016-09-24 21:55:02 +08:00
Ashwin Maroli 3966a37d71 swallow bundle output in CI 2016-09-24 13:48:22 +05:30
jekyllbot 93c5f71faf Update history to reflect merge of #5403 [ci skip] 2016-09-23 17:46:41 -07:00
jekyllbot 59fa8549f9 Merge pull request #5403 from chrisfinazzo/macOS 
Merge pull request 5403
 2016-09-23 17:46:41 -07:00
Heng Kwokfu db53213d16 Merge remote-tracking branch 'jekyll/master' into patch-1 2016-09-24 08:46:24 +08:00
jekyllbot 9564782054 Update history to reflect merge of #5402 [ci skip] 2016-09-23 14:30:39 -07:00
jekyllbot aaa062b047 Merge pull request #5402 from ashmaroli/jekyll-new-assets 
Merge pull request 5402
 2016-09-23 14:30:39 -07:00
Parker Moore 8e027fced9
Add documentation for relative_url and absolute_url 2016-09-23 14:27:40 -07:00
jekyllbot f277baa975 Update history to reflect merge of #5399 [ci skip] 2016-09-23 14:18:02 -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
Chris Finazzo 69937373bd macOS and one grammar fix 2016-09-23 14:47:23 -04: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 6571ea0c1a Update history to reflect merge of #5338 [ci skip] 2016-09-22 20:50:48 -07:00
jekyllbot 992be253a6 Merge pull request #5338 from ashmaroli/config-patch 
Merge pull request 5338
 2016-09-22 20:50:47 -07:00
jekyllbot 081d7c016a Update history to reflect merge of #5397 [ci skip] 2016-09-22 16:56:05 -07:00
jekyllbot 2a02c798ac Merge pull request #5397 from jekyll/add-jekyll-menus 
Merge pull request 5397
 2016-09-22 16:56:04 -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
Jordon Bedwell ae27db62eb
Add jekyll-menus to the list of plugins. 2016-09-22 09:51:37 -05:00
jekyllbot 87c745573f Update history to reflect merge of #5389 [ci skip] 2016-09-21 13:29:38 -07:00
jekyllbot 25d4291d62 Merge pull request #5389 from ashmaroli/cucumber-with-access 
Merge pull request 5389
 2016-09-21 13:29:38 -07:00
Ashwin Maroli 588b3a6649 remove features dirs on windows with proper access 2016-09-21 22:42:01 +05:30
Ashwin Maroli 99fc60e28c update template to include theme files 2016-09-21 06:29:34 +05:30
jekyllbot 846ab94f43 Update history to reflect merge of #5375 [ci skip] 2016-09-20 17:05:49 -07:00
jekyllbot 3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight 
Merge pull request 5375
 2016-09-20 17:05:49 -07:00
jekyllbot f3859384c0 Update history to reflect merge of #5376 [ci skip] 2016-09-20 17:04:58 -07:00
jekyllbot ee84a95a38 Merge pull request #5376 from jonblatho/master 
Merge pull request 5376
 2016-09-20 17:04:57 -07:00
Parker Moore 9ae0a7023b
Move reference to #5380. 2016-09-20 17:04:26 -07:00
jekyllbot 1ac87eaae2 Update history to reflect merge of #5380 [ci skip] 2016-09-20 16:39:33 -07:00
jekyllbot cfe61771e0 Merge pull request #5380 from ethomson/coderay_deprecation 
Merge pull request 5380
 2016-09-20 16:39:33 -07:00
jekyllbot 262be85c49 Update history to reflect merge of #5237 [ci skip] 2016-09-20 15:32:26 -07:00
jekyllbot 504411e476 Merge pull request #5237 from ashmaroli/bundle2new 
Merge pull request 5237
 2016-09-20 15:32:25 -07:00
Parker Moore 650a3c7932
Update history to reflect merge of #5369 2016-09-20 13:48:40 -07:00
jekyllbot ad0f329d1c Merge pull request #5369 from MertcanGokgoz/patch-1 
Merge pull request 5369
 2016-09-20 13:44:51 -07:00
jekyllbot 152fa877f6 Update history to reflect merge of #5364 [ci skip] 2016-09-20 13:40:11 -07:00
jekyllbot 3a45bf7d26 Merge pull request #5364 from jekyll/themes-asset-folder 
Merge pull request 5364
 2016-09-20 13:40:11 -07:00
Parker Moore 279f1516d2
Merge branch 'master' into themes-asset-folder 
* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.
 2016-09-20 13:13:01 -07:00
Parker Moore 29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files. 2016-09-20 13:12:34 -07:00
jekyllbot 950a37395f Update history to reflect merge of #5381 [ci skip] 2016-09-20 13:10:49 -07:00
jekyllbot d8d42f6abc Merge pull request #5381 from pathawks/pr/rubocop 
Merge pull request 5381
 2016-09-20 13:10:48 -07:00
jekyllbot 92dbe313e9 Update history to reflect merge of #5383 [ci skip] 2016-09-20 09:26:40 -07:00
jekyllbot 2eedf7d79c Merge pull request #5383 from ashmaroli/ruby-cucumber 
Merge pull request 5383
 2016-09-20 09:26:39 -07:00
Ashwin Maroli 75d59911ae run features on windows 2016-09-20 10:28:54 +05:30
Parker Moore b78827cecb
Add documentation for assets. 2016-09-19 13:57:36 -07:00
Parker Moore 7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people. 2016-09-19 13:47:51 -07:00
Pat Hawks 3bfdc00d14
Appease Rubocop 2016-09-19 13:15:02 -05:00
Jonathan Thornton f2bfc832a0 Marking filename with backticks as suggested 2016-09-19 12:08:20 -05:00