Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ft/vil 561 #982

Merged
merged 121 commits into from
Sep 9, 2024
Merged

Ft/vil 561 #982

merged 121 commits into from
Sep 9, 2024

Conversation

SimNed
Copy link
Collaborator

@SimNed SimNed commented Sep 9, 2024

Motivation

Changes

Test

guillaume-pages and others added 30 commits November 21, 2023 12:25
@guillaume-pages
add folder expression and file index.tsx
ef8c8f0
@guillaume-pages
for stash
208103f
@guillaume-pages
add new type
cea85c9
add a file game config in a new folder config for standardization
cf00f50
@guillaume-pages
Merge branch 'game_expression' of https://github.com/parlemonde/1village
cdb7562 
 into game_expression
@guillaume-pages
standardisation
ebccc22
@guillaume-pages
modif config game
e4e6795
@guillaume-pages
New feature game expression and money : add a context for all game, r…
021ab54 
…efactor useCurrencies and useLanguages, component CreateGame whit some component about different types of input comming from game config. To fix : some errors typescript in GameSelect.tsx
@guillaume-pages
Fix some lint
264949b
@guillaume-pages
Fix typescript error
3b67f35
@guillaume-pages
Feature : hidden input when userSelection is === Français
bb0882e
@guillaume-pages
add a variable gameResponse in gameContext and remove some import not…
d4a4d16 
… use
@guillaume-pages
fix eslint & ts
ee6e0dc
@nathan7594
Merge branch 'game_expression' of https://github.com/parlemonde/1village
37d4687 
 into game_monnaie
@guillaume-pages
save of all information during the user create the game
cf4b742
@guillaume-pages
forgot to remove a console.log
cb56e0b
@guillaume-pages
modif de style
e2d9190
@nathan7594
Ajout du jeux monnaie fonctionnelle
8c12255
@guillaume-pages
Merge branch 'game_monnaie' of https://github.com/parlemonde/1village …
747c573 
…into game_expression
@nathan7594
Merge branch 'game_expression' of https://github.com/parlemonde/1village
152a640 
 into game_monnaie
@nathan7594
Changement deux trois truc
2958e6f
@guillaume-pages
Merge branch 'master' of https://github.com/parlemonde/1village into …
7144e82 
…game_expression
@guillaume-pages
Standardization of components, creation of a variable which copies th…
2ba5f30 
…e config in order to add the responses. Reworked GameContext
@guillaume-pages
reworked folder monnaie
61a641e
@guillaume-pages
add a null possibility on gameType in file activitychoice/index.tsx
c29a3fc
@guillaume-pages
Displaying the input.selectedValue when they have been populated
ae554fe
@guillaume-pages
add component GameMedia
f8fc952
@guillaume-pages
display component image ok
0b3a5ed
@guillaume-pages
component media video ok
61b9f08
@nathan7594
Push ajout de fonctionnalité
4e27c73
guillaume-pages and others added 26 commits March 19, 2024 15:14
@guillaume-pages
remove old mimic game
681d8dc
@guillaume-pages
correction route
41eadc9
@guillaume-pages
fix display bug
035eedf
@guillaume-pages
fix ticket VIL-144
0dbcb90
@guillaume-pages
merge master into VIL-144
6917255
@guillaume-pages
Code commenté, indice culturel et présenter un symbole phase 1 ne son…
46d0daf 
…t plus visible
@guillaume-pages
ajout des deux formulaires sur les modal de phase - VIL-548
42a0c7d
@nathan7594
create user
bab043a
@nathan7594
Merge branch 'master' into VIL-144
2d452da
@nathan7594
Push pour staging
a6d98cc
@nathan7594
Merge branch 'VIL-144' of https://github.com/parlemonde/1village into…
52993f8 
… VIL-144
@nathan7594
Push for merge game in staging
721fff4
@nathan7594
Push
fd19186
@nathan7594
Test
180d500
@guillaume-pages
Merge branch 'hotfix_village_24/25' of github.com:parlemonde/1village…
6b7058b 
… into hotfix_village_24/25
@guillaume-pages
pull master into hotfix_village_24/25
05e60ce
@guillaume-pages
hotfix VIL-567 - modif UI bouton et affichage date
fa33883
@guillaume-pages
Merge pull request #977 from parlemonde/VIL-144
5684334 
Vil 144
@SimNed
update CGU text
6c2a847
@SimNed
change nav activities order
5e64bf7
@SimNed
change links order
a1b3321
@SimNed
Merge pull request #979 from parlemonde/VIL-549
c953884 
Vil 549
@guillaume-pages
Merge branch 'master' of github.com:parlemonde/1village into hotfix_v…
998ad14 
…illage_24/25
@guillaume-pages
Merge pull request #980 from parlemonde/hotfix_village_24/25
7ce9e78 
Hotfix village 24/25
@SimNed
add TeamComments component
2dc5038
@SimNed
add code for apostrophe
42eeaaf
@SimNed SimNed requested a review from MelissaOlas September 9, 2024 09:18
@SimNed SimNed merged commit 02c90bd into dashboard-stat-v4 Sep 9, 2024
4 checks passed
@SimNed SimNed deleted the ft/VIL-561 branch September 9, 2024 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MelissaOlas MelissaOlas MelissaOlas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SimNed @MelissaOlas @guillaume-pages @nathan7594