Commit graph

177 commits

Author SHA1 Message Date
Robert Lanzafame
75f902e5e3 add local server instructions 2023-07-11 17:04:35 +02:00
Caspar Jungbacker
30b3a5d3b0 Merge branch 'main' into 'publish'
Include Tom's h5p contents

See merge request interactivetextbooks-citg/jupyter-book-manual!28
2023-07-09 13:13:46 +02:00
Caspar Jungbacker
0d592c0fdf Update .gitlab-ci.yml file 2023-07-09 13:06:41 +02:00
Tom van Woudenberg
ba21c9cb27 Merge branch 'h5p' into 'main'
H5p cookbook

See merge request interactivetextbooks-citg/jupyter-book-manual!26
2023-07-06 15:00:03 +02:00
Tom van Woudenberg
f61c2fbdc2 H5p cookbook 2023-07-06 15:00:02 +02:00
Tom van Woudenberg
378cf24a96 Merge branch 'Grasple' into 'main'
Instruction how to integrate Grasple into Jupyter Book

See merge request interactivetextbooks-citg/jupyter-book-manual!27
2023-07-06 14:57:48 +02:00
Tom van Woudenberg
9a14148142 Instruction how to integrate Grasple into Jupyter Book 2023-07-06 14:57:48 +02:00
Caspar Jungbacker
376e74b106 Remove space 2023-06-27 20:31:27 +02:00
Caspar Jungbacker
2225c34b9a Update .gitlab-ci.yml file 2023-06-27 20:30:37 +02:00
Caspar Jungbacker
f77fea60be Fix order of command options 2023-06-26 20:29:56 +02:00
Caspar Jungbacker
3f27a19b98 Updated to newer version of docker compose 2023-06-26 20:21:04 +02:00
Caspar Jungbacker
689596585e Update .gitlab-ci.yml file 2023-06-26 19:59:09 +02:00
Caspar Jungbacker
9d4df9afb6 Merge branch 'main' into 'publish'
Move before_script

See merge request interactivetextbooks-citg/jupyter-book-manual!25
2023-06-26 19:46:16 +02:00
Caspar Jungbacker
e04e274eee Move before_script 2023-06-26 18:06:09 +02:00
Caspar Jungbacker
ca482f281b Merge branch 'main' into 'publish'
Add deploy stage

See merge request interactivetextbooks-citg/jupyter-book-manual!24
2023-06-26 17:54:58 +02:00
Caspar Jungbacker
ba12b0c3f7 Update .gitlab-ci.yml file 2023-06-26 17:42:18 +02:00
Caspar Jungbacker
c6e7ae7b12 Merge branch 'main' into 'publish'
Update .gitlab-ci.yml file

See merge request interactivetextbooks-citg/jupyter-book-manual!23
2023-06-26 10:49:30 +02:00
Caspar Jungbacker
07b0009a45 Update .gitlab-ci.yml file 2023-06-26 10:36:13 +02:00
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