|
|
1e56daf807
|
change deploy
|
2020-04-15 18:22:20 +02:00 |
|
Romain Delanoë
|
e7efd25782
|
Merge branch 'master' into 'production'
add new fonctions on deploy
See merge request Romulus21/portal!30
|
2020-04-15 13:17:50 +00:00 |
|
|
|
4832a42d4f
|
add new fonctions on deploy
|
2020-04-15 15:15:09 +02:00 |
|
Romain Delanoë
|
d18da8bd42
|
Merge branch 'master' into 'production'
Master
See merge request Romulus21/portal!29
|
2020-04-12 10:17:07 +00:00 |
|
|
|
bbac68f526
|
update deploy rsync
|
2020-04-12 12:16:17 +02:00 |
|
|
|
c97fa79cf9
|
remote d
|
2020-04-12 10:34:04 +02:00 |
|
Romain Delanoë
|
0f46313e40
|
Merge branch 'master' into 'production'
Master
See merge request Romulus21/portal!28
|
2020-04-12 08:24:56 +00:00 |
|
|
|
287941d1e0
|
fix UaserAdmin link
|
2020-04-12 10:24:03 +02:00 |
|
|
|
cb241796cc
|
display last login to User Admin
|
2020-04-12 10:18:54 +02:00 |
|
Romain Delanoë
|
af5be8afb7
|
Merge branch 'master' into 'production'
Master
See merge request Romulus21/portal!27
|
2020-04-12 07:44:39 +00:00 |
|
|
|
24d27a68ac
|
add login_at to User
|
2020-04-12 09:42:13 +02:00 |
|
|
|
0a535c165d
|
toggle box
|
2020-04-12 08:37:16 +02:00 |
|
Romain Delanoë
|
a152586b30
|
Merge branch 'master' into 'production'
add loader
See merge request Romulus21/portal!26
|
2020-04-11 21:55:15 +00:00 |
|
|
|
85d20dfe4d
|
add loader
|
2020-04-11 23:54:38 +02:00 |
|
Romain Delanoë
|
a5879e0dd5
|
Merge branch 'master' into 'production'
add checkbox m
See merge request Romulus21/portal!25
|
2020-04-11 21:16:07 +00:00 |
|
|
|
4dbd0e47d7
|
add checkbox m
|
2020-04-11 23:15:29 +02:00 |
|
Romain Delanoë
|
5c44ebcdcb
|
Merge branch 'master' into 'production'
add checkbox m
See merge request Romulus21/portal!24
|
2020-04-11 21:11:46 +00:00 |
|
|
|
c2e99da523
|
add checkbox m
|
2020-04-11 23:10:52 +02:00 |
|
Romain Delanoë
|
877ca7f050
|
Merge branch 'master' into 'production'
add hangman dictionnary & input ajustment
See merge request Romulus21/portal!23
|
2020-04-11 15:28:50 +00:00 |
|
|
|
37c4c2c090
|
add hangman dictionnary & input ajustment
|
2020-04-11 17:26:44 +02:00 |
|
Romain Delanoë
|
b204c8ab98
|
Merge branch 'master' into 'production'
update field input
See merge request Romulus21/portal!22
|
2020-04-11 10:38:29 +00:00 |
|
|
|
c7d4e69149
|
update field input
|
2020-04-11 12:37:52 +02:00 |
|
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 |
|
