diff --git a/html_src_files.lst b/html_src_files.lst index d8430d81d4aba76b83fe52ad3b4ece8d0ff463fe..29ed7f414b7273d7923cee86098d1f7b50ba0902 100644 --- a/html_src_files.lst +++ b/html_src_files.lst @@ -14,6 +14,8 @@ ./module1/ressources/sequence5.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/c96bfaf3804847a38d2a8850ee0baf54 ./module1/ressources/gitlab_interface_fr.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/27b18e9ea3c14a77942eaa7cd00b8506 ./module1/ressources/gitlab_interface.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/27b18e9ea3c14a77942eaa7cd00b8506 +./module1/ressources/version_control_other_fr.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/27b18e9ea3c14a77942eaa7cd00b8506 +./module1/ressources/version_control_other.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/27b18e9ea3c14a77942eaa7cd00b8506 ./module2/ressources/maintaining_a_journal.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/0af0b6bf03194c1bb2798c29d7375a76 ./module2/ressources/maintaining_a_journal_fr.org # https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/0af0b6bf03194c1bb2798c29d7375a76 diff --git a/module1/ressources/version_control_other.org b/module1/ressources/version_control_other.org new file mode 100644 index 0000000000000000000000000000000000000000..24c9d1e1d249f92ed66a86dcc07604b9ad5f8c78 --- /dev/null +++ b/module1/ressources/version_control_other.org @@ -0,0 +1,58 @@ +#+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline +#+OPTIONS: author:t broken-links:nil c:nil creator:nil +#+OPTIONS: d:(not "LOGBOOK") date:t e:t email:nil f:t inline:t num:t +#+OPTIONS: p:nil pri:nil prop:nil stat:t tags:t tasks:t tex:t +#+OPTIONS: timestamp:t title:t toc:t todo:t |:t +#+TITLE: Notes (and codes) that are archived but can evolve with version control systems +#+AUTHOR: Christophe Pouzat +#+EMAIL: christophe.pouzat@parisdescartes.fr +#+LANGUAGE: en +#+SELECT_TAGS: export +#+EXCLUDE_TAGS: noexport +#+CREATOR: Emacs 26.1 (Org mode 9.1.9) +#+STARTUP: indent + +* Table of contents :TOC: +- [[#version-control-with-gitlab-and-git-in-the-Reproducible-research-mooc][Version control with GitLab and Git]] +- [[#version-control-with-libreoffice-or-dokuwiki][Version control with LibreOffice or DokuWiki]] + +* Version control with GitLab and Git in the "Reproducible research" MOOC +We have created a GitLab server especially for this MOOC so that you can smoothly learn how to implement version control. +This section describes the successive steps involved. The following [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/5571950188c946e790f06d4bc90fb5f6#InterfaceGitlab][video]] shows how to use GitLab. We strongly recommend that you watch it if you've never used GitLab before. + +- Go to [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/5571950188c946e790f06d4bc90fb5f6#FormAccesGitlab][GitLab]] from the FUN platform (click on *Accédez à + Gitlab / Access to Gitlab*) +- You reach the following form : + #+BEGIN_CENTER + [[file:gitlab_images/sign_in.png]] + #+END_CENTER + - NB : You must reach GitLab from the FUN platform. You are likely to get a "405 error" if you are using the following address: https://app-learninglab.inria.fr/gitlab/users/sign_in. + #+BEGIN_CENTER + [[file:gitlab_images/erreur405.png]] + #+END_CENTER +- Click on **Sign in**. Authentication is automatic at that stage. + #+BEGIN_CENTER + [[file:gitlab_images/projects.png]] + #+END_CENTER + + The long string replaced here by =xxx= is the login you will have to use in Git to synchronize with GitLab. + +- To recover a predefined password you must use [[https://app-learninglab.inria.fr/jupyterhub/services/password][Gitlab + credentials retrieval tool]]. One gets then the login and password. + #+BEGIN_CENTER + [[file:gitlab_images/password_retrieval.png]] + #+END_CENTER + +- You can change this password in "Account / + Paramètres / Mot de passe". We do not recommend doing it since that will block you from using the Jupyter notebooks of this MOOC. + #+BEGIN_CENTER + [[file:gitlab_images/password.png]] + #+END_CENTER + +If you want to go further, few tutorial videos are gathered in [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session02/jump_to_id/7508aece244548349424dfd61ee3ba85][sequence "7. Installations, configurations, references" of module 2]] +of this MOOC. + +* Version control with LibreOffice or DokuWiki +Modification tracking in files generated and managed by =LibreOffice= is briefly described on the [[https://help.libreoffice.org/Common/Recording_Changes][wiki page]] of this software. A [[https://help.libreoffice.org/Common/Navigating_Changes][table of contents]] of the pages dedicated to this subject is available. + +For DoKuWiki, the best is to check the [[https://www.dokuwiki.org/start?id=dokuwiki][wiki]]. diff --git a/module1/ressources/version_control_other_fr.org b/module1/ressources/version_control_other_fr.org new file mode 100644 index 0000000000000000000000000000000000000000..e38e0baeaa3497e0ce131c5c5c89cfae1021c690 --- /dev/null +++ b/module1/ressources/version_control_other_fr.org @@ -0,0 +1,22 @@ +#+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline +#+OPTIONS: author:t broken-links:nil c:nil creator:nil +#+OPTIONS: d:(not "LOGBOOK") date:t e:t email:nil f:t inline:t num:t +#+OPTIONS: p:nil pri:nil prop:nil stat:t tags:t tasks:t tex:t +#+OPTIONS: timestamp:t title:t toc:t todo:t |:t +#+TITLE: Pérénité et évolutivité avec la gestion de version +#+DATE: <2019-03-26 mar.> +#+AUTHOR: Christophe Pouzat +#+EMAIL: christophe.pouzat@parisdescartes.fr +#+LANGUAGE: fr +#+SELECT_TAGS: export +#+EXCLUDE_TAGS: noexport +#+CREATOR: Emacs 26.1 (Org mode 9.1.9) +#+STARTUP: indent + +* Table des matières :TOC: +- [[#gestion-de-version-dans-libreoffice-ou-dans-dokuwiki][Gestion de version dans LibreOffice ou dans DokuWiki]] + +* Gestion de version dans LibreOffice ou dans DokuWiki +L'enregistrement des modifications des fichiers générés et gérés par =LibreOffice= est succinctement décrite sur la [[https://help.libreoffice.org/Common/Recording_Changes/fr][page du Wiki]] de ce logiciel. Une espèce de [[https://help.libreoffice.org/Common/Navigating_Changes/fr][sommaire]] des pages concernant la gestion des modifications est également disponible. Le livre [[https://framabook.org/libreoffice-cest-style/][LibreOffice, c’est stylé !]] téléchargeable gratuitement (et légalement) ne semble pas aborder la question. Sa version source est disponible sur [[https://framagit.org/Framatophe/DWL/][framagit]]= (un autre serveur type GitLab) et est écrite en… =markdown= ! + +Pour DokuWiki, le plus simple est de consulter le [[https://www.dokuwiki.org/fr:dokuwiki][Wiki]] écrit, cette fois au moins !, en DokuWiki. diff --git a/module2/ressources/rstudio-install-doc.org b/module2/ressources/rstudio-install-doc.org index 0ae60de9a3479fc872c5eedd76f3c174235f8dea..fd3eefc03dc550beef28de78d74134d2d8c632ae 100644 --- a/module2/ressources/rstudio-install-doc.org +++ b/module2/ressources/rstudio-install-doc.org @@ -1,5 +1,5 @@ # -*- mode: org -*- -#+TITLE: Rstudio: installating and documentation +#+TITLE: Rstudio: installation and documentation #+DATE: June, 2018 #+STARTUP: overview indent #+OPTIONS: num:nil toc:t