Commit Graph

63 Commits

Author SHA1 Message Date
Romain Delanoë
43849abbe4 Merge branch 'master' into 'production'
change on memos display & inputs

See merge request Romulus21/portal!21
2020-04-11 10:28:43 +00:00
e01ad206fe change on memos display & inputs 2020-04-11 12:27:20 +02:00
Romain Delanoë
477a9070d6 Merge branch 'master' into 'production'
fix menu memory, return memo button & add favicon

See merge request Romulus21/portal!20
2020-04-08 21:01:08 +00:00
d844bd8518 fix menu memory, return memo button & add favicon 2020-04-08 23:00:26 +02:00
Romain Delanoë
f5daa5e0bc Merge branch 'master' into 'production'
no alert

See merge request Romulus21/portal!19
2020-04-08 20:30:21 +00:00
0c74026119 no alert 2020-04-08 22:27:47 +02:00
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
eb28a0a577 add small menu 2020-04-07 23:43:50 +02:00
Romain Delanoë
18aaeffd94 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!17
2020-04-05 05:58:35 +00:00
edf96000b0 hangman fix typing letters 2020-04-05 07:37:27 +02:00
355bc0386d add fruit words in dic 2020-04-04 19:55:53 +02:00
Romain Delanoë
df37e237b9 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!16
2020-04-04 16:57:37 +00:00
6bfc0bb064 finish hangman v1 2020-04-04 18:56:03 +02:00
79c656c7ea Merge branch 'master' of gitlab.com:Romulus21/portal into feature/Game/hangman 2020-04-04 12:00:35 +02:00
cb5f2368b6 change meteo icon color 2020-04-04 11:59:44 +02: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
a8dd4cb7c6 add SVG Icon 2020-04-04 11:47:48 +02: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
9c6c771171 add config file portal to fix env error maybe 2020-04-04 11:19:30 +02: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
bf67d4d2d1 fix Api key meteo 2020-04-04 11:09:07 +02:00
Romain Delanoë
e5e0f0d038 Merge branch 'master' into 'production'
Master

See merge request Romulus21/portal!12
2020-04-04 09:02:38 +00:00
555080e8be fix Api key meteo 2020-04-04 11:02:04 +02:00
7b5d332efe fix coquille 2020-04-04 10:47:15 +02: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
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
172df612ab clean Home Game 2020-03-29 11:03: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