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.

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

Rearange assos sidebar and hide career (fixing #331) #332

Merged

Conversation

noeamiot
Copy link
Member

@noeamiot noeamiot commented Mar 2, 2020

No description provided.

@noeamiot noeamiot linked an issue Mar 2, 2020 that may be closed by this pull request
@MercierCorentin MercierCorentin self-assigned this Mar 3, 2020
@noeamiot
Copy link
Member Author

noeamiot commented Mar 3, 2020

Should be ready to merge now !

@MercierCorentin
Copy link
Contributor

Okay, I'll test it this evening. I'm also modifying the seeders to create followed assos, followed services and joining members!

Copy link
Contributor

@MercierCorentin MercierCorentin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works but you changed the Asso/MemberController and it is not used in this case. Why?
Is it to fix #322 ?

@noeamiot
Copy link
Member Author

noeamiot commented Mar 3, 2020

Yes, this commit was a first step for #322 but it seems like I messed up with my branches ... This fix is usefull anyway, but not related to this PR.

@MercierCorentin
Copy link
Contributor

As we need history to be clean in order to search easier modifications' justifications could you cherry-pick your first commit to another branch and delete it from this branch?

@noeamiot noeamiot force-pushed the feature/rearange-assos-sidebar-and-hide-career branch from 89b0545 to becb3d8 Compare March 5, 2020 15:47
@MercierCorentin MercierCorentin merged commit 586e9c9 into develop Mar 6, 2020
@MercierCorentin MercierCorentin deleted the feature/rearange-assos-sidebar-and-hide-career branch March 6, 2020 02:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

La side bar et l'onglet career affichent des associations en trop
2 participants