civicrm-core.git
6 years agoMerge pull request #10962 from eileenmcnaughton/fitems
Monish Deb [Wed, 29 Nov 2017 08:01:39 +0000 (13:31 +0530)]
Merge pull request #10962 from eileenmcnaughton/fitems

CRM-19273: Changes to Event Selections on Pending (Pay Later) Contribution Not Creating Correct Financial Items Causing Imbalance in Accounting Batch Export

6 years agoCRM-19273 fix recording of financial items when fixes changing price set values
eileen [Wed, 15 Nov 2017 21:06:25 +0000 (10:06 +1300)]
CRM-19273 fix recording of financial items when fixes changing price set values

6 years agoCRM-19723 minor code simplification
eileen [Tue, 28 Nov 2017 07:05:58 +0000 (20:05 +1300)]
CRM-19723 minor code simplification

6 years agoCRM-19273 fix fatal error when re-editing submitted price sets
eileen [Mon, 27 Nov 2017 03:14:02 +0000 (16:14 +1300)]
CRM-19273 fix fatal error when re-editing submitted price sets

6 years agoMerge pull request #10986 from eileenmcnaughton/pp
Eileen McNaughton [Wed, 29 Nov 2017 04:34:20 +0000 (17:34 +1300)]
Merge pull request #10986 from eileenmcnaughton/pp

CRM-20800 fix fatal error up updating paypal contributions

6 years agoMerge pull request #11342 from civicrm/4.7.28-rc
Eileen McNaughton [Wed, 29 Nov 2017 04:21:02 +0000 (17:21 +1300)]
Merge pull request #11342 from civicrm/4.7.28-rc

4.7.28 rc merge to master

6 years agoMerge pull request #11339 from mlutfy/4.7.28-rc-crm21455
Eileen McNaughton [Wed, 29 Nov 2017 04:19:31 +0000 (17:19 +1300)]
Merge pull request #11339 from mlutfy/4.7.28-rc-crm21455

CRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE

6 years agoMerge pull request #11341 from mlutfy/4.7.28-rc-crm21480
Eileen McNaughton [Wed, 29 Nov 2017 04:18:23 +0000 (17:18 +1300)]
Merge pull request #11341 from mlutfy/4.7.28-rc-crm21480

CRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB …

6 years agoMerge pull request #11190 from wmortada/CRM-21344
Eileen McNaughton [Wed, 29 Nov 2017 04:17:28 +0000 (17:17 +1300)]
Merge pull request #11190 from wmortada/CRM-21344

CRM-21344 - Fix documentation links in installer error messages

6 years agoMerge pull request #11161 from agileware/CRM-20787
Eileen McNaughton [Wed, 29 Nov 2017 04:09:48 +0000 (17:09 +1300)]
Merge pull request #11161 from agileware/CRM-20787

CRM-20787: For a repeating Event series. Changing price set of main event, it should be copied to all repeating events if we select 'Every event' mode.

6 years agoMerge pull request #11318 from JMAConsulting/CRM-21477
Eileen McNaughton [Wed, 29 Nov 2017 03:35:27 +0000 (16:35 +1300)]
Merge pull request #11318 from JMAConsulting/CRM-21477

CRM-21477, fixed code to display buttons on Delete premium product form

6 years agoCRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.
Mathieu Lutfy [Wed, 29 Nov 2017 03:23:27 +0000 (22:23 -0500)]
CRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.

6 years agoCRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE
Mathieu Lutfy [Wed, 29 Nov 2017 02:44:40 +0000 (21:44 -0500)]
CRM-21455 supportsFullGroupBy: MariaDB 10.2 does not support ANY_VALUE

6 years agoMerge pull request #11316 from totten/master-flex-token
Eileen McNaughton [Tue, 28 Nov 2017 07:15:01 +0000 (20:15 +1300)]
Merge pull request #11316 from totten/master-flex-token

CRM-21472 - Allow FlexMailer to take over token validation

6 years agoCRM-21472 - Flag methods made redundant by FlexMailer's validator
Tim Otten [Tue, 28 Nov 2017 05:31:19 +0000 (21:31 -0800)]
CRM-21472 - Flag methods made redundant by FlexMailer's validator

