master #9

Manually merged
kosssi merged 18 commits from master into dev/container 2020-07-21 10:55:01 +02:00

18 Commits

Author SHA1 Message Date
Simon 614e9669a7 Merge pull request 'Simon's fixes' (#8) from feature/quickfixes_17juin into master
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is passing Details
Reviewed-on: #8
2020-07-21 10:41:38 +02:00
Simon 99e9b6fc79 Supprime la bar du menu
continuous-integration/drone/pr Build encountered an error Details
continuous-integration/drone/push Build is passing Details
2020-07-21 10:39:48 +02:00
Simon ceaef3e18f Permet de fixer le menu à gauche 2020-07-21 10:39:17 +02:00
Simon 79dbc4a312 Fix title: Le titre doit être plus petit en mobile 2020-07-21 10:37:38 +02:00
Simon e0f1dc57fa fix layout: La taille de la page ne doit pas faire plus de 100vh par défaut 2020-07-21 10:37:01 +02:00
Gaetan Janssens c312ebbc13 Simon's fixes 2020-07-21 09:57:42 +02:00
Simon 3843b273f2 Merge pull request 'Add link' (#10) from feature/add_info into master
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is passing Details
Reviewed-on: #10
2020-07-16 12:28:13 +02:00
xviricel 35494eb306 Add link
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build encountered an error Details
2020-07-08 09:46:46 +02:00
Simon cf9675049d Merge pull request 'Mobile menu' (#6) from feature/mobile_menu into master
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is failing Details
2020-06-17 12:07:23 +02:00
Gaetan Janssens 3f65d7cdb7 Mobile menu
continuous-integration/drone/pr Build encountered an error Details
continuous-integration/drone/push Build is passing Details
2020-06-17 12:06:07 +02:00
Simon b7c7831c3e Merge pull request 'feat: Mise en place d'un layout' (#7) from feature/layout into master
continuous-integration/drone/push Build is passing Details
2020-06-17 10:55:50 +02:00
Simon fea542b74b feat: Mise en place d'un layout
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build encountered an error Details
2020-06-17 10:53:18 +02:00
Simon 3a0d765c13 Merge pull request 'feat: Ajout du footer' (#5) from feature/footer into master
continuous-integration/drone/push Build is passing Details
2020-06-17 10:29:37 +02:00
Simon b5c0de4b6b feat: Ajout du footer
continuous-integration/drone/pr Build encountered an error Details
continuous-integration/drone/push Build is passing Details
2020-06-16 12:50:48 +02:00
Simon ad68b631de Merge pull request 'feature/desktop' (#4) from feature/desktop into master
continuous-integration/drone/push Build is passing Details
2020-06-16 12:42:07 +02:00
xviricel b918e33ca6 Remove bad param
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build encountered an error Details
2020-06-16 12:15:26 +02:00
xviricel 1f1712a2fd Add desktop menu
continuous-integration/drone/push Build is passing Details
2020-06-16 12:06:52 +02:00
Simon 2ff1d20163 feat: Update docker-compose
continuous-integration/drone/push Build is passing Details
2020-06-16 11:17:40 +02:00