civicrm-core.git
6 years agoremoved an old stray sql file 5.0.0-fsf
Andrew Engelbrecht [Wed, 25 Apr 2018 14:34:38 +0000 (10:34 -0400)]
removed an old stray sql file

6 years agore-added LATEX_LETTER constant
Andrew Engelbrecht [Fri, 13 Apr 2018 19:52:02 +0000 (15:52 -0400)]
re-added LATEX_LETTER constant

it turns out that we need this. (i removed it in the previous git
merge.)

6 years agoMerge tag '5.0.0' into 5.0.0-fsf
Andrew Engelbrecht [Fri, 13 Apr 2018 15:30:03 +0000 (11:30 -0400)]
Merge tag '5.0.0' into 5.0.0-fsf

6 years agoCorrected thankyou template, see RT#1286518 4.7.31-fsf-attempt-0
Ruben Rodriguez [Thu, 12 Apr 2018 16:50:26 +0000 (12:50 -0400)]
Corrected thankyou template, see RT#1286518

6 years agoBIG HACK: Corrected frequency calculation for new members
Ruben Rodriguez [Mon, 12 Mar 2018 23:47:35 +0000 (19:47 -0400)]
BIG HACK: Corrected frequency calculation for new members

6 years agoupdated function documentation
Andrew Engelbrecht [Fri, 19 Jan 2018 05:46:30 +0000 (00:46 -0500)]
updated function documentation

6 years agorevert commit that modified getRecurDetails()
Andrew Engelbrecht [Fri, 19 Jan 2018 02:16:08 +0000 (21:16 -0500)]
revert commit that modified getRecurDetails()

we aren't quite sure what this was supposed to do, but this patch was
breaking our site, and it now works with these changes reverted.

6 years agoThis version of the TC code is no longer in use
Andrew Engelbrecht [Tue, 16 Jan 2018 18:31:27 +0000 (13:31 -0500)]
This version of the TC code is no longer in use

the code in org.fsf.payment.trustcommerce was used, and will continue to
be used for the time being.

6 years agocorrected variable name
Andrew Engelbrecht [Fri, 12 Jan 2018 22:19:17 +0000 (17:19 -0500)]
corrected variable name

this code was moved from another location during a git rebase, and the a
variable name needed to change.

6 years agoSort by country,second_name,first_name for pdf generation of international mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:29:39 +0000 (12:29 -0500)]
Sort by country,second_name,first_name for pdf generation of international mailings

(change currently disabled / commented out -- sudoman)

6 years agoDisable recipient estimation on mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:28:43 +0000 (12:28 -0500)]
Disable recipient estimation on mailings

6 years agoCorrected TeX ligatures for pdf letters
Ruben Rodriguez [Mon, 13 Nov 2017 22:53:57 +0000 (17:53 -0500)]
Corrected TeX ligatures for pdf letters

6 years agoFilter groups according to included profiles
Andrew Engelbrecht [Mon, 25 Sep 2017 22:34:51 +0000 (18:34 -0400)]
Filter groups according to included profiles

This is a continuation of the contact groups filtering feature, which
allows admins to filter the public listings of contact groups on various
Civi pages by setting a Drupal variable with drush.

It is now possible to set a rule for a profile and for that rule to
automatically apply to standalone profile pages, contribution pages that
include the profile, and event pages that include it as well.

See comments in CRM/Contact/Form/Edit/TagsAndGroups.php for instructions
on how to set the variable via drush.

6 years agoAllow admin to change the names of filtered groups
Andrew Engelbrecht [Mon, 18 Sep 2017 22:19:40 +0000 (18:19 -0400)]
Allow admin to change the names of filtered groups

This feature lets one mimic a custom field by allowing admins to change
the text that appears next to each group's check box, via drush.

The json format is a bit more nested, but indented json can be used. An
exmple is included in CRM/Contact/Form/Edit/TagsAndGroups.php.

6 years agoGroups filter hack for smaller groups listings
Andrew Engelbrecht [Fri, 15 Sep 2017 20:15:10 +0000 (16:15 -0400)]
Groups filter hack for smaller groups listings

This change is a dirty hack that lets site admins filter the "Contacts
Group(s)" field output in select profiles. This reduces overwhem for
users when they are making a donation or filling out a form with the
Groups signup field. This is preferable to using a custom field with
smart groups because the Groups field provides double opt-in, while
custom fields do not.

