Commit Graph
20 Commits
Author SHA1 Message Date
Romain Delanoë dbdf981eb1 Merge branch 'master' into 'production'
add small menu

See merge request Romulus21/portal!18
2020-04-07 21:51:08 +00:00
Romain Delanoë 18aaeffd94 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!17
2020-04-05 05:58:35 +00:00
Romain Delanoë df37e237b9 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!16
2020-04-04 16:57:37 +00:00
Romain Delanoë 516db59a32 Merge branch 'master' into 'production'
add SVG Icon

See merge request Romulus21/portal!15
2020-04-04 09:50:49 +00:00
Romain Delanoë 0f6783276f Merge branch 'master' into 'production'
add config file portal to fix env error maybe

See merge request Romulus21/portal!14
2020-04-04 09:20:03 +00:00
Romain Delanoë 2eb481d578 Merge branch 'master' into 'production'
fix Api key meteo

See merge request Romulus21/portal!13
2020-04-04 09:09:36 +00:00
Romain Delanoë e5e0f0d038 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!12
2020-04-04 09:02:38 +00:00
Romain Delanoë e59f11d64e Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!11
2020-04-04 08:42:16 +00:00
Romain Delanoë 8f91759fa6 Merge branch 'feature/Meteo' into 'master'
Feature/meteo

See merge request Romulus21/portal!10
2020-04-04 08:41:22 +00:00
Romain Delanoë 5b96ef979e Merge branch 'master' into 'production'
fix deploy

See merge request Romulus21/portal!9
2020-03-29 13:33:42 +00:00
Romain Delanoë 517c4badb1 Merge branch 'master' into 'production'
finish deploy script

See merge request Romulus21/portal!8
2020-03-29 12:18:00 +00:00
Romain Delanoë 78271b776a Merge branch 'production' into 'master'
Production

See merge request Romulus21/portal!7
2020-03-29 10:13:36 +00:00
Romain Delanoë cbcf10b6c1 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!6
2020-03-29 10:05:38 +00:00
Romain Delanoë a3f905901f Delete package-lock.json 2020-03-29 10:04:48 +00:00
Romain Delanoë 27669f3ae7 Delete package-lock.json 2020-03-29 10:04:09 +00:00
Romain Delanoë 70fd1adb31 Merge branch 'master' into 'production'
add deploy commands

See merge request Romulus21/portal!5
2020-03-29 09:50:09 +00:00
Romain Delanoë f32063ed74 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!4
2020-03-29 09:29:06 +00:00
Romain Delanoë 2b3e4ea848 Merge branch 'master' into 'production'
reset public js css

See merge request Romulus21/portal!3
2020-03-28 11:13:54 +00:00
Romain Delanoë 77cd22bcfd Merge branch 'master' into 'production'
reset public js css

See merge request Romulus21/portal!2
2020-03-28 11:11:41 +00:00
Romain Delanoë 97701cd506 Merge branch 'master' into 'production'
fix some css

See merge request Romulus21/portal!1
2020-03-28 11:05:41 +00:00