Commit Graph

38 Commits

Author SHA1 Message Date
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
7bfcaa6993 add home meteo card 2020-04-04 10:39:40 +02:00
bb4f1c5cef Merge branch 'master' of gitlab.com:Romulus21/portal into feature/Meteo 2020-04-04 09:24:07 +02:00
ab0db1f02f add key to App route 2020-04-04 09:21:08 +02:00
30e181f86d first work on meteo display 2020-04-04 09:19:51 +02:00
5a94759e35 refact deploy 2020-03-29 15:49:14 +02:00
f59a5377af fix deploy 2020-03-29 15:36:57 +02: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
623fa0b6f3 fix deploy 2020-03-29 15:32:44 +02: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
a89befad08 finish deploy script 2020-03-29 14:17:10 +02:00
5c20bdfd1a change deploy 2020-03-29 12:18:30 +02:00
Romain Delanoë
78271b776a Merge branch 'production' into 'master'
Production

See merge request Romulus21/portal!7
2020-03-29 10:13:36 +00:00
cbf093bffa fix deploy 2020-03-29 12:12:53 +02: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
dd4b198a8c fix deploy 2020-03-29 12:02:16 +02: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
afb4a1315a add deploy commands 2020-03-29 11:48:21 +02:00
Romain Delanoë
f32063ed74 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!4
2020-03-29 09:29:06 +00:00
d748314a7a css memos show 2020-03-29 11:27:15 +02:00
0b3183a7fb add icon & fix display name 2020-03-28 18:16:58 +01:00
e588dc504f continue conversion Hangman 2020-03-28 18:15:41 +01:00
fffa30c6a1 first work on hangman 2020-03-28 17:01:53 +01: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
4b9eb03f8d reset public js css 2020-03-28 12:13:19 +01: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
0428395ca8 reset public js css 2020-03-28 12:10:52 +01: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
53ad9586a2 fix some css 2020-03-28 12:04:27 +01:00
80c5eb53b6 pre deployed 2020-03-28 08:43:59 +01:00
ce1dc3cd7f pre deploy' 2020-03-27 19:30:20 +01:00
7e5d022aa2 clean tests & other things 2020-03-25 20:11:29 +01:00
11511039e9 start add Memos 2020-03-22 18:54:13 +01:00
18d0841a7d finish register special 2020-03-22 17:44:43 +01:00
3f96cc6fe3 first commit 2020-03-21 15:52:49 +01:00