Skip to content

Commit 05e2f27

Browse files
committed
Merge branch 'master' into settings-enable
2 parents 7a018c5 + b297065 commit 05e2f27

File tree

8 files changed

+852
-1379
lines changed

8 files changed

+852
-1379
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
yarn.lock
1+
package-lock.json
22
*.ipynb*
33
tags
44
tags.lock

History.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
# History
22

3+
## 0.10.1 / 2018-11-21
4+
5+
* `ctrl i` enters Vim insert mode from Jupyter command mode (#71) Thanks @wmayner
6+
7+
## 0.10.0 / 2018-10-08
8+
9+
* Update for JupyterLab 0.35
10+
311
## 0.9.0 / 2018-08-22
4-
==================
512

613
* Update for JupyterLab 0.34 (#57) Thanks @MisterVulcan
7-
14+
815
## 0.8.0 / 2018-08-01
9-
==================
1016

1117
* Update for JupyterLab 0.33 (#52) Thanks @ah-
1218

PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ If this is a release, additionally do the following:
66

77
- [ ] Bump the package version in `package.json`
88
- [ ] Update the dependencies in `package.json`
9-
- [ ] Run `npm install` to update `package-lock.json`
9+
- [ ] Run `jlpm install` to update `yarn.lock`
1010

1111
Thanks!

README.md

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,23 @@ I hope this extension can meet the high bar his work set.
1818
This extension splits Jupyter edit mode into two modes: Vim command mode and Vim insert mode.
1919
Three editing modes now exist: Jupyter command, Vim command, and Vim insert.
2020

21+
## Install
22+
### Prerequisites
23+
24+
* JupyterLab 0.35
25+
26+
### Install or upgrade
27+
28+
```bash
29+
jupyter labextension install jupyterlab_vim
30+
```
31+
32+
### Uninstall
33+
34+
```bash
35+
jupyter labextension uninstall jupyterlab_vim
36+
```
37+
2138
## Key Bindings
2239

2340
**Please note that all keys are lowercase unless `Shift` is explicitly indicated.**
@@ -76,36 +93,25 @@ Shortcuts this extension introduces:
7693
| Ctrl-Y | Move Cells Up |
7794
| Z, Z | Center Cell |
7895

79-
## Install
80-
### Prerequisites
81-
82-
* JupyterLab 0.34
83-
84-
### Install or upgrade
85-
86-
```bash
87-
jupyter labextension install jupyterlab_vim
88-
```
96+
## Contributing
8997

90-
### Uninstall
98+
Contributions and feedback are most welcome!
9199

92-
```bash
93-
jupyter labextension uninstall jupyterlab_vim
94-
```
100+
[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/0)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/0)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/1)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/1)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/2)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/2)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/3)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/3)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/4)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/4)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/5)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/5)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/6)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/6)[![](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/images/7)](https://sourcerer.io/fame/jwkvam/jwkvam/jupyterlab-vim/links/7)
95101

96-
### Development
102+
## Development
97103

98-
For a development install (requires npm version 4 or later), do the following in the repository directory:
104+
For a development install (requires npm version 4 or later), do the following in the repository directory. **Please note**, you need to make sure that you satisfy all the prerequisites, i.e. the JupyterLab version.
99105

100106
```bash
101-
npm install
102-
npm run build
107+
jlpm install
108+
jlpm run build
103109
jupyter labextension link .
104110
```
105111

106112
To rebuild the package and the JupyterLab app:
107113

108114
```bash
109-
npm run build
115+
jlpm run build
110116
jupyter lab build
111117
```

0 commit comments

Comments
 (0)