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
Caspar Jungbacker
02fc8facf2
Merge branch 'change-logo' into 'main'
...
Change logo
See merge request interactivetextbooks-citg/jupyter-book-manual!8
2023-04-28 17:40:07 +02:00
Caspar Jungbacker
b555a4c77a
Delete MUDE_Logo-small.png
2023-04-28 17:39:42 +02:00
Caspar Jungbacker
9a763adb83
Update _config.yml
2023-04-28 17:39:29 +02:00
Caspar Jungbacker
3a400d619a
Upload TU Delft logo
2023-04-28 17:38:53 +02:00
Caspar Jungbacker
f890fb68fa
Fix image path
2023-04-28 17:37:12 +02:00
Caspar Jungbacker
493cdd0e81
Add arrow
2023-04-28 17:35:16 +02:00
Caspar Jungbacker
b29ff8748e
Update screenshots
2023-04-28 17:32:29 +02:00
Caspar Jungbacker
c6422ba8d1
Add sections
...
- GitLab merge requests
- Dummy sections on merge conflicts
2023-04-28 17:30:27 +02:00
Caspar Jungbacker
c9e3c5dc60
Finish section
2023-04-28 15:02:49 +02:00
Caspar Jungbacker
7767ae07bb
Add section on git clone
2023-04-28 15:02:28 +02:00
Caspar Jungbacker
2235ce28a5
Add section label
2023-04-28 14:38:34 +02:00
Caspar Jungbacker
ca63e261a9
Add missing image
2023-04-28 14:38:23 +02:00
Caspar Jungbacker
ebb22c5ec7
Add section on branching
2023-04-28 13:37:39 +02:00
Caspar Jungbacker
69aa4871bf
Rename
2023-04-28 13:19:08 +02:00
Caspar Jungbacker
f7fd93380f
Add section on gitlab, update reference.
2023-04-25 16:33:21 +02:00
Caspar Jungbacker
9a91816d9a
Update introduction page
...
Added sections:
- What is Git?
- What is GitLab?
- Terminology
2023-04-25 16:28:12 +02:00
Caspar Jungbacker
b8b156ba15
New section: staging, committing and pushing from vscode
2023-04-25 13:43:07 +02:00
Caspar Jungbacker
e0715435ef
Add new chapter
2023-04-25 11:35:43 +02:00
Caspar Jungbacker
c48f4065b6
Change folders
2023-04-24 18:33:51 +02:00
Caspar Jungbacker
6e1002f081
Add git-basic.md
2023-04-24 18:18:01 +02:00
Caspar Jungbacker
8522ecb3a2
Change folders
2023-04-24 17:55:12 +02:00
Caspar Jungbacker
80aa75cb64
Delete dummy
2023-04-24 17:49:26 +02:00
Caspar Jungbacker
d71bd8d544
Merge branch 'main' into 'publish'
...
Update intro, add contact info
See merge request interactivetextbooks-citg/jupyter-book-manual!4
2023-04-20 14:49:13 +02:00
Caspar Jungbacker
671d00f7b4
Update intro, add contact info
2023-04-20 14:47:02 +02:00
Caspar Jungbacker
d3d45e49e2
Merge branch 'main' into 'publish'
...
Update CI
See merge request interactivetextbooks-citg/jupyter-book-manual!3
2023-04-19 13:03:12 +02:00
Caspar Jungbacker
105d30f4a9
Update .gitlab-ci.yml
...
- Add testing job for main (same as build job for publish, but without artifacts)
- Deploy job now only is triggered when something is pushed to publish
2023-04-19 12:53:32 +02:00
Caspar Jungbacker
aa01e9634d
Update .gitlab-ci.yml
...
- Exclude venv/ from rsync
- Clean up cache
2023-04-18 11:48:46 +02:00
