GitLab

Mass cleanup of docblocks/code/comments

Fix returning to a smart group search after adding an activity.

CRM-15659 - Contribution Thank you page says ' will be processed every 1 week(s)'

week(s)'

Conflicts:
	templates/CRM/Contribute/Form/Contribution/ThankYou.tpl

Merge branch 4.5 into master

Fix for CRM-15557 Allow decimal 'other amount' field in priceset

Allow falsy values as custom field db defaults

CRM-15654 Contact Edit Form spacing can be improved

Fixed typo/broken links

Fix spelling mistake

CRM-15613 - Fix access to undefined property error

Particiapnt => Participant

Use if isset($field->default_value) instead of just
if ($field->default_value) so we can set a custom field database
column's default to zero.

CRM-15646 - api.setvalue: Add support for custom fields

CRM-11302 - added code which conditionally lists the group(s) that the person is unsubscribing from

https://issues.civicrm.org/jira/browse/CRM-11302

CRM-15585 - Call pre hooks from api.setvalue

Add hook_civicrm_preProcess function.

CRM-15602 Fix for logging- only regenerate timestamp triggers on requested tables

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml

CRM-15630 - ensure social media links work in email messages.

CRM-15552 Field communication_style not available to be added to profile...

CRM-15633 - Fix js on campaign dashboard tables

--CRM-10206, reverted back some changes that caused regression when crea...

CRM-15621 - prevent fatal on payment updates with Auth.net IPN

----------------------------------------
* CRM-15630: Petition add signature thank you email doesn't send correct social networking links
  https://issues.civicrm.org/jira/browse/CRM-15630

CRM-15622: Fix for incorrect Fee Amount.

CRM-15625 - Add support for contribution api honor_type_id param