Skip to content

Commit 8556e5f

Browse files
jmerlejmerle
committed
Merge branch 'master' into octave
2 parents ad9e7a6 + d5f4a76 commit 8556e5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1408
-10
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ In addition to the [guidelines for contributing code](#contributing-code-and-fea
5858

5959
## Updating existing documentations
6060

61-
Please don't submit a pull request updating the version number of a documentation, unless a change is required in the scraper and you've verified that it works.
61+
Please don't submit a pull request updating only the version number and/or the attribution of a documentation. Do submit a pull request if a bigger change is required in the scraper and you've verified that it works.
6262

63-
To ask that an existing documentation be updated, first check the last two [documentation versions reports](https://github.com/freeCodeCamp/devdocs/issues?utf8=%E2%9C%93&q=Documentation+versions+report+is%3Aissue+author%3Adevdocs-bot+sort%3Acreated-desc). Only create an issue if the documentation has been wrongly marked as up-to-date.
63+
To ask that an existing documentation be updated, first check the latest [documentation versions report](https://github.com/freeCodeCamp/devdocs/issues?utf8=%E2%9C%93&q=Documentation+versions+report+is%3Aissue+author%3Adevdocs-bot+sort%3Acreated-desc). Only create an issue if the documentation has been wrongly marked as up-to-date.
6464

6565
## Coding conventions
6666

‎assets/javascripts/lib/page.coffee‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,6 @@ track = ->
214214
@resetAnalytics = ->
215215
for cookie in document.cookie.split(/;\s?/)
216216
name = cookie.split('=')[0]
217-
if name[0] == '_'
217+
if name[0] == '_' && name[1] != '_'
218218
Cookies.expire(name)
219219
return

‎assets/javascripts/templates/pages/about_tmpl.coffee‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@ credits = [
186186
'2009-2018 Jeremy Ashkenas',
187187
'MIT',
188188
'https://raw.githubusercontent.com/jashkenas/coffeescript/master/LICENSE'
189+
], [
190+
'Composer',
191+
'Nils Adermann, Jordi Boggiano',
192+
'MIT',
193+
'https://raw.githubusercontent.com/composer/composer/master/LICENSE'
189194
], [
190195
'Cordova',
191196
'2012-2018 The Apache Software Foundation',
@@ -201,6 +206,11 @@ credits = [
201206
'2012-2017 Manas Technology Solutions',
202207
'Apache',
203208
'https://raw.githubusercontent.com/crystal-lang/crystal/master/LICENSE'
209+
], [
210+
'Cypress',
211+
'2017 Cypress.io',
212+
'MIT',
213+
'https://raw.githubusercontent.com/cypress-io/cypress-documentation/develop/LICENSE.md'
204214
], [
205215
'D',
206216
'1999-2018 The D Language Foundation',
@@ -556,6 +566,11 @@ credits = [
556566
'2005-2017 Sebastian Bergmann',
557567
'CC BY',
558568
'https://creativecommons.org/licenses/by/3.0/'
569+
], [
570+
'Pony',
571+
'2016-2018, The Pony Developers & 2014-2015, Causality Ltd.',
572+
'BSD',
573+
'https://raw.githubusercontent.com/ponylang/ponyc/master/LICENSE'
559574
], [
560575
'PostgreSQL',
561576
'1996-2018 The PostgreSQL Global Development Group<br>&copy; 1994 The Regents of the University of California',
@@ -631,11 +646,26 @@ credits = [
631646
'2010 The Rust Project Developers',
632647
'MIT',
633648
'https://raw.githubusercontent.com/rust-lang/rust/master/LICENSE-MIT'
649+
], [
650+
'RxJS',
651+
'2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors',
652+
'Apache',
653+
'https://raw.githubusercontent.com/ReactiveX/rxjs/master/LICENSE.txt'
654+
], [
655+
'Salt Stack',
656+
'2019 SaltStack',
657+
'Apache',
658+
'https://raw.githubusercontent.com/saltstack/salt/develop/LICENSE'
634659
], [
635660
'Sass',
636661
'2006-2016 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein',
637662
'MIT',
638663
'https://raw.githubusercontent.com/sass/sass/stable/MIT-LICENSE'
664+
], [
665+
'Scala',
666+
'2002-2019 EPFL, with contributions from Lightbend',
667+
'Apache',
668+
'https://raw.githubusercontent.com/scala/scala-lang/master/license.md'
639669
], [
640670
'scikit-image',
641671
'2011 the scikit-image team',
@@ -706,11 +736,21 @@ credits = [
706736
'2010-2018 Mitchell Hashimoto',
707737
'MPL',
708738
'https://raw.githubusercontent.com/mitchellh/vagrant/master/website/LICENSE.md'
739+
], [
740+
'Vue Router',
741+
'2013-present Evan You',
742+
'MIT',
743+
'https://raw.githubusercontent.com/vuejs/vue-router/dev/LICENSE'
709744
], [
710745
'Vue.js',
711746
'2013-2018 Evan You, Vue.js contributors',
712747
'MIT',
713748
'https://raw.githubusercontent.com/vuejs/vue/master/LICENSE'
749+
], [
750+
'Vuex',
751+
'2015-present Evan You',
752+
'MIT',
753+
'https://raw.githubusercontent.com/vuejs/vuex/dev/LICENSE'
714754
], [
715755
'Vulkan',
716756
'2014-2017 Khronos Group Inc.<br>Vulkan and the Vulkan logo are registered trademarks of the Khronos Group Inc.',
@@ -721,6 +761,11 @@ credits = [
721761
'JS Foundation and other contributors',
722762
'CC BY',
723763
'https://creativecommons.org/licenses/by/4.0/'
764+
], [
765+
'Wordpress',
766+
'2003-2019 WordPress Foundation',
767+
'GPLv2+',
768+
'https://wordpress.org/about/license/'
724769
], [
725770
'Yarn',
726771
'2016-present Yarn Contributors',

‎assets/javascripts/views/layout/document.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ class app.views.Document extends app.View
8080
when 'reboot' then app.reboot()
8181
when 'hard-reload' then app.reload()
8282
when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')
83-
when 'accept-analytics' then Cookies.set('analyticsConsent', '1') && app.reboot()
84-
when 'decline-analytics' then Cookies.set('analyticsConsent', '0') && app.reboot()
83+
when 'accept-analytics' then Cookies.set('analyticsConsent', '1', expires: 1e8) && app.reboot()
84+
when 'decline-analytics' then Cookies.set('analyticsConsent', '0', expires: 1e8) && app.reboot()
8585
return

‎assets/stylesheets/application.css.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
'pages/coffeescript',
4646
'pages/cordova',
4747
'pages/crystal',
48+
'pages/cypress',
4849
'pages/d',
4950
'pages/d3',
5051
'pages/dart',
@@ -94,6 +95,8 @@
9495
'pages/rfc',
9596
'pages/rubydoc',
9697
'pages/rust',
98+
'pages/rxjs',
99+
'pages/scala',
97100
'pages/sinon',
98101
'pages/socketio',
99102
'pages/sphinx',
@@ -106,5 +109,6 @@
106109
'pages/underscore',
107110
'pages/vue',
108111
'pages/webpack',
112+
'pages/wordpress',
109113
'pages/yard',
110114
'pages/yii';

‎assets/stylesheets/pages/_cypress.scss‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
._cypress {
2+
@extend %simple;
3+
4+
.note {
5+
h1 {
6+
margin-left: inherit
7+
}
8+
9+
&.danger {
10+
@extend %note-red
11+
}
12+
13+
&.info {
14+
@extend %note-blue
15+
}
16+
17+
&.success {
18+
@extend %note-green
19+
}
20+
}
21+
}

‎assets/stylesheets/pages/_rxjs.scss‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
._rxjs {
2+
@extend %simple;
3+
4+
.pre-title { @extend %pre-heading; }
5+
6+
.breadcrumbs { @extend %note; }
7+
.banner { @extend %note-green; }
8+
code.stable { @extend %label-green; }
9+
code.experimental { @extend %label-orange; }
10+
code.deprecated { @extend %label-red; }
11+
.alert.is-important { @extend %note-red; }
12+
.alert.is-helpful, .breadcrumbs { @extend %note-blue; }
13+
14+
.breadcrumbs { padding-left: 2em; }
15+
16+
img { margin: 1em 0; }
17+
18+
.location-badge {
19+
font-style: italic;
20+
text-align: right;
21+
}
22+
23+
td h3 { margin: 0 !important; }
24+
}

‎assets/stylesheets/pages/_scala.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
._scala {
2+
@extend %simple;
3+
.deprecated { @extend %label-red; }
4+
}

‎assets/stylesheets/pages/_wordpress.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
._wordpress {
2+
@extend %simple;
3+
4+
.breadcrumbs {
5+
display: none;
6+
}
7+
8+
.callout-warning {
9+
@extend %note, %note-red;
10+
}
11+
12+
.callout-alert {
13+
@extend %note, %note-orange;
14+
}
15+
}

‎lib/docs/filters/composer/clean_html.rb‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
module Docs
2+
class Composer
3+
class CleanHtmlFilter < Filter
4+
def call
5+
# Remove unneeded elements
6+
css('#searchbar, .toc, .fork-and-edit, .anchor').remove
7+
8+
# Fix the home page titles
9+
if subpath == ''
10+
css('h1').each do |node|
11+
node.name = 'h2'
12+
end
13+
14+
# Add a main title before the first subtitle
15+
at_css('h2').before('<h1>Composer</h1>')
16+
end
17+
18+
# Code blocks
19+
css('pre').each do |node|
20+
code = node.at_css('code[class]')
21+
22+
unless code.nil?
23+
node['data-language'] = 'javascript' if code['class'].include?('javascript')
24+
node['data-language'] = 'php' if code['class'].include?('php')
25+
end
26+
27+
node.content = node.content.strip
28+
node.remove_attribute('class')
29+
end
30+
31+
doc
32+
end
33+
end
34+
end
35+
end

0 commit comments

Comments
 (0)