Blandine Bajard
|
edeafa7151
|
Merge pull request #62 from HediMjid/dev
Dev
|
2022-03-14 09:53:55 +01:00 |
|
Blandine Bajard
|
445d318559
|
Merge pull request #61 from HediMjid/sana
coms
|
2022-03-14 09:51:53 +01:00 |
|
Sana EL HIRI
|
f731ae78fc
|
coms
|
2022-03-13 18:44:53 +01:00 |
|
Blandine Bajard
|
f76c5b9692
|
Merge pull request #58 from HediMjid/Blandine
fichier sql
|
2022-03-11 16:28:59 +01:00 |
|
Blandine Bajard
|
48c5d6d91f
|
fichier sql
|
2022-03-11 16:27:23 +01:00 |
|
AlineRinquin
|
0eccc45c56
|
Merge pull request #56 from HediMjid/sana
Sana
|
2022-03-11 15:08:37 +01:00 |
|
Sana EL HIRI
|
8f1117623b
|
modifs
|
2022-03-11 15:07:23 +01:00 |
|
AlineRinquin
|
7f2dd8d9a2
|
Merge pull request #55 from HediMjid/Blandine
comment des authorize sur menus
|
2022-03-11 14:53:00 +01:00 |
|
Blandine Bajard
|
02bd8f36c0
|
comment des authorize sur menus
|
2022-03-11 14:47:34 +01:00 |
|
Blandine Bajard
|
06deb6bc14
|
Merge pull request #54 from HediMjid/Blandine
decomment des pre autorize
|
2022-03-07 16:44:59 +01:00 |
|
Blandine Bajard
|
787d7dda37
|
decomment des pre autorize
|
2022-03-07 16:28:32 +01:00 |
|
Sana EL HIRI
|
3130169c84
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into sana
|
2022-03-07 15:07:50 +01:00 |
|
Blandine Bajard
|
4282b09307
|
Merge pull request #53 from HediMjid/sana
modif pour que le find membre by team ne récupère pas les membres sof…
|
2022-03-07 15:04:56 +01:00 |
|
Sana EL HIRI
|
05810f6031
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into sana
|
2022-03-06 22:08:05 +01:00 |
|
Sana EL HIRI
|
901247fb99
|
modif pour que le find membre by team ne récupère pas les membres soft deleted
|
2022-03-06 20:52:38 +01:00 |
|
Hédi
|
4f38637cc4
|
Merge pull request #52 from HediMjid/cecile
Cecile
|
2022-03-06 19:12:10 +01:00 |
|
cecilesimplon93
|
aaa3ba5333
|
modif smiley avec bdd
|
2022-03-06 15:48:43 +01:00 |
|
cecilesimplon93
|
ce8c57b5ac
|
cecile
|
2022-03-05 19:19:43 +01:00 |
|
Blandine Bajard
|
5ba2f1c9fd
|
Merge pull request #51 from HediMjid/sana
avancées
|
2022-03-04 16:15:41 +01:00 |
|
Sana EL HIRI
|
3f00f674ca
|
avancées
|
2022-03-04 16:11:48 +01:00 |
|
Blandine Bajard
|
c2f2fcd23e
|
Merge pull request #48 from HediMjid/sana
modif team et membre controller
|
2022-03-03 09:48:22 +01:00 |
|
Sana EL HIRI
|
20382c2d1b
|
modif team et membre controller
|
2022-03-02 19:18:33 +01:00 |
|
Blandine Bajard
|
294712656a
|
Merge pull request #47 from HediMjid/Blandine
Blandine
|
2022-03-01 18:00:42 +01:00 |
|
Blandine Bajard
|
057530cb29
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-03-01 17:45:58 +01:00 |
|
Blandine Bajard
|
ff1df20b1f
|
order by date menu
|
2022-03-01 17:45:51 +01:00 |
|
cecilesimplon93
|
9be7dc59e5
|
Merge branch 'dev' into cecile
|
2022-03-01 13:47:24 +01:00 |
|
cecilesimplon93
|
5f9c0acdc3
|
ajout humeur 1 par défaut
|
2022-03-01 13:46:09 +01:00 |
|
Hédi
|
69483609d8
|
Merge pull request #46 from HediMjid/isa
add to do list
|
2022-02-27 18:04:20 +01:00 |
|
HarmandI
|
4f7834a9a6
|
add to do list
|
2022-02-27 17:27:47 +01:00 |
|
Hédi
|
cfbe212c88
|
Merge pull request #45 from HediMjid/forgot-reset-password
Forgot reset password
|
2022-02-27 14:20:33 +01:00 |
|
Hedi MJID
|
d56a795854
|
refacto forget/reset password
|
2022-02-26 19:21:50 +01:00 |
|
Hedi MJID
|
c9fcdb5764
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-26 13:56:05 +01:00 |
|
AlineRinquin
|
a7b20b51e8
|
Merge pull request #44 from HediMjid/sana
ajout crossOrgins sur mail
|
2022-02-26 13:00:09 +01:00 |
|
Sana EL HIRI
|
c6e0aa036a
|
ajout crossOrgins sur mail
|
2022-02-25 18:53:57 +01:00 |
|
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 |