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

Sync master with staging #2594

Merged
merged 263 commits into from
May 1, 2018
Merged

Sync master with staging #2594

merged 263 commits into from
May 1, 2018

Conversation

davialexandre
Copy link
Member

@davialexandre davialexandre commented Apr 30, 2018

Pull requests included:

@AkA84:

@ajesamson:

@igorpavlov:

@mickadoo:

@reneolivo:

@tunbola:

mickadoo and others added 30 commits March 7, 2018 12:40
I realized (too late) that civicrm_navigation does not use any unique
constraint on menu item name, so a lot of the functions I had prepared
would be unpredictable when the item name was duplicated. I changed all
functions to use path instead of item name. Path is still not unique,
but it's much less likely to be duplicated (having the same item name in
the same submenu doesn't really make sense)
Even if we don't have clients with multiple domains, it does exist in
the test database and tests fail if this is not handled.
…isation-page

PCHR-3420: Hide Options on Localisation Page
…u-items

PCHR-3375: Add Configuration Menu Items
@mickadoo mickadoo merged commit 814af4c into master May 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants