Commit graph

209 commits

Author SHA1 Message Date
Caspar Jungbacker
e70bbbadf6 Merge branch 'main' into 'publish'
Docker

See merge request interactivetextbooks-citg/jupyter-book-manual!22
2023-06-26 09:59:52 +02:00
Caspar Jungbacker
642dcf6f53 Fix merge conflict 2023-06-26 09:47:07 +02:00
Caspar Jungbacker
aca17cb7ea Fix merge conflict 2023-06-26 09:44:12 +02:00
Caspar Jungbacker
c8443ed4fe Add Dockerfile 2023-06-26 09:42:28 +02:00
Caspar Jungbacker
9a730c479c Merge branch 'docker' into 'main'
Containerize book

See merge request interactivetextbooks-citg/jupyter-book-manual!21
2023-06-26 09:27:32 +02:00
Caspar Jungbacker
fd4d3df4b7 Merge branch 'main' into 'docker'
# Conflicts:
#   .gitlab-ci.yml
2023-06-24 10:01:36 +00:00
Caspar Jungbacker
1a24727aae Update .gitlab-ci.yml file 2023-06-24 11:47:09 +02:00
Caspar Jungbacker
c09e356f7c Merge branch 'cjungbacker-publish-patch-42230' into 'publish'
Install git

See merge request interactivetextbooks-citg/jupyter-book-manual!20
2023-06-14 10:07:18 +02:00
Caspar Jungbacker
2b87d51d0c Update .gitlab-ci.yml 2023-06-14 10:00:54 +02:00
Caspar Jungbacker
fe2e15a1c1 Merge branch 'main' into 'publish'
Update .gitlab-ci.yml

See merge request interactivetextbooks-citg/jupyter-book-manual!19
2023-06-14 09:53:42 +02:00
Caspar Jungbacker
d9eef483b5 Update .gitlab-ci.yml 2023-06-14 09:42:31 +02:00
Caspar Jungbacker
deea31f31a Merge branch 'main' into 'publish'
JupyterLite

See merge request interactivetextbooks-citg/jupyter-book-manual!18
2023-06-14 09:29:50 +02:00
Caspar Jungbacker
6b57965ebb Add Dockerfile 2023-06-10 17:10:10 +02:00
Caspar Jungbacker
4d8d8055f3 Merge branch 'jupyterlite-sphinx' into 'main'
Jupyterlite sphinx

See merge request interactivetextbooks-citg/jupyter-book-manual!17
2023-06-10 16:28:19 +02:00
Caspar Jungbacker
0b5dad4292 Include warning for CI/CD 2023-06-10 16:22:36 +02:00
Caspar Jungbacker
e62da09912 Fix syntax 🙃 2023-06-10 16:07:16 +02:00
Caspar Jungbacker
8375da74fe Install from pip 2023-06-10 16:04:25 +02:00
Caspar Jungbacker
bdd4090b2e Use Miniconda instead of virtualenv for environment 2023-06-10 16:02:29 +02:00
Caspar Jungbacker
54406100f2 Add environment.yml 2023-06-10 15:59:41 +02:00
Caspar Jungbacker
9df656c228 Merge branch 'main' into jupyterlite-sphinx 2023-06-10 15:31:16 +02:00
Caspar Jungbacker
042b2a8bc7 Update table of contents 2023-06-10 15:29:12 +02:00
Caspar Jungbacker
bc8b12cc6f Update text 2023-06-10 15:28:52 +02:00
Caspar Jungbacker
1047449d8e Add interactive wave example 2023-06-03 12:18:37 +02:00
Caspar Jungbacker
35c3f7965b Add scipy to xeus 2023-05-28 13:34:14 +02:00
Caspar Jungbacker
dd29623881 Update jupyterlite.md, include new sections 2023-05-28 13:33:47 +02:00
Caspar Jungbacker
70ba1cdfa4 Add "how to include JupyterLite" + demo notebook 2023-05-27 16:13:16 +02:00
Caspar Jungbacker
3a87bb1d1e Add JupyterLite configuration 2023-05-27 16:11:57 +02:00
Caspar Jungbacker
049d2eabef Merge branch '16-missing-text-in-section-on-git-branches' into 'main'
Resolve "Missing text in section on Git branches"

Closes #16

See merge request interactivetextbooks-citg/jupyter-book-manual!16
2023-05-20 15:46:02 +02:00
Caspar Jungbacker
8e2d45b365 Update book/workflows/git-branch.md 2023-05-20 15:45:14 +02:00
Robert Lanzafame
79096cf925 Merge branch 'main' into 'publish'
Add Git Bash setup instructions

See merge request interactivetextbooks-citg/jupyter-book-manual!15
2023-05-16 07:30:52 +02:00
Robert Lanzafame
087de3c240 Merge branch '14-add-instructions-to-activate-conda-via-git-bash' into 'main'
add git bash and conda instructions

Closes #14

See merge request interactivetextbooks-citg/jupyter-book-manual!14
2023-05-16 07:25:34 +02:00
Robert Lanzafame
ba7975a3a2 add git bash and conda instructions 2023-05-16 07:23:50 +02:00
Caspar Jungbacker
e10ea0db61 Merge branch 'main' into 'publish'
Git-VS Code

See merge request interactivetextbooks-citg/jupyter-book-manual!13
2023-05-13 14:35:59 +02:00
Caspar Jungbacker
54641cc997 Merge branch '6-using-git-with-vscode' into 'main'
Resolve "Using Git with VSCode"

Closes #6

See merge request interactivetextbooks-citg/jupyter-book-manual!5
2023-05-12 17:17:44 +02:00
Caspar Jungbacker
5e7e9f366d Merge branch 'main' into '6-using-git-with-vscode'
# Conflicts:
#   book/_toc.yml
2023-05-12 15:16:16 +00:00
Caspar Jungbacker
a3ff609248 Merge branch 'main' into 'publish'
Anaconda in VS Code terminal

See merge request interactivetextbooks-citg/jupyter-book-manual!12
2023-05-10 09:28:31 +02:00
Caspar Jungbacker
0f577a5e64 Update .gitlab-ci.yml 2023-05-08 14:07:27 +02:00
Caspar Jungbacker
7170d2607e Add Jupyterlite REPL example 2023-05-07 15:19:27 +02:00
Caspar Jungbacker
84943db144 Update .gitignore 2023-05-07 15:19:11 +02:00
Caspar Jungbacker
b97e0408c4 Merge branch '9-vs-code-terminal' into 'main'
Resolve "VS Code terminal"

Closes #9

See merge request interactivetextbooks-citg/jupyter-book-manual!11
2023-05-07 13:01:02 +02:00
Caspar Jungbacker
517acad412 Add conda init instructions for MacOS 2023-05-07 12:28:40 +02:00
Caspar Jungbacker
10b1d6611d Add conda terminal fix for windows 2023-05-07 11:47:50 +02:00
Caspar Jungbacker
4a8c0f3821 Merge branch 'main' into 'publish'
Small changes

See merge request interactivetextbooks-citg/jupyter-book-manual!10
2023-05-01 11:19:53 +02:00
Caspar Jungbacker
5f4faa5e51 Merge branch '8-update-git-setup' into 'main'
Resolve "Update Git setup"

Closes #8

See merge request interactivetextbooks-citg/jupyter-book-manual!9
2023-05-01 11:16:23 +02:00
Caspar Jungbacker
bb2337907d Add Jupyter Book setup 2023-05-01 10:32:14 +02:00
Caspar Jungbacker
562c6cb58b Update Git installation 2023-05-01 10:24:30 +02:00
Caspar Jungbacker
a9fb43c82f Fix conflict 2023-04-28 15:52:20 +00:00
Caspar Jungbacker
31c5525162 Merge branch '1-add-recipes-md-from-old-mude-book' into 'main'
Resolve "Add `recipes.md` from old MUDE book"

Closes #1

See merge request interactivetextbooks-citg/jupyter-book-manual!6
2023-04-28 17:51:09 +02:00
Caspar Jungbacker
229aaa2c5b Update toc 2023-04-28 17:50:01 +02:00
Caspar Jungbacker
930c93ffab Delete dummy 2023-04-28 17:49:03 +02:00