Skip to content

Conditional 1.1.0 #75

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

Merged
merged 25 commits into from
Oct 17, 2016
Merged

Conditional 1.1.0 #75

merged 25 commits into from
Oct 17, 2016

Conversation

liam-middlebrook
Copy link
Member

Add Major Project Deletion

Add Conditional Form

Fix OnFloorStatus Assigned

Fix LDAP Field Removal

@liam-middlebrook
Copy link
Member Author

Not sure if we want to wait for the oidc branch to be merged into develop before v1.1.0

@mbillow
Copy link
Member

mbillow commented Sep 29, 2016

Depends on the status of @stevenmirabito and that branch. I would like to see OIDC to be in the hands of the RTPs before we continue the roll out and because of that, I think it makes sense to not include it in this release.

@liam-middlebrook
Copy link
Member Author

@mbillow that seems reasonable to me. Just wasn't sure if we wanted to bunch these both into the minor 1.1.0 release.

@liam-middlebrook
Copy link
Member Author

Before we merge this we should actually test that 0a1b79d works.

Copy link
Member

@mbillow mbillow left a comment

Choose a reason for hiding this comment

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

🚢 I'm good with this and Meghan just tested the room number changing. Do we want to pull in the PRs before we merge this?

@mbillow
Copy link
Member

mbillow commented Oct 17, 2016

Ship it! 🚢

@mbillow mbillow merged commit cba1ab3 into master Oct 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants