Blandine Bajard
|
5c92159b53
|
Merge pull request #43 from HediMjid/sana
Sana
|
2022-02-25 09:57:31 +01:00 |
|
Sana EL HIRI
|
695d3c1078
|
ajout post add membre en plus de signup et modifs repo et service
|
2022-02-25 09:54:59 +01:00 |
|
Sana EL HIRI
|
65f87cf85b
|
Merge branch 'dev' into sana
|
2022-02-24 15:02:54 +01:00 |
|
Sana EL HIRI
|
127d8d72df
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-24 15:02:17 +01:00 |
|
Sana EL HIRI
|
e7d0757d49
|
commit to merge
|
2022-02-24 15:01:56 +01:00 |
|
AlineRinquin
|
156382fbff
|
Merge pull request #42 from HediMjid/aline
Aline
|
2022-02-24 15:00:35 +01:00 |
|
AlineRinquin
|
03c8a9dfc3
|
data sql menu ajour
|
2022-02-24 14:59:51 +01:00 |
|
AlineRinquin
|
8ea0f6eca3
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into aline
|
2022-02-24 13:35:40 +01:00 |
|
AlineRinquin
|
45cecb0079
|
mise a jour fichier sana
|
2022-02-24 13:35:05 +01:00 |
|
Hédi
|
df2416a5ae
|
Merge pull request #41 from HediMjid/Blandine
Blandine - menus
|
2022-02-24 12:32:33 +01:00 |
|
Blandine Bajard
|
87bbec1ba1
|
changement back sur le menu
|
2022-02-24 12:14:50 +01:00 |
|
Blandine Bajard
|
78a8b14bc9
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 18:06:23 +01:00 |
|
Sana EL HIRI
|
a91c4f652e
|
merge conflicts
|
2022-02-18 18:03:28 +01:00 |
|
AlineRinquin
|
bb5cd4b57b
|
Merge pull request #35 from HediMjid/sana
Sana
|
2022-02-18 18:01:54 +01:00 |
|
AlineRinquin
|
6cabcc4d22
|
Merge branch 'dev' into sana
|
2022-02-18 18:01:46 +01:00 |
|
AlineRinquin
|
3f1c30d8f9
|
Merge pull request #40 from HediMjid/aline
push de a branch
|
2022-02-18 17:57:35 +01:00 |
|
AlineRinquin
|
bc5a22186f
|
push de a branch
|
2022-02-18 17:56:52 +01:00 |
|
Sana EL HIRI
|
d5d186cefb
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 17:52:52 +01:00 |
|
AlineRinquin
|
a33f4a003c
|
Merge pull request #39 from HediMjid/aline
controler hors du dto
|
2022-02-18 17:52:30 +01:00 |
|
AlineRinquin
|
287deb99e5
|
controler hors du dto
|
2022-02-18 17:51:34 +01:00 |
|
Sana EL HIRI
|
4d7fe28e41
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 17:46:23 +01:00 |
|
Sana EL HIRI
|
06e48caac7
|
merge conflicts
|
2022-02-18 17:46:14 +01:00 |
|
Blandine Bajard
|
8f4fd71e4b
|
Merge pull request #38 from HediMjid/Blandine
Blandine
|
2022-02-18 17:41:43 +01:00 |
|
Blandine Bajard
|
8e43bd59aa
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-18 17:39:33 +01:00 |
|
Sana EL HIRI
|
ddb81b5734
|
Merge branch 'sana' into dev
|
2022-02-18 17:29:54 +01:00 |
|
Blandine Bajard
|
a8f693a5cb
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 17:29:51 +01:00 |
|
Blandine Bajard
|
2d4bfa7258
|
Merge branch 'Blandine' into dev
|
2022-02-18 17:29:12 +01:00 |
|
Sana EL HIRI
|
c189362601
|
Membre
|
2022-02-18 17:21:07 +01:00 |
|
Blandine Bajard
|
623c744ee9
|
menus de la semaine
|
2022-02-18 17:19:15 +01:00 |
|
AlineRinquin
|
a5a2c625e2
|
Merge pull request #33 from HediMjid/aline
modification du controleur contact et du controler membre
|
2022-02-18 17:17:31 +01:00 |
|
AlineRinquin
|
b87499ba73
|
modification du controleur contact et du controler membre
|
2022-02-18 17:16:53 +01:00 |
|
Sana EL HIRI
|
c49c926f3d
|
Merge branch 'dev' into sana
|
2022-02-18 12:02:43 +01:00 |
|
Sana EL HIRI
|
10eea5717b
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 12:02:04 +01:00 |
|
Sana EL HIRI
|
b9d3288a28
|
commit to merge
|
2022-02-18 12:01:55 +01:00 |
|
AlineRinquin
|
1498fadb3f
|
Merge pull request #32 from HediMjid/aline
re push pull du projet avec les modfs
|
2022-02-18 11:45:57 +01:00 |
|
AlineRinquin
|
34722797ee
|
re push pull du projet avec les modfs
|
2022-02-17 14:40:45 +01:00 |
|
Blandine Bajard
|
ab30810e07
|
Merge pull request #31 from HediMjid/Blandine
Blandine
|
2022-02-17 11:43:22 +01:00 |
|
Blandine Bajard
|
9c72f95494
|
addMenu
|
2022-02-17 11:42:52 +01:00 |
|
Blandine Bajard
|
e83810c9fd
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-17 11:42:24 +01:00 |
|
Blandine Bajard
|
d42c2ea70c
|
Merge pull request #30 from HediMjid/isa
Isa
|
2022-02-17 11:41:21 +01:00 |
|
Blandine Bajard
|
b93dc104cf
|
Merge pull request #28 from HediMjid/aline
Aline
|
2022-02-17 11:39:41 +01:00 |
|
HarmandI
|
eb7b7777ec
|
update tache
|
2022-02-17 11:38:46 +01:00 |
|
AlineRinquin
|
54bf69a436
|
modification des contact ajout couleur
|
2022-02-17 10:40:56 +01:00 |
|
Sana EL HIRI
|
6cb4097588
|
merge conflicts
|
2022-02-17 10:16:32 +01:00 |
|
Sana EL HIRI
|
cea4ee8690
|
merge conflicts
|
2022-02-17 10:00:18 +01:00 |
|
HarmandI
|
31ec70f02e
|
addTache
|
2022-02-15 15:39:35 +01:00 |
|
HarmandI
|
56218bd8c5
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa
|
2022-02-14 11:21:45 +01:00 |
|
Blandine Bajard
|
7aebd9f88d
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-14 11:20:15 +01:00 |
|
AlineRinquin
|
9b5a8c065c
|
Merge branch 'dev' into aline
|
2022-02-13 14:40:40 +01:00 |
|
AlineRinquin
|
8a96240fd6
|
ALINE:controller contact blocage préauthorize
|
2022-02-13 14:39:49 +01:00 |
|