Skip to content

Commit 8b59ac7

Browse files
palewirepalewire
authored
Merge branch 'master' into palewire-patch-10
2 parents b1867c5 + 27a4864 commit 8b59ac7

32 files changed

+641
-3615
lines changed

‎.travis.yml

-44
This file was deleted.

‎.travis/cibuild

-7
This file was deleted.

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ include: [".well-known"]
1919

2020
plugins:
2121
- jekyll-redirect-from
22+
- jekyll-sitemap

‎_data/documentation.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ User Interfaces:
88
JupyterLab: https://jupyterlab.readthedocs.io/en/latest/
99
Jupyter Notebook: https://jupyter-notebook.readthedocs.io/en/stable/
1010
Jupyter Console: https://jupyter-console.readthedocs.io/en/stable/
11-
Qt Console : https://qtconsole.readthedocs.io/en/stable/
11+
Qt Console: https://qtconsole.readthedocs.io/en/stable/
12+
Voilà: https://voila.readthedocs.io/
1213

1314
IPython:
1415
IPython: https://ipython.readthedocs.io/en/stable/

‎_data/nav.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ head:
22
- title: Install
33
url: /install
44
- About Us
5-
- title: Community
5+
- title: Get Involved
66
url: /community
77
- title: Events
88
url: /events
99
- Documentation
1010
- Widgets
11-
- title: Blog
11+
- title: News
1212
url: https://blog.jupyter.org
1313
newpage: true
1414
- title: Security

‎_data/try.yml

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
logo: jupyter.png
1313
url: https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/HEAD?urlpath=lab/tree/demo
1414

15+
- title: Try Voilà
16+
description: An example with a variety of notebook dashboards.
17+
logo: voila.svg
18+
url: https://mybinder.org/v2/gh/voila-dashboards/voila/stable?urlpath=voila%2Ftree%2Fnotebooks
19+
1520
- title: Try Jupyter with Julia
1621
description: |
1722
A basic example of using Jupyter with Julia.
@@ -47,3 +52,4 @@
4752
Titanic example with LetsPlot and Dataframe libraries.
4853
logo: kotlin.svg
4954
url: https://mybinder.org/v2/gh/Kotlin/dataframe/master?filepath=examples/jupyter-notebooks/titanic/Titanic.ipynb
55+

‎_includes/footer.html

+4-15
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,8 @@
2929
</div>
3030
</footer>
3131

32-
<!-- jQuery -->
33-
<script src="{{site.baseurl}}/js/jquery.js"></script>
32+
<!-- jQuery -->
33+
<script src="{{site.baseurl}}/js/jquery.js"></script>
3434

35-
<!-- Bootstrap Core JavaScript -->
36-
<script src="{{site.baseurl}}/js/bootstrap.min.js"></script>
37-
38-
{%- if page.title == "Documentation" %}
39-
<!-- jQuery match height library -->
40-
<!-- matchHeight makes the height of all selected elements exactly equal -->
41-
<script src="{{site.baseurl}}/js/jquery.matchHeight.js"></script>
42-
<script type="text/javascript">
43-
$(function() {
44-
$('.cardlist-card').matchHeight();
45-
});
46-
</script>
47-
{%- endif %}
35+
<!-- Bootstrap Core JavaScript -->
36+
<script src="{{site.baseurl}}/js/bootstrap.min.js"></script>

‎_includes/head.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<head>
22

33
<meta charset="utf-8">
4-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
54
<meta name="viewport" content="width=device-width, initial-scale=1">
65
<meta itemprop="description" name="description" content="{% if page.tagline %}{{ page.tagline }}{% else %}{{ site.description }}{% endif %}" />
76

87
<title>{{ site.title }} {% if page.title %}| {{ page.title }}{% endif %}</title>
98
<meta property="og:title" content="Project Jupyter" />
10-
<meta property="og:description" content="{{ site.description }}">
9+
<meta property="og:description" content="{{ site.description|strip_html }}">
1110
<meta property="og:url" content="{{ site.url }}" />
1211
<meta property="og:image" content="{{ "/assets/homepage.png" | prepend: site.url }}" />
13-
<link rel="canonical" href="{{ page.url | prepend: site.url }}">
12+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1413
<!-- Bootstrap Core CSS -->
1514
<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
1615
<link rel="stylesheet" href="{{ "/css/logo-nav.css" | prepend: site.baseurl }}?{{site.time | date: '%s%N'}}">
@@ -26,7 +25,6 @@
2625
<link href="{{site.baseurl}}/assets/apple-touch-icon-180x180.png" rel="apple-touch-icon" sizes="180x180" />
2726
<link href="{{site.baseurl}}/assets/icon-hires.png" rel="icon" sizes="192x192" />
2827
<link href="{{site.baseurl}}/assets/icon-normal.png" rel="icon" sizes="128x128" />
29-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
3028

3129
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
3230
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

‎_includes/partners.html

+24
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,29 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
6565
alt="AWS logo"/>
6666
</a>
6767
</div>
68+
<div class="col-sm-3 col-xs-6 sponsor">
69+
<a href="https://databricks.com/">
70+
<img src="{{site.baseurl}}/assets/databricks.png"
71+
class="company-logo"
72+
alt="Databricks logo"/>
73+
</a>
74+
</div>
75+
<div class="col-sm-3 col-xs-6 sponsor">
76+
<a href="https://www.mongodb.com/">
77+
<img src="{{site.baseurl}}/assets/MongoDB.png" class="company-logo" alt="MongoDB logo" />
78+
</a>
79+
</div>
80+
</div>
81+
<div class="row">
82+
<div class="col-sm-3 col-xs-6 sponsor">
83+
<a href="https://www.si.umich.edu/">
84+
<img src="{{site.baseurl}}/assets/siumich.jpg" class="company-logo" alt="UMSI logo" />
85+
</a>
86+
</div>
87+
<div class="col-sm-3 col-xs-6 sponsor">
88+
<a href="https://2i2c.org/">
89+
<img src="{{site.baseurl}}/assets/2i2c.png" class="company-logo" alt="2i2c logo" />
90+
</a>
91+
</div>
6892
</div>
6993
</div>

‎_layouts/post.html

-15
This file was deleted.

‎_layouts/try.html

-45
This file was deleted.

‎about.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ steering:
148148
- first: Damian
149149
last: Avila
150150
avatar: https://avatars3.githubusercontent.com/u/1640669?v=3&s=400
151-
affiliation: Anaconda, Inc.
151+
affiliation: UMSI & 2i2c
152152
gh_handle: 'damianavila'
153153
- first: Matthias
154154
last: Bussonnier
@@ -173,7 +173,7 @@ steering:
173173
- first: Jason
174174
last: Grout
175175
avatar: https://avatars1.githubusercontent.com/u/192614?v=3&s=400
176-
affiliation: Bloomberg
176+
affiliation: Databricks
177177
gh_handle: 'jasongrout'
178178
- first: Jessica
179179
last: Hamrick
@@ -218,7 +218,7 @@ steering:
218218
- first: Steven
219219
last: Silvester
220220
avatar: https://avatars2.githubusercontent.com/u/2096628?v=3&s=400
221-
affiliation: Apple
221+
affiliation: MongoDB
222222
gh_handle: 'blink1073'
223223
- first: Carol
224224
last: Willing
@@ -268,7 +268,7 @@ trademark_subcomittee:
268268
- first: Jason
269269
last: Grout
270270
avatar: https://avatars1.githubusercontent.com/u/192614?v=3&s=400
271-
affiliation: Bloomberg
271+
affiliation: Databricks
272272
gh_handle: 'jasongrout'
273273
- first: Tim
274274
last: George

‎assets/2i2c.png

44.9 KB
Loading

‎assets/MongoDB.png

8.9 KB
Loading

‎assets/databricks.png

21.4 KB
Loading

‎assets/siumich.jpg

19.8 KB
Loading

‎assets/try/voila.svg

+67
Loading

‎community.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: page_md
3-
title: Community
4-
tagline: How to get involved with Project Jupyter
3+
title: Get Involved
4+
tagline: How to join the Project Jupyter community
55
permalink: /community
66
---
77

‎conduct/index.md renamed to ‎conduct.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
layout: markdown
2+
layout: page_md
3+
title: Code of Conduct
4+
tagline: Expected behavior in the Project Jupyter community
5+
permalink: /conduct
36
---
47

58
Jupyter Code of Conduct can be found on the [Jupyter/Governance GitHub
69
Repository](https://github.com/jupyter/governance). For convenience it has been
710
replicated here.
811

9-
In case of difference, the version on the [Jupyter/Governance GitHub
12+
In case of difference, the version on the [Jupyter/Governance GitHub
1013
Repository](https://github.com/jupyter/governance) is the canonical one, and
1114
the one present here should be updated accordingly.
1215

13-
14-
15-
1616
------------------------
1717

1818
# Project Jupyter Code of Conduct

0 commit comments

Comments
 (0)