6 years agoCRM_Mailing - Flag methods made redundant by FlexMailer
Tim Otten [Tue, 28 Nov 2017 05:28:19 +0000 (21:28 -0800)]
CRM_Mailing - Flag methods made redundant by FlexMailer

6 years agoMerge pull request #11335 from civicrm/4.7.28-rc
Eileen McNaughton [Tue, 28 Nov 2017 03:21:51 +0000 (16:21 +1300)]
Merge pull request #11335 from civicrm/4.7.28-rc

Merge from rc

6 years agoCRM-21436: Fix exception on pay later contribution page. (#11317)
Jitendra Purohit [Tue, 28 Nov 2017 03:05:44 +0000 (08:35 +0530)]
CRM-21436: Fix exception on pay later contribution page. (#11317)

* CRM-21436: Fix exception on pay later contribution page.

* minor fix

* move test against master

* variable fix

6 years agoMerge pull request #11333 from samuelsov/CRM-21470b
Eileen McNaughton [Tue, 28 Nov 2017 02:24:32 +0000 (15:24 +1300)]
Merge pull request #11333 from samuelsov/CRM-21470b

CRM-21470 Ensure we don't have an empty locale

6 years agoMerge pull request #11329 from eileenmcnaughton/currency
colemanw [Tue, 28 Nov 2017 02:11:39 +0000 (21:11 -0500)]
Merge pull request #11329 from eileenmcnaughton/currency

Currency

6 years agoMerge pull request #11022 from eileenmcnaughton/components
Tim Otten [Tue, 28 Nov 2017 01:56:16 +0000 (17:56 -0800)]
Merge pull request #11022 from eileenmcnaughton/components

CRM-21218 Improve component statics flushing

6 years agoMerge pull request #10740 from eileenmcnaughton/def_country
Eileen McNaughton [Tue, 28 Nov 2017 01:43:49 +0000 (14:43 +1300)]
Merge pull request #10740 from eileenmcnaughton/def_country

CRM-19888 fix import to prefer default country when resolving states.

6 years agoMerge pull request #11332 from JMAConsulting/CRM-21486
colemanw [Mon, 27 Nov 2017 23:36:00 +0000 (18:36 -0500)]
Merge pull request #11332 from JMAConsulting/CRM-21486

CRM-21486: Support multiple test mail

6 years agoCRM-21470 Ensure we don't have an empty locale #2
Samuel Vanhove [Mon, 27 Nov 2017 21:33:57 +0000 (16:33 -0500)]
CRM-21470 Ensure we don't have an empty locale #2

6 years agoCRM-21470 Ensure we don't have an empty locale
Samuel Vanhove [Mon, 27 Nov 2017 21:22:38 +0000 (16:22 -0500)]
CRM-21470 Ensure we don't have an empty locale

6 years agoMerge pull request #11301 from jitendrapurohit/CRM-21456
Eileen McNaughton [Mon, 27 Nov 2017 21:18:22 +0000 (10:18 +1300)]
Merge pull request #11301 from jitendrapurohit/CRM-21456

CRM-21456 : Relationship end date not set when creating resolved cases

6 years agoCRM-21486: Support multiple test mail
deb.monish [Mon, 27 Nov 2017 16:57:45 +0000 (22:27 +0530)]
CRM-21486: Support multiple test mail

6 years agoMerge pull request #11330 from eileenmcnaughton/comm
Eileen McNaughton [Mon, 27 Nov 2017 03:16:33 +0000 (16:16 +1300)]
Merge pull request #11330 from eileenmcnaughton/comm

NFC, comments only

6 years agoNFC, comments only
eileen [Mon, 27 Nov 2017 02:07:28 +0000 (15:07 +1300)]
NFC, comments only

6 years agoMerge pull request #11319 from JKingsnorth/CRM-21476
Eileen McNaughton [Mon, 27 Nov 2017 01:14:01 +0000 (14:14 +1300)]
Merge pull request #11319 from JKingsnorth/CRM-21476

CRM-21476 Rename clicks to unique clicks in mailing summary report

6 years agoCRM-21365 Ensure currency param passed via api.Contribution.transact is passed to...
eileen [Sun, 26 Nov 2017 23:27:12 +0000 (12:27 +1300)]
CRM-21365 Ensure currency param passed via api.Contribution.transact is passed to processor

Change-Id: I59a5cd16499e89fbaa54594071fd396de81dfb82

6 years agoCRM-21482 improve handling for currency on form
eileen [Sun, 26 Nov 2017 23:10:46 +0000 (12:10 +1300)]
CRM-21482 improve handling for currency on form

Change-Id: I63f3f5445b39b9bd6068835ae61c3e488177ce75

6 years agoMerge pull request #11328 from colemanw/CRM-21483
colemanw [Sun, 26 Nov 2017 19:14:30 +0000 (14:14 -0500)]
Merge pull request #11328 from colemanw/CRM-21483

CRM-21483 - Move anguar module crmRouteBinder to core

6 years agoCRM-21483 - Move anguar module crmRouteBinder to core
Coleman Watts [Sun, 26 Nov 2017 16:47:22 +0000 (11:47 -0500)]
CRM-21483 - Move anguar module crmRouteBinder to core

6 years agoMerge branch '4.7.28-rc' into master
Coleman Watts [Sun, 26 Nov 2017 04:07:07 +0000 (23:07 -0500)]
Merge branch '4.7.28-rc' into master

6 years agoMerge pull request #11322 from mlutfy/4.7.28-rc-crm21481
colemanw [Sun, 26 Nov 2017 04:06:08 +0000 (23:06 -0500)]
Merge pull request #11322 from mlutfy/4.7.28-rc-crm21481

CRM-21481: 4.7.28: call rebuildMultilingalSchema().

6 years agoMerge pull request #11324 from mattwire/CRM-21214_followup_fix_crashes
colemanw [Sat, 25 Nov 2017 11:52:12 +0000 (06:52 -0500)]
Merge pull request #11324 from mattwire/CRM-21214_followup_fix_crashes

CRM-21214 Fix crashes when 'null' string is passed in via API

6 years agoFix crashes when 'null' string is passed in via API
Matthew Wire [Fri, 24 Nov 2017 17:39:09 +0000 (17:39 +0000)]
Fix crashes when 'null' string is passed in via API

6 years agoCRM-21472 - Allow FlexMailer to overload getRequiredTokens() - Comments
Tim Otten [Sat, 25 Nov 2017 01:24:05 +0000 (17:24 -0800)]
CRM-21472 - Allow FlexMailer to overload getRequiredTokens() - Comments

6 years agoCRM-21472 - Allow FlexMailer to overload checkSendable() - Comments
Tim Otten [Sat, 25 Nov 2017 01:23:48 +0000 (17:23 -0800)]
CRM-21472 - Allow FlexMailer to overload checkSendable() - Comments

6 years agoMerge pull request #11314 from omarabuhussein/CRM-21473-adding-add-note-permission
Eileen McNaughton [Fri, 24 Nov 2017 20:26:20 +0000 (09:26 +1300)]
Merge pull request #11314 from omarabuhussein/CRM-21473-adding-add-note-permission

CRM-21473: Add new permission to add contact notes and prevent users without edit contact permission to edit or delete notes

6 years agoMerge pull request #11326 from civicrm/4.7.28-rc
Eileen McNaughton [Fri, 24 Nov 2017 20:23:09 +0000 (09:23 +1300)]
Merge pull request #11326 from civicrm/4.7.28-rc

4.7.28 rc

6 years agoMerge pull request #11320 from jitendrapurohit/CRM-21446
colemanw [Fri, 24 Nov 2017 17:07:39 +0000 (12:07 -0500)]
Merge pull request #11320 from jitendrapurohit/CRM-21446

CRM-21446 - Allow case id as well as hash in inbound email processing…

6 years agoMerge pull request #11321 from mlutfy/4.7.28-rc-crm21479
colemanw [Fri, 24 Nov 2017 17:06:30 +0000 (12:06 -0500)]
Merge pull request #11321 from mlutfy/4.7.28-rc-crm21479

CRM-21479: Syntax fix for updateContributionInvoiceNumber().

6 years agoCRM-21481: 4.7.28: call rebuildMultilingalSchema().
Mathieu Lutfy [Fri, 24 Nov 2017 16:32:33 +0000 (11:32 -0500)]
CRM-21481: 4.7.28: call rebuildMultilingalSchema().

6 years agoCRM-21479: Syntax fix for updateContributionInvoiceNumber().
Mathieu Lutfy [Fri, 24 Nov 2017 15:54:13 +0000 (10:54 -0500)]
CRM-21479: Syntax fix for updateContributionInvoiceNumber().

6 years agoMerge pull request #11312 from samuelsov/CRM-21470
Mathieu Lu [Fri, 24 Nov 2017 14:34:04 +0000 (09:34 -0500)]
Merge pull request #11312 from samuelsov/CRM-21470

CRM-21470 Add support for WordPress Polylang plugin

6 years agoCRM-21446 - Allow case id as well as hash in inbound email processing to autofile...
Jitendra Purohit [Fri, 24 Nov 2017 12:31:00 +0000 (18:01 +0530)]
CRM-21446 - Allow case id as well as hash in inbound email processing to autofile emails on cases

6 years agoMerge pull request #11300 from eileenmcnaughton/towards1
Monish Deb [Fri, 24 Nov 2017 11:02:07 +0000 (16:32 +0530)]
Merge pull request #11300 from eileenmcnaughton/towards1

CRM-19273 extract code to get financial items and filter those already cancelled.

6 years agoCRM-21476 Rename clicks to unique clicks in mailing summary report
JKingsnorth [Fri, 24 Nov 2017 10:28:48 +0000 (10:28 +0000)]
CRM-21476 Rename clicks to unique clicks in mailing summary report

6 years agoCRM-21477, fixed code to display buttons on Delete premium product form
Pradeep Nayak [Fri, 24 Nov 2017 10:21:23 +0000 (15:51 +0530)]
CRM-21477, fixed code to display buttons on Delete premium product form

----------------------------------------
* CRM-21477: Buttons missing on Delete Premium product form
  https://issues.civicrm.org/jira/browse/CRM-21477

6 years agoMerge pull request #11303 from jitendrapurohit/CRM-21190
Eileen McNaughton [Thu, 23 Nov 2017 09:27:57 +0000 (22:27 +1300)]
Merge pull request #11303 from jitendrapurohit/CRM-21190

CRM-21190 - Warning message on Thankyou page on pay later membership pr…

6 years agoCRM-21190 - Warning error on Thankyou page on pay later membership priceset
Jitendra Purohit [Fri, 15 Sep 2017 14:14:02 +0000 (19:44 +0530)]
CRM-21190 - Warning error on Thankyou page on pay later membership priceset

6 years agoMerge pull request #11315 from seamuslee001/dao_participant_update
Eileen McNaughton [Thu, 23 Nov 2017 04:13:29 +0000 (17:13 +1300)]
Merge pull request #11315 from seamuslee001/dao_participant_update

NFC rerun setup.sh -dg and regen Participant DAO

6 years agoCRM-21472 - Allow FlexMailer to overload getRequiredTokens()
Tim Otten [Thu, 23 Nov 2017 00:15:32 +0000 (16:15 -0800)]
CRM-21472 - Allow FlexMailer to overload getRequiredTokens()

6 years agoCRM-21472 - Allow FlexMailer to overload checkSendable()
Tim Otten [Thu, 23 Nov 2017 00:14:56 +0000 (16:14 -0800)]
CRM-21472 - Allow FlexMailer to overload checkSendable()

6 years agoMerge pull request #11257 from mattwire/CRM-21409_contribute_pdf_letter_hooks
Eileen McNaughton [Thu, 23 Nov 2017 00:40:34 +0000 (13:40 +1300)]
Merge pull request #11257 from mattwire/CRM-21409_contribute_pdf_letter_hooks

CRM-21409 Don't bypass hooks when updating contribution receipt/thankyou date

6 years agoNFC rerun setup.sh -dg and regen Participant DAO
Seamus Lee [Wed, 22 Nov 2017 23:49:42 +0000 (10:49 +1100)]
NFC rerun setup.sh -dg and regen Participant DAO

6 years agoCRM-21473: Add new permission to add contact notes and prevent users without edit...
Omar abu hussein [Wed, 22 Nov 2017 22:59:51 +0000 (00:59 +0200)]
CRM-21473: Add new permission to add contact notes and prevent users without edit contact permission to edit or delete notes

6 years agoCRM-21470 Add support for WordPress Polylang plugin
Samuel Vanhove [Wed, 22 Nov 2017 20:11:11 +0000 (15:11 -0500)]
CRM-21470 Add support for WordPress Polylang plugin

6 years agoDon't bypass hooks when updating contribution receipt/thankyou date
Matthew Wire [Wed, 8 Nov 2017 14:10:42 +0000 (14:10 +0000)]
Don't bypass hooks when updating contribution receipt/thankyou date

6 years agoMerge pull request #11235 from clnlf/CRM-21389-UserDashBoard-Regions
Eileen McNaughton [Wed, 22 Nov 2017 02:46:47 +0000 (15:46 +1300)]
Merge pull request #11235 from clnlf/CRM-21389-UserDashBoard-Regions

CRM-21389 Added pre and post regions to each entitys userdashboard

6 years agoMerge pull request #11226 from seamuslee001/CRM-21378
Eileen McNaughton [Wed, 22 Nov 2017 00:42:51 +0000 (13:42 +1300)]
Merge pull request #11226 from seamuslee001/CRM-21378

CRM-21378 Ensure that email abuse reports are treated as bounce type …

6 years agoMerge pull request #11216 from mydropwizard/crm-21372
Mathieu Lu [Tue, 21 Nov 2017 23:28:46 +0000 (18:28 -0500)]
Merge pull request #11216 from mydropwizard/crm-21372

CRM-21372: Fix fatal error adding profile on Drupal 8

6 years agoMerge pull request #11285 from eileenmcnaughton/dupe_url
Mathieu Lu [Tue, 21 Nov 2017 23:13:06 +0000 (18:13 -0500)]
Merge pull request #11285 from eileenmcnaughton/dupe_url

[NFC] CRM-16819 improve on CRM_Utils_Request::retrieve

6 years agoCRM-21378 Ensure that email abuse reports are treated as bounce type of spam
Seamus Lee [Thu, 2 Nov 2017 00:14:26 +0000 (11:14 +1100)]
CRM-21378 Ensure that email abuse reports are treated as bounce type of spam

Move upgrade steps to .29

6 years agoMerge pull request #11267 from nbrettell/CRM-21383-master
Eileen McNaughton [Tue, 21 Nov 2017 21:35:48 +0000 (10:35 +1300)]
Merge pull request #11267 from nbrettell/CRM-21383-master

CRM-21383 - Inclusion of a directive to replace the existing select f…

6 years agoMerge pull request #11308 from civicrm/4.7.28-rc
Eileen McNaughton [Tue, 21 Nov 2017 21:19:17 +0000 (10:19 +1300)]
Merge pull request #11308 from civicrm/4.7.28-rc

4.7.28 rc

6 years agoMerge pull request #11307 from spalmstr/CRM-21001
Eileen McNaughton [Tue, 21 Nov 2017 20:39:22 +0000 (09:39 +1300)]
Merge pull request #11307 from spalmstr/CRM-21001

CRM-21001

6 years agoMerge pull request #11258 from seamuslee001/CRM-21411
Eileen McNaughton [Tue, 21 Nov 2017 20:33:50 +0000 (09:33 +1300)]
Merge pull request #11258 from seamuslee001/CRM-21411

CRM-21411 Fix issue where unsubscribe group field would not show beca…

6 years agoMerge pull request #10650 from jitendrapurohit/CRM-20861
Eileen McNaughton [Tue, 21 Nov 2017 20:19:00 +0000 (09:19 +1300)]
Merge pull request #10650 from jitendrapurohit/CRM-20861

CRM-20861 : Location type does not show for custom address fields

6 years agoCRM-21001
spalmstr [Tue, 21 Nov 2017 18:19:28 +0000 (18:19 +0000)]
CRM-21001

6 years agoCRM-21456 : Relationship end date not set when creating resolved cases
Jitendra Purohit [Mon, 20 Nov 2017 06:34:57 +0000 (12:04 +0530)]
CRM-21456 : Relationship end date not set when creating resolved cases

6 years agoCRM-19273 fix tests to actually run.
eileen [Mon, 20 Nov 2017 01:13:23 +0000 (14:13 +1300)]
CRM-19273 fix tests to actually run.

Due to being mis-named these tests have never run. When they do run they expose issues which
are addressed in PR 10962. This commits causes the part that actually works in these
tests to run.

6 years agoMinor code tidy up
eileen [Mon, 20 Nov 2017 00:26:32 +0000 (13:26 +1300)]
Minor code tidy up

6 years agoCRM-19273 very minor extraction
eileen [Sun, 19 Nov 2017 23:34:55 +0000 (12:34 +1300)]
CRM-19273 very minor extraction

6 years agoCRM-19273 extract code to get financial items and filter those already cancelled.
eileen [Sun, 19 Nov 2017 21:43:03 +0000 (10:43 +1300)]
CRM-19273 extract code to get financial items and filter those already cancelled.

This is the first of the broken-out changes in https://github.com/civicrm/civicrm-core/pull/10962 that results in
an actual functionality change. The code that retrieves the relevant financial items is separated into
it's own function. But then a php loop iterates through and eliminates any items that have
already been reversed. This is a scenario identified in the unit tests on 10962 and occurs when
the the option value has is changed and then changed again - the items from the first change
should not be re-changed.

6 years agoCRM-19888 update test to reflect change.
eileen [Mon, 24 Jul 2017 12:52:55 +0000 (00:52 +1200)]
CRM-19888 update test to reflect change.

In fact this test is a bit silly anyway as it tests the fn in a way it is never called in

6 years agoCRM-19888 fix import to prefer default country when resolving states.
eileen [Mon, 24 Jul 2017 05:12:35 +0000 (17:12 +1200)]
CRM-19888 fix import to prefer default country when resolving states.

The example given is the abbreviation UT is used in muliple countries and if US is the default country
it should resolve to UTAH

6 years agoTowards CRM-19888 extract code that resolves defaults
eileen [Mon, 24 Jul 2017 03:40:26 +0000 (15:40 +1200)]
Towards CRM-19888 extract code that resolves defaults

6 years agoMerge pull request #11299 from francescbassas/patch-12
Eileen McNaughton [Tue, 21 Nov 2017 04:20:20 +0000 (17:20 +1300)]
Merge pull request #11299 from francescbassas/patch-12

CRM-21454 Add money raised on page contribution widget ajax response

6 years agoMerge pull request #11302 from totten/master-toxic-json
Eileen McNaughton [Tue, 21 Nov 2017 01:19:58 +0000 (14:19 +1300)]
Merge pull request #11302 from totten/master-toxic-json

(NFC) .toxic.json - Update list of functions which yield toxic warnings

6 years agoAdd comments
Coleman Watts [Tue, 21 Nov 2017 01:17:39 +0000 (20:17 -0500)]
Add comments

6 years ago(NFC) .toxic.json - Update list of functions which yield toxic warnings
Tim Otten [Mon, 20 Nov 2017 22:21:53 +0000 (14:21 -0800)]
(NFC) .toxic.json - Update list of functions which yield toxic warnings

The file `.toxic.json` is supposed to list egregious functions -- any change
to these functions should produce extra comments/suggestsions.

The current list is a few years old, so I've run `pdepend` and updated the list.
The list includes anything which matches one or more of these:

 * "Non Comment Lines of Code" (`ncloc`) greater than 300.
 * "[NPath](https://modess.io/npath-complexity-cyclomatic-complexity-explained/) complexity" (`npath`) greater than 1 billion.

6 years agoCRM-21454 Add money raised on page contribution widget ajax response
francescbassas [Sun, 19 Nov 2017 19:57:20 +0000 (20:57 +0100)]
CRM-21454 Add money raised on page contribution widget ajax response

6 years agoMerge pull request #11289 from kainukempowerment/CRM-21424
Eileen McNaughton [Sat, 18 Nov 2017 21:04:18 +0000 (10:04 +1300)]
Merge pull request #11289 from kainukempowerment/CRM-21424

CRM-21424 Set receipt date when downloading pdf receipt

6 years agoAdded test
Klaas Eikelboom [Sat, 18 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Added test

6 years agoMerge pull request #11296 from jmcclelland/CRM-21449
Mathieu Lu [Sat, 18 Nov 2017 00:43:23 +0000 (19:43 -0500)]
Merge pull request #11296 from jmcclelland/CRM-21449

CRM-21449 - add location field to activity report.

6 years agoMerge pull request #11284 from eileenmcnaughton/towards1
Mathieu Lu [Sat, 18 Nov 2017 00:33:10 +0000 (19:33 -0500)]
Merge pull request #11284 from eileenmcnaughton/towards1

[NFC] code cleanup: split out 2 functions that are mostly unrelated.

6 years agoMerge pull request #11268 from mattwire/CRM-21421_allow_updating_existing_casecontact
colemanw [Fri, 17 Nov 2017 23:20:17 +0000 (18:20 -0500)]
Merge pull request #11268 from mattwire/CRM-21421_allow_updating_existing_casecontact

CRM-21421 Fix to allow updating an existing CaseContact record

6 years agoMerge pull request #11295 from mepps/CRM-21448
colemanw [Fri, 17 Nov 2017 23:15:27 +0000 (18:15 -0500)]
Merge pull request #11295 from mepps/CRM-21448

CRM-21448 Add a link to contact from contribution

6 years agoMerge pull request #11293 from mlutfy/crm21447
Eileen McNaughton [Fri, 17 Nov 2017 22:55:34 +0000 (11:55 +1300)]
Merge pull request #11293 from mlutfy/crm21447

CRM-21447: Relationship Report: move variable handling to beginPostProcessCommon

6 years agoMerge pull request #11297 from civicrm/4.7.28-rc
Eileen McNaughton [Fri, 17 Nov 2017 22:44:55 +0000 (11:44 +1300)]
Merge pull request #11297 from civicrm/4.7.28-rc

4.7.28 rc

6 years agoMerge pull request #11286 from jitendrapurohit/pay-later-fix
Eileen McNaughton [Fri, 17 Nov 2017 22:40:02 +0000 (11:40 +1300)]
Merge pull request #11286 from jitendrapurohit/pay-later-fix

CRM-21436 - Fix fatal error on pay later

6 years agoCRM-21449 - add location field to activity report.
Jamie McClelland [Fri, 17 Nov 2017 21:19:55 +0000 (16:19 -0500)]
CRM-21449 - add location field to activity report.

6 years agoCRM-21448 Add a link to contact from contribution
Margaret Epps [Fri, 17 Nov 2017 19:43:40 +0000 (14:43 -0500)]
CRM-21448 Add a link to contact from contribution

6 years agoCRM-21447: Contact Relationship Report: move variable handling to beginPostProcessCom...
Mathieu Lutfy [Fri, 17 Nov 2017 17:45:56 +0000 (12:45 -0500)]
CRM-21447: Contact Relationship Report: move variable handling to beginPostProcessCommon().

6 years agoremove obsolete comment
Klaas Eikelboom [Fri, 17 Nov 2017 17:42:48 +0000 (17:42 +0000)]
remove obsolete comment

6 years agoMerge pull request #11261 from JMAConsulting/CRM-21362
colemanw [Fri, 17 Nov 2017 13:03:12 +0000 (08:03 -0500)]
Merge pull request #11261 from JMAConsulting/CRM-21362

CRM-21362: followup PR which fixes duplicate mailing rows for each job

6 years agofix contribution page loading on no processor
Jitendra Purohit [Fri, 17 Nov 2017 12:56:28 +0000 (18:26 +0530)]
fix contribution page loading on no processor