diff --git a/module1/slides/diapos_git.org b/module1/slides/diapos_git.org index 8decd7c4d10eacde3985f9abfd53eab42a76b15a..6a0c6686710f390c6cc8748eb9b842e9a877f274 100644 --- a/module1/slides/diapos_git.org +++ b/module1/slides/diapos_git.org @@ -874,15 +874,26 @@ Mais comment mettre ça en place ? - Github :: Leaders du marché mais logiciel propriétaire - Projets privés: + # #+LaTeX: \hfill\llap{\includegraphics[height=.5cm]{img_git/Logo_GitHub.pdf}\includegraphics[height=.9cm]{img_git/Octocat.jpg}\hspace{-1cm}} - gratuit pour étudiants/académiques - - payant pour les autres\pause -- GitLab :: Logiciel libre + - payant pour les autres + #+BEGIN_EXPORT latex + \begin{overlayarea}{\linewidth}{0cm} + \vspace{-2.3cm}\hfill\llap{\includegraphics<2-3>[height=1.8cm]{img_git/github_interactions.pdf}} + \end{overlayarea}\vspace{-1\baselineskip}\pause + #+END_EXPORT +- GitLab :: Logiciel libre, plusieurs instances - Instance =gitlab.com= similaire à GitHub - - Compagnies: déploiement d'instances, support avancé\pause -- GitLab de votre université, institut, etc. ::   + - Compagnies, institutions: support avancé + #+BEGIN_EXPORT latex + \begin{overlayarea}{\linewidth}{0cm} + \vspace{-.7cm}\centerline{\includegraphics<3>[height=1.8cm]{img_git/gitlab_interactions.pdf}} + \end{overlayarea}\vspace{-1\baselineskip}\pause + #+END_EXPORT +- Lequel choisir ? :: (+ FramaGit, BitBucket, SourceForge, ...) + - Visibilité/pérénité - Projets privés ou publiques - Confidentialité des données -- Alternatives :: FramaGit, BitBucket, SourceForge #+LaTeX: \end{overlayarea} ** Interfaces graphiques - JupyterLab-git diff --git a/module1/slides/img_git/github_interactions.pdf b/module1/slides/img_git/github_interactions.pdf new file mode 100644 index 0000000000000000000000000000000000000000..bba52a3f265f3c996b3b9d21eb34618e8b7a7761 Binary files /dev/null and b/module1/slides/img_git/github_interactions.pdf differ diff --git a/module1/slides/img_git/github_interactions.svg b/module1/slides/img_git/github_interactions.svg new file mode 100644 index 0000000000000000000000000000000000000000..320846c36ef66e27c389a7c11dcb4603be30c98f --- /dev/null +++ b/module1/slides/img_git/github_interactions.svg @@ -0,0 +1,1769 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module1/slides/img_git/gitlab_interactions.pdf b/module1/slides/img_git/gitlab_interactions.pdf new file mode 100644 index 0000000000000000000000000000000000000000..43cd75e754db445277c443b9b78fcf48cc7764c8 Binary files /dev/null and b/module1/slides/img_git/gitlab_interactions.pdf differ diff --git a/module1/slides/img_git/gitlab_interactions.svg b/module1/slides/img_git/gitlab_interactions.svg new file mode 100644 index 0000000000000000000000000000000000000000..d9cc665361ebb607a848b910077bdd61e7b06525 --- /dev/null +++ b/module1/slides/img_git/gitlab_interactions.svg @@ -0,0 +1,4568 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gitlab.com + + +