Commit graph

1839 commits

Author SHA1 Message Date
Caspar Jungbacker
36d3f5996c Update .gitlab-ci.yml file 2023-08-14 20:05:54 +02:00
Caspar Jungbacker
336c4b076c Update .gitlab-ci.yml file 2023-08-14 19:54:11 +02:00
Caspar Jungbacker
c85b75aa02 Add dot 2023-08-14 19:15:37 +02:00
Caspar Jungbacker
0ab93ce0c4 Update .gitlab-ci.yml file 2023-08-14 19:12:22 +02:00
Caspar Jungbacker
17939dad0c Merge branch 'main' into 'publish'
Update deployment

See merge request interactivetextbooks-citg/jupyter-book-manual!31
2023-08-14 19:11:18 +02:00
Caspar Jungbacker
ab8a1f56ed Merge branch 'publish' into 'main'
# Conflicts:
#   .gitlab-ci.yml
2023-08-14 17:10:33 +00:00
Caspar Jungbacker
30c6674024 Merge branch 'docker' into 'main'
Update Docker setup

See merge request interactivetextbooks-citg/jupyter-book-manual!30
2023-08-13 19:42:51 +02:00
Caspar Jungbacker
fe72ddb14a Merge branch 'main' into 'docker'
# Conflicts:
#   .gitlab-ci.yml
2023-08-13 17:42:45 +00:00
Caspar Jungbacker
829096439d Update .gitlab-ci.yml file 2023-08-13 19:39:12 +02:00
Caspar Jungbacker
c80c96af5e Update Dockerfile 2023-08-13 19:29:46 +02:00
Tom van Woudenberg
66eadfa8c7 Added capital A to title 2023-07-17 16:01:51 +02:00
Robert Lanzafame
efefc14a55 Merge branch '23-local-server-instruction' into 'main'
Resolve "local server instruction"

Closes #23

See merge request interactivetextbooks-citg/jupyter-book-manual!29
2023-07-11 17:06:06 +02:00
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