The filter is controlled via a json string stored in a drupal variable
that can be set with drush like so:

drush vset --format=string groups_field_filters "{...}"

See the documentation marked with "sudoman hack" in
CRM/Contact/Form/Edit/TagsAndGroups.php for an example.

6 years agoremove unneeded file not deleted in git rebase
Andrew Engelbrecht [Wed, 19 Jul 2017 21:28:47 +0000 (17:28 -0400)]
remove unneeded file not deleted in git rebase

6 years agoremove unneeded file (latex.patch)
Andrew Engelbrecht [Wed, 19 Jul 2017 20:31:29 +0000 (16:31 -0400)]
remove unneeded file (latex.patch)

this was apparently not removed in the git rebase.

6 years agoComment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup

6 years agoUpdated the LaTeX header for letters
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters

6 years agoAdded hack for scaping curly brackets on smarty LaTeX templates
Ruben Rodriguez [Fri, 10 Jun 2016 19:06:07 +0000 (15:06 -0400)]
Added hack for scaping curly brackets on smarty LaTeX templates

6 years agoTuned up PdfLatex font settings
Ruben Rodriguez [Fri, 10 Jun 2016 19:05:21 +0000 (15:05 -0400)]
Tuned up PdfLatex font settings

6 years agoredisabling mail tracking
k [Tue, 15 Mar 2016 17:41:14 +0000 (13:41 -0400)]
redisabling mail tracking

6 years agoredoing replacement of "Confirm Contribution" with "Review Contribution"
k [Tue, 15 Mar 2016 17:37:59 +0000 (13:37 -0400)]
redoing replacement of "Confirm Contribution" with "Review Contribution"

6 years agoSolving RT ticket #1092988
k [Tue, 15 Mar 2016 17:13:26 +0000 (13:13 -0400)]
Solving RT ticket #1092988
adding civicrm ID to contributin record

6 years agoreverted js changes back to upstream
Lisa Marie Maginnis [Thu, 15 Oct 2015 03:10:17 +0000 (23:10 -0400)]
reverted js changes back to upstream

6 years agoipn receiver for external api
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:33:03 +0000 (13:33 -0400)]
ipn receiver for external api

6 years agoPriceset 2nd half
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:53 +0000 (13:28 -0400)]
Priceset 2nd half

6 years agoPriceset/debugwatchdog
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:43 +0000 (13:28 -0400)]
Priceset/debugwatchdog

6 years agoRemoved cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact

6 years agoRT#765026, patch for null values in civicrm_acl_cache
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache

6 years agoAdded the current uncommited changes to production code, and rebased to 4.6.8
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8

6 years agoAdditional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex

6 years agoOur changes
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes

6 years agoSet version to 5.0.0
CiviCRM [Thu, 5 Apr 2018 06:06:34 +0000 (06:06 +0000)]
Set version to 5.0.0

6 years agoMerge pull request #11924 from JMAConsulting/dev-42
Tim Otten [Wed, 4 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Merge pull request #11924 from JMAConsulting/dev-42

(dev/mail/6) Fix recipient calculation when system has mixed records. Add multilingual test.

6 years agoMerge pull request #11940 from agh1/5.0.0-release-notes-update
Eileen McNaughton [Wed, 4 Apr 2018 19:05:58 +0000 (07:05 +1200)]
Merge pull request #11940 from agh1/5.0.0-release-notes-update

5.0.0 release notes: last-minute change merged

6 years ago5.0.0 release notes: René Olivo works for CompuCorp
Andrew Hunt [Wed, 4 Apr 2018 16:06:10 +0000 (12:06 -0400)]
5.0.0 release notes: René Olivo works for CompuCorp

6 years ago5.0.0 release notes: last-minute change merged
Andrew Hunt [Wed, 4 Apr 2018 15:17:26 +0000 (11:17 -0400)]
5.0.0 release notes: last-minute change merged

6 years ago5.0.0 release notes (#11931)
Andrew Hunt [Wed, 4 Apr 2018 10:15:56 +0000 (06:15 -0400)]
5.0.0 release notes (#11931)

* 5.0.0 release notes: raw from script

* 5.0.0 release notes: starting from the top

* 5.0.0 release notes: finished features next steps start with bugs

* 5.0.0 release notes: a few more bugs

* 5.0.0 release notes: cleaning up

* 5.0.0 release notes: fixed up features and bugs sections

* 5.0.0 release notes: updated contributors and boilerplate

* 5.0.0 release notes: late changes to RC

6 years agoMerge pull request #11932 from colemanw/8
Eileen McNaughton [Wed, 4 Apr 2018 05:42:10 +0000 (17:42 +1200)]
Merge pull request #11932 from colemanw/8

Core/8 - Fix fatal error on Print/Merge Document for cases

6 years agoCore/8 - Fix fatal error on Print/Merge Document for cases
Coleman Watts [Tue, 3 Apr 2018 14:52:08 +0000 (10:52 -0400)]
Core/8 - Fix fatal error on Print/Merge Document for cases

Conflicts:
CRM/Case/Form/Task.php

6 years agoMerge pull request #11928 from seamuslee001/case_pre_process_task
Eileen McNaughton [Wed, 4 Apr 2018 01:36:15 +0000 (13:36 +1200)]
Merge pull request #11928 from seamuslee001/case_pre_process_task

Re Add CRM_Case_Form_Task::PreProcessCommon()

6 years agoRe Add CRM_Case_Form_Task::PreProcessCommon()
Seamus Lee [Tue, 3 Apr 2018 21:44:07 +0000 (07:44 +1000)]
Re Add CRM_Case_Form_Task::PreProcessCommon()

Simplify down and use parent PreProcess function

6 years ago(dev/mail/6) additional fix and added unit test
deb.monish [Tue, 3 Apr 2018 06:37:55 +0000 (12:07 +0530)]
(dev/mail/6) additional fix and added unit test

6 years agoMerge pull request #11917 from eileenmcnaughton/cont_report
Eileen McNaughton [Mon, 2 Apr 2018 19:28:39 +0000 (07:28 +1200)]
Merge pull request #11917 from eileenmcnaughton/cont_report

CRM-21831 & dev/report/issues/1 Fix regressions in contribution detail report relating to soft credits

6 years agoMerge pull request #11919 from eileenmcnaughton/top
Eileen McNaughton [Mon, 2 Apr 2018 19:27:50 +0000 (07:27 +1200)]
Merge pull request #11919 from eileenmcnaughton/top

Fix fatal on topDonor report

6 years agoFix fatal on topDonor report
eileen [Mon, 2 Apr 2018 08:46:09 +0000 (20:46 +1200)]
Fix fatal on topDonor report

6 years agoMerge pull request #11914 from seamuslee001/CRM-21244-doc
Eileen McNaughton [Sun, 1 Apr 2018 22:51:46 +0000 (10:51 +1200)]
Merge pull request #11914 from seamuslee001/CRM-21244-doc

CRM-21244 Update documetnation so it makes sense when setting is disabled

6 years agoFix bugs in contribution detail report relating to soft credits
eileen [Sun, 1 Apr 2018 22:36:01 +0000 (10:36 +1200)]
Fix bugs in contribution detail report relating to soft credits

6 years agoMerge pull request #11906 from JMAConsulting/dev-42
Eileen McNaughton [Sun, 1 Apr 2018 21:50:04 +0000 (09:50 +1200)]
Merge pull request #11906 from JMAConsulting/dev-42

(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMerge pull request #11905 from seamuslee001/CRM-21244-consistancy
Monish Deb [Sun, 1 Apr 2018 11:57:37 +0000 (17:27 +0530)]
Merge pull request #11905 from seamuslee001/CRM-21244-consistancy

CRM-21244 Ensure consistancy with previous behavior where user emails …

6 years agoMerge pull request #11911 from JMAConsulting/dev-7
Seamus Lee [Sat, 31 Mar 2018 22:08:58 +0000 (08:08 +1000)]
Merge pull request #11911 from JMAConsulting/dev-7

(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years agoUpdate documetnation so it makes sense when setting is disabled
Seamus Lee [Sat, 31 Mar 2018 21:27:27 +0000 (07:27 +1000)]
Update documetnation so it makes sense when setting is disabled

6 years agoCRM-2144 Ensure consistancy with previous behavior where user emails are first then...
Seamus Lee [Sat, 31 Mar 2018 00:23:57 +0000 (11:23 +1100)]
CRM-2144 Ensure consistancy with previous behavior where user emails are first then system from emails.

Add unit test to try to verify order of emails

Fix issue where email was not being used as array key causing wrong email to be used

6 years ago(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count
deb.monish [Sat, 31 Mar 2018 11:58:02 +0000 (17:28 +0530)]
(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years ago(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient...
deb.monish [Sat, 31 Mar 2018 09:49:45 +0000 (15:19 +0530)]
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMerge pull request #11904 from totten/5.0-preview-regr
Monish Deb [Sat, 31 Mar 2018 07:25:06 +0000 (12:55 +0530)]
Merge pull request #11904 from totten/5.0-preview-regr

(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

6 years ago(dev/mail/5) "New Mailing" - Previews should not schedule real blasts
Tim Otten [Fri, 30 Mar 2018 22:02:42 +0000 (15:02 -0700)]
(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

In `CRM_Mailing_BAO_Mailing::create` and `Mailing.create` API, there is a
(*ahem*) special behavior where setting the `scheduled_date` will
immediately trigger scheduling.  One shouldn't submit `scheduled_date` for a
preview.

This was not symptomatic before #11142/v4.7.31 because all preview
operations were wrapped in a transaction and rolled back.  But now previews
are allowed to have side-effects, so we need some other means to prevent.

This copies the workaround from `crmMailingMgr.save()` and applies
it to `crmMailingMgr.preview()` (etal).

6 years agoMerge pull request #11829 from eileenmcnaughton/rules
Eileen McNaughton [Fri, 23 Mar 2018 01:13:44 +0000 (14:13 +1300)]
Merge pull request #11829 from eileenmcnaughton/rules

Fix regression on CiviRules search due to exception handling

6 years agoMerge pull request #11828 from eileenmcnaughton/revert
colemanw [Fri, 23 Mar 2018 00:58:52 +0000 (20:58 -0400)]
Merge pull request #11828 from eileenmcnaughton/revert

Revert "CRM-8140: Not possible to select fields for export when using Custom Searches"

6 years agoMerge pull request #11861 from eileenmcnaughton/task
Eileen McNaughton [Thu, 22 Mar 2018 21:41:09 +0000 (10:41 +1300)]
Merge pull request #11861 from eileenmcnaughton/task

Fix bugs with hook params, functionality on contact searches

6 years agoFix bug where search does not load if print is disabled.
eileen [Thu, 22 Mar 2018 12:10:08 +0000 (01:10 +1300)]
Fix bug where search does not load if print is disabled.

This was picked up in QA on search task changes & I was able to replicate - this fixes

6 years agoFix regression (intra-rc) where entity not passed to hook, and fix CRM-21841 as by...
eileen [Thu, 22 Mar 2018 11:49:02 +0000 (00:49 +1300)]
Fix regression (intra-rc) where entity not passed to hook, and fix CRM-21841 as by-product.

The self::objectType is passing NULL - the object type on the parent.

Switching to static::objectType uses the child.

https://stackoverflow.com/questions/1912902/what-exactly-are-late-static-bindings-in-php

6 years agoMerge pull request #11837 from agileware/CRM-21764-5.0
Eileen McNaughton [Thu, 22 Mar 2018 07:22:54 +0000 (20:22 +1300)]
Merge pull request #11837 from agileware/CRM-21764-5.0

CRM-21764: Recurring Events without Price Set fail to save

6 years agoCRM-21764: Recurring Events without Price Set fail to save.
Alok Patel [Tue, 20 Mar 2018 03:41:11 +0000 (13:41 +1000)]
CRM-21764: Recurring Events without Price Set fail to save.

6 years agoMerge pull request #11848 from jitendrapurohit/CRM-21848-test
Eileen McNaughton [Wed, 21 Mar 2018 10:26:25 +0000 (23:26 +1300)]
Merge pull request #11848 from jitendrapurohit/CRM-21848-test

CRM-21848 - Add unit test for on_hold mailing recipients

6 years agoCRM-21848 - Add unit test for on_hold mailing recipients
Jitendra Purohit [Wed, 21 Mar 2018 06:59:03 +0000 (12:29 +0530)]
CRM-21848 - Add unit test for on_hold mailing recipients

6 years agoMerge pull request #11846 from eileenmcnaughton/mail_hold
Eileen McNaughton [Wed, 21 Mar 2018 06:54:41 +0000 (19:54 +1300)]
Merge pull request #11846 from eileenmcnaughton/mail_hold

Fix issue where on_hold email addresses are not being filtered out of

6 years agoFix issue where on_hold email addresses are not being filtered out of
Darrick Servis [Mon, 19 Mar 2018 23:14:18 +0000 (16:14 -0700)]
Fix issue where on_hold email addresses are not being filtered out of
recipient list for mailings.

6 years agoMerge pull request #11827 from eileenmcnaughton/fix_wp
colemanw [Mon, 19 Mar 2018 06:16:49 +0000 (02:16 -0400)]
Merge pull request #11827 from eileenmcnaughton/fix_wp

Fix page layout for wordpress (dev/core/issues/21)

6 years agoFix regression on CiviRules search due to exception handling
eileen [Mon, 19 Mar 2018 04:28:00 +0000 (17:28 +1300)]
Fix regression on CiviRules search due to exception handling

6 years agoRevert "CRM-8140: Not possible to select fields for export when using Custom Searches"
eileen [Mon, 19 Mar 2018 03:18:18 +0000 (16:18 +1300)]
Revert "CRM-8140: Not possible to select fields for export when using Custom Searches"

This reverts commit ce40afac219b38872fef1d8f052c38d85667db79.

6 years agoFix page layout for wordpress
eileen [Mon, 19 Mar 2018 01:27:31 +0000 (14:27 +1300)]
Fix page layout for wordpress

6 years agoset-version.php - Fix for running on uninitialized codebase
CiviCRM [Thu, 15 Mar 2018 23:06:29 +0000 (23:06 +0000)]
set-version.php - Fix for running on uninitialized codebase

The script assumes that `civicrm-version.php` is around. It will eventually be
committed, and it's available if you ran GenCode, but it's not *necessarily*
around yet.

6 years agoDowngrade number from 5.0.0 to 5.0.beta1
CiviCRM [Thu, 15 Mar 2018 23:05:08 +0000 (23:05 +0000)]
Downgrade number from 5.0.0 to 5.0.beta1

We're about to branch for RC period. Since we've got the third digit again
(for use in each monthly cycle), let's take advantage of it!

6 years agoMerge pull request #11815 from eileenmcnaughton/notice
Eileen McNaughton [Thu, 15 Mar 2018 11:20:17 +0000 (00:20 +1300)]
Merge pull request #11815 from eileenmcnaughton/notice

Activity Form - Fix recently introduced warning

6 years agoMerge pull request #11519 from eileenmcnaughton/hook
Eileen McNaughton [Thu, 15 Mar 2018 07:48:20 +0000 (20:48 +1300)]
Merge pull request #11519 from eileenmcnaughton/hook

CRM-21659 - Add hook to CRM_Utils_System::redirect

6 years agoCRM_Utils_Hook::alterRedirect - Pass URL by reference
Tim Otten [Thu, 15 Mar 2018 05:19:49 +0000 (22:19 -0700)]
CRM_Utils_Hook::alterRedirect - Pass URL by reference

PSR-7 specifies that the `UriInterface` is immutable.  There are methods
like `withQuery(...)` which generate a *new instance*.

For the hook to support altering the URL, you must be able to replace the
`$url` with a newer instance.

6 years agoWarning fix
eileen [Thu, 15 Mar 2018 04:21:44 +0000 (17:21 +1300)]
Warning fix

6 years agoMerge pull request #11813 from seanmadsen/add-survey-pre-post-hooks
Eileen McNaughton [Thu, 15 Mar 2018 02:28:25 +0000 (15:28 +1300)]
Merge pull request #11813 from seanmadsen/add-survey-pre-post-hooks

Add pre and post hooks to the Survey entity

6 years agoMerge pull request #11811 from mukeshcompucorp/fix-template-structure-issues
Eileen McNaughton [Wed, 14 Mar 2018 22:59:14 +0000 (11:59 +1300)]
Merge pull request #11811 from mukeshcompucorp/fix-template-structure-issues

Fix transaction template

6 years agoMerge pull request #11704 from totten/master-50
Eileen McNaughton [Wed, 14 Mar 2018 22:32:14 +0000 (11:32 +1300)]
Merge pull request #11704 from totten/master-50

dev/release/1 - Change numbering to 5.x.x

6 years agoAdd pre/post hooks to the Survey entity
Sean Madsen [Wed, 14 Mar 2018 21:31:47 +0000 (17:31 -0400)]
Add pre/post hooks to the Survey entity

Also improve docblock

6 years agoMerge pull request #11808 from mattwire/CRM-21391_find_respondents_fix
Eileen McNaughton [Wed, 14 Mar 2018 21:04:35 +0000 (10:04 +1300)]
Merge pull request #11808 from mattwire/CRM-21391_find_respondents_fix

CRM-21391 Fix for "Find Respondents" Search

6 years agoCRM-21391 Fix 'Find Respondents' Search Tasks
Matthew Wire [Wed, 14 Mar 2018 11:50:48 +0000 (11:50 +0000)]
CRM-21391 Fix 'Find Respondents' Search Tasks

6 years agoFix transaction templates
Mukesh Ram [Wed, 14 Mar 2018 11:36:04 +0000 (17:06 +0530)]
Fix transaction templates

6 years agoCRM-21659 Add hook to CRM_Utils_System::redirect
eileen [Wed, 14 Mar 2018 02:00:15 +0000 (15:00 +1300)]
CRM-21659 Add hook to CRM_Utils_System::redirect

fixup CRM-21659 Add hook to CRM_Utils_System::redirect

This renames the hook function to be stylistically more consistent.  In
other tests, the function name matches the hook name.

6 years agoSet version to 5.0.0
Tim Otten [Wed, 21 Feb 2018 23:41:21 +0000 (15:41 -0800)]
Set version to 5.0.0

6 years agoMerge pull request #11721 from eileenmcnaughton/website
colemanw [Tue, 13 Mar 2018 13:06:12 +0000 (09:06 -0400)]
Merge pull request #11721 from eileenmcnaughton/website

Fix relationshipType, paymentProcessorType, Note & jobLog apis to support custom data

6 years agoMerge pull request #11590 from michaelmcandrew/CRM-21576-sms-permission
colemanw [Tue, 13 Mar 2018 13:02:06 +0000 (09:02 -0400)]
Merge pull request #11590 from michaelmcandrew/CRM-21576-sms-permission

CRM-21576 Add a 'send SMS' permission

6 years agoMerge pull request #11796 from mukeshcompucorp/fix-template-structure-issues
colemanw [Tue, 13 Mar 2018 12:10:45 +0000 (08:10 -0400)]
Merge pull request #11796 from mukeshcompucorp/fix-template-structure-issues

Fix html template structure with classes, divs & tags

6 years agoAdding Send SMS permission + test + upgrade message
Michael McAndrew [Tue, 13 Mar 2018 09:18:36 +0000 (09:18 +0000)]
Adding Send SMS permission + test + upgrade message

6 years agoMerge pull request #11801 from eileenmcnaughton/api_test
Monish Deb [Tue, 13 Mar 2018 07:47:00 +0000 (13:17 +0530)]
Merge pull request #11801 from eileenmcnaughton/api_test

Add test for api money, fix net_amount calc

6 years agoMerge pull request #11802 from jitendrapurohit/CRM-21777-ts
Eileen McNaughton [Tue, 13 Mar 2018 07:20:02 +0000 (20:20 +1300)]
Merge pull request #11802 from jitendrapurohit/CRM-21777-ts

CRM-21777 - add ts to the message string

6 years agoCall labels from logic instead of static
Mukesh Ram [Tue, 13 Mar 2018 05:35:18 +0000 (11:05 +0530)]
Call labels from logic instead of static

6 years agoCRM-21777 - add ts to the message string
Jitendra Purohit [Tue, 13 Mar 2018 05:13:43 +0000 (10:43 +0530)]
CRM-21777 - add ts to the message string

6 years agoAdd test for api money, fix net_amount calc
eileen [Tue, 13 Mar 2018 03:24:23 +0000 (16:24 +1300)]
Add test for api money, fix net_amount calc

6 years agoMerge pull request #11781 from colemanw/MenuHacks
Eileen McNaughton [Tue, 13 Mar 2018 01:04:10 +0000 (14:04 +1300)]
Merge pull request #11781 from colemanw/MenuHacks

Remove hacks from CRM_Core_Menu for old unsupported versions

6 years agoMerge pull request #11799 from eileenmcnaughton/enotice
Eileen McNaughton [Mon, 12 Mar 2018 23:36:11 +0000 (12:36 +1300)]
Merge pull request #11799 from eileenmcnaughton/enotice

E-notice fix.

6 years agoE-notice fix - move variable declaration to parent class.
eileen [Mon, 12 Mar 2018 08:02:29 +0000 (21:02 +1300)]
E-notice fix - move variable declaration to parent class.

I hit this when editing a contribution with line items related to membership.