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

CRM-12809 #1012

Merged
merged 2 commits into from
Jun 14, 2013
Merged

CRM-12809 #1012

merged 2 commits into from
Jun 14, 2013

Conversation

ravishnair
Copy link
Contributor

Points 1, 2, 3 and 4 of issue CRM-12809.

Ravish Nair added 2 commits June 14, 2013 18:31
----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809
----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809
@ghost ghost assigned totten Jun 14, 2013
@totten totten merged commit db7b725 into civicrm:master Jun 14, 2013
@totten
Copy link
Member

totten commented Jun 14, 2013

Looks pretty good. Good catch in also restricting the "Edit Multiple Choice Options" UI.

I merged manually and made some minor tweaks -- e.g. in the user-facing error messages, changed the phrase "Reserved Custom Group" to "reserved custom field-set" because the documentation-folks prefer that phrase.

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.

2 participants