Skip to content

Commit

Permalink
Merge branch 'master' into extension-alias
Browse files Browse the repository at this point in the history
  • Loading branch information
saulshanabrook committed Aug 15, 2019
2 parents 93b08ca + 860877e commit 6d3b1a0
Show file tree
Hide file tree
Showing 344 changed files with 5,172 additions and 5,920 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1, 0, 4, 'final', 0
current_version = 1, 1, 0, 'alpha', 1
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
Expand Down
46 changes: 23 additions & 23 deletions .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -3,40 +3,40 @@ name: Bug report
about: Create a report to help us improve
---

Hi! Thanks for using JupyterLab.
<!--
Welcome! Before creating a new issue:
* Search for relevant issues
* Follow the issue reporting guidelines:
https://jupyterlab.readthedocs.io/en/latest/getting_started/issue.html
-->

If you are reporting an issue with JupyterLab, please use the [GitHub issue](https://github.com/jupyterlab/jupyterlab/issues) search feature to check if your issue has been asked already. If it has, please add your comments to the existing issue.
## Description

The JupyterLab team and Project Jupyter value our community, and JupyterLab
follows the Jupyter [Community Guides](https://jupyter.readthedocs.io/en/latest/community/content-community.html).
<!--Describe the bug clearly and concisely. Include screenshots if possible-->

**Describe the bug**
A clear and concise description of what the bug is.
## Reproduce

**To Reproduce**
Steps to reproduce the behavior:
<!--Describe step-by-step instructions to reproduce the behavior-->

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
2. Click on '...'
3. Scroll down to '...'
4. See error '...'

**Expected behavior**
A clear and concise description of what you expected to happen.
<!--Describe how you diagnosed the issue. See the guidelines at
https://jupyterlab.readthedocs.io/en/latest/getting_started/issue.html -->

**Screenshots**
If applicable, add screenshots to help explain your problem.
## Expected behavior

**Desktop (please complete the following information):**
<!--Describe what you expected to happen-->

- OS: [e.g. Windows 10]
- Browser [e.g. chrome 69.0, firefox 62.0]
- JupyterLab [e.g. 0.34.2]
## Context

**Additional context**
Add any other context about the problem here.
<!--Complete the following for context, and add any other relevant context-->

If available, please include the following details:
- Operating System and version:
- Browser and version:
- JupyterLab version:

<details><summary>Troubleshoot Output</summary>
<pre>
Expand All @@ -53,6 +53,6 @@ Paste the output from your command line running `jupyter lab` here, use `--debug

<details><summary>Browser Output</summary>
<pre>
Paste the output from your browser console here.
Paste the output from your browser Javascript console here.
</pre>
</details>

This file was deleted.

40 changes: 40 additions & 0 deletions .github/lock.yml
@@ -0,0 +1,40 @@
# Configuration for Lock Threads - https://github.com/dessant/lock-threads

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 30

# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false

# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: []

# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: status:resolved-locked

# Comment to post before locking. Set to `false` to disable
lockComment: false

# lockComment: >
# This thread has been automatically locked since there has not been
# any recent activity after it was closed. Please open a [new issue](https://github.com/jupyterlab/jupyterlab/issues/new/choose)
# for related discussion.

# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: true

# Limit to only `issues` or `pulls`
# only: issues

# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated

# pulls:
# daysUntilLock: 30

# Repository to extend settings from
# _extends: repo
16 changes: 12 additions & 4 deletions CONTRIBUTING.md
Expand Up @@ -44,10 +44,18 @@ a keyboard shortcut or automatically on save.
## Submitting a Pull Request Contribution

Generally, an issue should be opened describing a piece of proposed work and the
issues it solves before a pull request is opened. This lets community members
participate in the design discussion, makes others aware of work being done, and
sets the stage for a fruitful community interaction. A pull request should
reference the issue it is addressing.
issues it solves before a pull request is opened.

### Issue Management

Opening an issue lets community members participate in the design discussion,
makes others aware of work being done, and sets the stage for a fruitful community
interaction. A pull request should reference the issue it is addressing. Once the
pull request is merged, the issue related to it will also be closed. If there is
additional discussion around implemementation the issue may be re-opened. Once 30 days
have passed with no additional discussion, the [lock bot](https://github.com/apps/lock) will lock the issue. If
additional discussion is desired, or if the pull request doesn't fully address the
locked issue, please open a new issue referencing the locked issue.

### Tag Issues with Labels

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -152,7 +152,7 @@ To be listed, please submit a pull request with your information.

We encourage you to ask questions on the [Discourse forum](https://discourse.jupyter.org/c/jupyterlab). A question answered there can become a useful resource for others.

Please use the [GitHub issues page](https://github.com/jupyterlab/jupyterlab/issues) to provide feedback or submit a bug report.
Please use the [GitHub issues page](https://github.com/jupyterlab/jupyterlab/issues) to provide feedback or submit a bug report. To keep resolved issues self-contained, the [lock bot](https://github.com/apps/lock) will lock closed issues as resolved after a period of inactivity. If related discussion is still needed after an issue is locked, please open a new issue and reference the old issue.

### Weekly Dev Meeting

Expand Down
4 changes: 3 additions & 1 deletion buildutils/package.json
@@ -1,6 +1,6 @@
{
"name": "@jupyterlab/buildutils",
"version": "1.0.2",
"version": "1.1.0-alpha.1",
"description": "JupyterLab - Build Utilities",
"homepage": "https://github.com/jupyterlab/jupyterlab",
"bugs": {
Expand Down Expand Up @@ -49,6 +49,7 @@
"mini-css-extract-plugin": "~0.6.0",
"package-json": "^6.3.0",
"path": "~0.12.7",
"prettier": "^1.18.2",
"semver": "^6.1.0",
"sort-package-json": "~1.22.1",
"typescript": "~3.5.1",
Expand All @@ -60,6 +61,7 @@
"@types/inquirer": "^6.0.3",
"@types/mini-css-extract-plugin": "^0.2.0",
"@types/node": "^12.0.2",
"@types/prettier": "^1.16.4",
"@types/webpack": "^4.4.32",
"rimraf": "~2.6.2"
}
Expand Down
5 changes: 1 addition & 4 deletions buildutils/src/build.ts
Expand Up @@ -183,10 +183,7 @@ export namespace Build {
},
{
test: /\.svg/,
use: [
{ loader: 'svg-url-loader', options: {} },
{ loader: 'svgo-loader', options: { plugins: [] } }
]
use: [{ loader: 'svg-url-loader', options: { encoding: 'none' } }]
},
{
test: /\.(png|jpg|gif|ttf|woff|woff2|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
Expand Down

0 comments on commit 6d3b1a0

Please sign in to comment.