Merge in civicrm/drupal from Dec 15, 2015 to June 21, 2017 #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CRM-17742 - Added load_generated_data option when installing CiviCRM.
CRM-17646 - Refactor out CRM_Core_BAO_CustomField::getDisplayValue
CRM-15768: Correct module version
Fix syntax error
Return the conf array when calling civicrm-sql-conf so it can be used elsewhere
CRM-17871: Improve administration forms, add debug mode
CRM-18088: Contribution page ID contextual filter
CRM-18138: Use contact ID from UF match, not CMS email
…configureable sync limit to avoid timeouts.
…tting through Drupal Views.
CRM-18326. Support displaying currency amounts as raw value.
… to avoid PHP timeout Conflicts: drush/civicrm.drush.inc
Don't look for Wordpress in a Drupal installation
Updated role sync to support multiple synchronization methods
CRM-19545: Revert CRM-18776 to get back missing custom fields
CRM-19910: modify sub type filter handler
CRM-20186 - Expose legal name in views
CRM-20319 - Expose relationship permission to views
CRM-20502 - Do not get custom group tree into cache if we are upgrading
7.x 4.7.19 rc
CRM-20462 - Add filter for current employer in views
Improve Views checkbox value handling
Fix passing null object
CRM-20205 - Expose current employer id to views
This reverts commit 00406a5.
WIP: CRM-20751: Support Drupal aliases for event links in Views
CRM-20751 - Handle array query data in civicrm_views_url
|
@colemanw @totten I did a PR of all the commits from when civicrm-backdrop diverged from civicrm-drupal and fixed the merge conflicts. Even though it's a large number of small changes, it makes life a lot easier than making a PR for each commit. Are you okay with this? I've done some manual testing of this branch and no issues thus far. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #35. Adjusted code to ensure it will work with Backdrop.