civicrm-core.git
6 years agoUpgrade symfony in lockfile to be 2.8 which is supported version of 2.x series
Seamus Lee [Tue, 7 Aug 2018 22:38:01 +0000 (08:38 +1000)]
Upgrade symfony in lockfile to be 2.8 which is supported version of 2.x series

6 years agoMerge pull request #12630 from eileenmcnaughton/comment_bool
Eileen McNaughton [Tue, 7 Aug 2018 07:47:49 +0000 (19:47 +1200)]
Merge pull request #12630 from eileenmcnaughton/comment_bool

[NFC] comment fixes relating to doc blocks, spelling

6 years agoMerge pull request #12629 from KarinG/FinancialAuditAddTests
Eileen McNaughton [Tue, 7 Aug 2018 04:41:08 +0000 (16:41 +1200)]
Merge pull request #12629 from KarinG/FinancialAuditAddTests

Follow up on #12611 - adding in three data-integrity assertions.

6 years ago[NFC] comment fixes relating to doc blocks, spelling
eileen [Tue, 7 Aug 2018 04:25:54 +0000 (16:25 +1200)]
[NFC] comment fixes relating to doc blocks, spelling

6 years agoMerge pull request #12627 from eileenmcnaughton/caching_pp
Seamus Lee [Tue, 7 Aug 2018 04:08:15 +0000 (14:08 +1000)]
Merge pull request #12627 from eileenmcnaughton/caching_pp

Use cached version of payment processor.

6 years agoMerge pull request #12559 from eileenmcnaughton/activity_part_2
Seamus Lee [Tue, 7 Aug 2018 04:07:48 +0000 (14:07 +1000)]
Merge pull request #12559 from eileenmcnaughton/activity_part_2

Activity display, switch to more performance getActivities function (from deprecatedGetActivities)

6 years agoFollow up on #12611 - adding in three data-integrity assertions.
KarinG [Tue, 7 Aug 2018 01:40:36 +0000 (19:40 -0600)]
Follow up on #12611 - adding in three data-integrity assertions.

6 years agoMerge pull request #12444 from mattwire/fixduplicatecaseactivities
Eileen McNaughton [Mon, 6 Aug 2018 20:49:17 +0000 (08:49 +1200)]
Merge pull request #12444 from mattwire/fixduplicatecaseactivities

dev/core#245 Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts

6 years agoMerge pull request #12625 from colemanw/recVer
Eileen McNaughton [Mon, 6 Aug 2018 19:48:02 +0000 (07:48 +1200)]
Merge pull request #12625 from colemanw/recVer

Bump recommended php version to 7.1 and min recommended to 7.0

6 years agoUse cached version of payment processor.
eileen [Mon, 6 Aug 2018 06:40:32 +0000 (18:40 +1200)]
Use cached version of payment processor.

I am hitting a slightly obscure bug in Redis that is solved by this change.

Per https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/55
we have an issue whereby Omnipay adds the gateway to a variable on class when processing payments.

In some cases this gateway will not serialize into a key under Redis causing a fatal.

However, we don't really need it to - the payment processor that we are aiming to cache is
'as loaded' not 'as used'. The caching of the processors appears to have been removed in
the past because of issues around domains -however, I think we can get
past that by changing the cache key.

6 years agoMerge pull request #12620 from mattwire/fileoncase_activityparams
colemanw [Mon, 6 Aug 2018 01:50:14 +0000 (21:50 -0400)]
Merge pull request #12620 from mattwire/fileoncase_activityparams

Don't duplicate activity when filing on case

6 years agoMerge pull request #12609 from mattwire/joomla_cron_timezone
Seamus Lee [Sun, 5 Aug 2018 22:18:36 +0000 (08:18 +1000)]
Merge pull request #12609 from mattwire/joomla_cron_timezone

Make sure Joomla timezone is set for cron jobs

6 years agoMerge pull request #12611 from KarinG/FinancialAudit
Eileen McNaughton [Sun, 5 Aug 2018 21:15:38 +0000 (09:15 +1200)]
Merge pull request #12611 from KarinG/FinancialAudit

[PHPUnit test only] Adding in assertions re: Line Item and Contribution data-integrity.

6 years agoBump recommended php version to 7.1 and min recommended to 7.0
Coleman Watts [Sat, 4 Aug 2018 22:30:38 +0000 (18:30 -0400)]
Bump recommended php version to 7.1 and min recommended to 7.0

6 years agoAdd comments
KarinG [Sat, 4 Aug 2018 15:19:59 +0000 (09:19 -0600)]
Add comments

6 years agoMerge pull request #12612 from eileenmcnaughton/more_lower
colemanw [Sat, 4 Aug 2018 13:02:13 +0000 (09:02 -0400)]
Merge pull request #12612 from eileenmcnaughton/more_lower

Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.

6 years agoMerge pull request #12621 from JKingsnorth/remove-unused-vars-process-parti
colemanw [Sat, 4 Aug 2018 01:35:20 +0000 (21:35 -0400)]
Merge pull request #12621 from JKingsnorth/remove-unused-vars-process-parti

Remove unused variables from process_participants job

6 years agoMerge pull request #12608 from eileenmcnaughton/export_sigs
colemanw [Sat, 4 Aug 2018 00:28:16 +0000 (20:28 -0400)]
Merge pull request #12608 from eileenmcnaughton/export_sigs

Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant:getLabel

6 years agoMerge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-hookTokenValues
Eileen McNaughton [Fri, 3 Aug 2018 23:09:28 +0000 (11:09 +1200)]
Merge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-hookTokenValues

pass mailingJobId to hook_tokenValues

6 years agoRemove unused variables
JKingsnorth [Fri, 3 Aug 2018 22:25:23 +0000 (23:25 +0100)]
Remove unused variables

6 years agoSet activity params correctly when filing an activity on case
Matthew Wire (MJW Consulting) [Fri, 3 Aug 2018 16:31:17 +0000 (17:31 +0100)]
Set activity params correctly when filing an activity on case

6 years agoFurther removal of instance of using LOWER() rather than relying on mysql non-case...
eileen [Thu, 2 Aug 2018 02:02:06 +0000 (14:02 +1200)]
Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.

Note I could not find any way to call this so I added deprecation notices

Per #12494 the use of LOWER

hurts performance
fails to return results on some char sets
messes with REGEX
This is part of a continued (we removed from contribution search fields last year)
staggered approach to removing this old mechanism

6 years agoMerge pull request #12618 from colemanw/teenly
Eileen McNaughton [Fri, 3 Aug 2018 08:33:52 +0000 (20:33 +1200)]
Merge pull request #12618 from colemanw/teenly

Fix teeny typo

6 years agoFix teeny typo
Coleman Watts [Fri, 3 Aug 2018 04:28:34 +0000 (00:28 -0400)]
Fix teeny typo

6 years agoMerge pull request #12617 from civicrm/5.5
Eileen McNaughton [Fri, 3 Aug 2018 03:36:53 +0000 (15:36 +1200)]
Merge pull request #12617 from civicrm/5.5

5.5

6 years agoMerge pull request #12616 from eileenmcnaughton/report_date
Seamus Lee [Fri, 3 Aug 2018 03:28:23 +0000 (13:28 +1000)]
Merge pull request #12616 from eileenmcnaughton/report_date

Test fix, update activity report adds a this.month filter by default, accomodate

6 years agoTest fix, update activity report adds a this.month fiter by default so make dates...
eileen [Thu, 2 Aug 2018 23:33:44 +0000 (11:33 +1200)]
Test fix, update activity report adds a this.month fiter by default so make dates movable.

I also put time at the end of the day to avoid bounciness on status being overdue

6 years agoMerge pull request #12595 from eileenmcnaughton/payment_processor_domain
colemanw [Thu, 2 Aug 2018 09:08:16 +0000 (05:08 -0400)]
Merge pull request #12595 from eileenmcnaughton/payment_processor_domain

API : Set current domain as a sensible default for payment processor

6 years agoMerge remote-tracking branch 'origin/5.5'
Tim Otten [Thu, 2 Aug 2018 01:26:48 +0000 (18:26 -0700)]
Merge remote-tracking branch 'origin/5.5'

6 years ago5.4.0.md - Tweak cache notes
Tim Otten [Wed, 1 Aug 2018 21:03:16 +0000 (14:03 -0700)]
5.4.0.md - Tweak cache notes

6 years ago5.4.0 release notes (#12605)
Andrew Hunt [Wed, 1 Aug 2018 03:38:58 +0000 (23:38 -0400)]
5.4.0 release notes (#12605)

* 5.4.0 release notes: raw from script

* 5.4.0 release notes: added boilerplate

* 5.4.0 release notes: finished documenting changes

* 5.4.0 release notes: updated contributors

6 years agoSet version to 5.6.alpha1
CiviCRM [Thu, 2 Aug 2018 01:18:07 +0000 (01:18 +0000)]
Set version to 5.6.alpha1

6 years agoSet version to 5.5.beta1
CiviCRM [Thu, 2 Aug 2018 01:06:54 +0000 (01:06 +0000)]
Set version to 5.5.beta1

6 years agoMerge pull request #12607 from colemanw/caseDetails
Eileen McNaughton [Wed, 1 Aug 2018 21:16:31 +0000 (09:16 +1200)]
Merge pull request #12607 from colemanw/caseDetails

dev/core#289 - Fix links on case dashboard

6 years agoMerge pull request #12610 from mattwire/recurtab_sort_desc
Eileen McNaughton [Wed, 1 Aug 2018 21:15:03 +0000 (09:15 +1200)]
Merge pull request #12610 from mattwire/recurtab_sort_desc

dev/core/issues/277 Sort recurring contributions by newest first

6 years agoMerge pull request #12606 from JMAConsulting/custom-value-update
colemanw [Wed, 1 Aug 2018 16:36:39 +0000 (12:36 -0400)]
Merge pull request #12606 from JMAConsulting/custom-value-update

Customvalue ID is ignored

6 years agofor Jenkins.
KarinG [Wed, 1 Aug 2018 16:11:17 +0000 (10:11 -0600)]
for Jenkins.

6 years agoremove Initials.
KarinG [Wed, 1 Aug 2018 14:34:07 +0000 (08:34 -0600)]
remove Initials.

6 years agoAdding in assertions re: lineItem and Contribution data-integrity.
KarinG [Wed, 1 Aug 2018 14:22:22 +0000 (08:22 -0600)]
Adding in assertions re: lineItem and Contribution data-integrity.

6 years agoFix duplicate activities showing on case activities tab when they have multiple targe...
Matthew Wire [Sun, 8 Jul 2018 17:20:30 +0000 (18:20 +0100)]
Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts

6 years agoSort recurring contributions by newest first
Matthew Wire (MJW Consulting) [Wed, 1 Aug 2018 09:58:56 +0000 (10:58 +0100)]
Sort recurring contributions by newest first

6 years agoMake sure Joomla timezone is set for cron jobs
Matthew Wire (MJW Consulting) [Wed, 1 Aug 2018 09:39:18 +0000 (10:39 +0100)]
Make sure Joomla timezone is set for cron jobs

6 years agoMerge pull request #12558 from totten/master-prevnext-misc
Eileen McNaughton [Wed, 1 Aug 2018 07:43:39 +0000 (19:43 +1200)]
Merge pull request #12558 from totten/master-prevnext-misc

(dev/core#217) PrevNext - Allow swapping getPositions (etal) for contact-search

6 years agoStop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant::getLabel(
eileen [Wed, 1 Aug 2018 04:48:14 +0000 (16:48 +1200)]
Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant::getLabel(

Note this function is called once per export - not per row

6 years agoMerge pull request #12587 from eileenmcnaughton/header_test
colemanw [Wed, 1 Aug 2018 04:25:23 +0000 (00:25 -0400)]
Merge pull request #12587 from eileenmcnaughton/header_test

Export - add tests out header output, move phone_type_id to metadata

6 years agoMerge pull request #12585 from eileenmcnaughton/param_passing
colemanw [Wed, 1 Aug 2018 04:17:26 +0000 (00:17 -0400)]
Merge pull request #12585 from eileenmcnaughton/param_passing

Stdise references to BAO_Query->_fields [nfc]

6 years agoFix activity edit link
Coleman Watts [Wed, 1 Aug 2018 04:12:17 +0000 (00:12 -0400)]
Fix activity edit link

6 years agodev/core#289 - Fix caseId url param
Coleman Watts [Wed, 1 Aug 2018 02:37:16 +0000 (22:37 -0400)]
dev/core#289 - Fix caseId url param

6 years agoMerge pull request #12553 from pradpnayak/77
Eileen McNaughton [Tue, 31 Jul 2018 22:11:56 +0000 (10:11 +1200)]
Merge pull request #12553 from pradpnayak/77

dev/core/issues/277, Fixed count to include only live recurring contr…

6 years agoMerge pull request #12602 from colemanw/checkIfFieldExists
Eileen McNaughton [Tue, 31 Jul 2018 21:56:04 +0000 (09:56 +1200)]
Merge pull request #12602 from colemanw/checkIfFieldExists

NFC - Deprecate duplicate function

6 years agoMerge pull request #12604 from tschuettler/296-custom-value-return-field
colemanw [Tue, 31 Jul 2018 20:01:05 +0000 (16:01 -0400)]
Merge pull request #12604 from tschuettler/296-custom-value-return-field

api - CustomValue::get - add handling for comma separated return fields

6 years agoCustomvalue ID is ignored
deb.monish [Tue, 31 Jul 2018 19:47:10 +0000 (01:17 +0530)]
Customvalue ID is ignored

6 years agoExplode return values if it is not already an array.
Thomas [Tue, 31 Jul 2018 14:13:01 +0000 (16:13 +0200)]
Explode return values if it is not already an array.

6 years agoAdd unit tests for CustomValueGet return fields
Thomas [Tue, 31 Jul 2018 14:10:51 +0000 (16:10 +0200)]
Add unit tests for CustomValueGet return fields

6 years agoStop passing relationQuery object now it is not required
eileen [Mon, 30 Jul 2018 10:46:59 +0000 (22:46 +1200)]
Stop passing relationQuery object now it is not required

6 years agoStdise references to BAO_Query->_fields [nfc]
eileen [Sat, 28 Jul 2018 04:29:16 +0000 (16:29 +1200)]
Stdise references to BAO_Query->_fields [nfc]

6 years agoMerge pull request #12596 from eileenmcnaughton/export_ref
Eileen McNaughton [Mon, 30 Jul 2018 20:14:48 +0000 (08:14 +1200)]
Merge pull request #12596 from eileenmcnaughton/export_ref

[NFC] Export - don't pass arrays as reference when they are not changed

6 years agoMerge pull request #12591 from eileenmcnaughton/membership_type
Eileen McNaughton [Mon, 30 Jul 2018 20:03:00 +0000 (08:03 +1200)]
Merge pull request #12591 from eileenmcnaughton/membership_type

Towards using EntityForm.tpl for Membership type & enabling custom data

6 years agoMerge pull request #12600 from tschuettler/293-geocoding
Eileen McNaughton [Mon, 30 Jul 2018 19:55:26 +0000 (07:55 +1200)]
Merge pull request #12600 from tschuettler/293-geocoding

Skip check for format method when there is no valid geocoding provider

6 years agoStricter validation for checkIfFieldExists
Coleman Watts [Mon, 30 Jul 2018 15:58:03 +0000 (11:58 -0400)]
Stricter validation for checkIfFieldExists

6 years agoNFC - Deprecate duplicate function
Coleman Watts [Mon, 30 Jul 2018 15:52:05 +0000 (11:52 -0400)]
NFC - Deprecate duplicate function

6 years agoSkip check for format method when there is no valid geocoding provider
Thomas [Mon, 30 Jul 2018 14:52:14 +0000 (16:52 +0200)]
Skip check for format method when there is no valid geocoding provider

6 years agoExport - don't pass arrays as reference when they are not changed
eileen [Mon, 30 Jul 2018 11:11:48 +0000 (23:11 +1200)]
Export - don't pass arrays as reference when they are not changed

6 years agoMove definition of phone_type_id to the xml.
eileen [Sat, 28 Jul 2018 05:35:42 +0000 (17:35 +1200)]
Move definition of phone_type_id to the xml.

This has the side effect of making it such that it only gets 16 char rather than 255. I thnk this is 'ok' here but there is a separate issue open to increase the varchar for all fields on export

6 years agoAdd tests for header output
eileen [Sat, 28 Jul 2018 05:00:42 +0000 (17:00 +1200)]
Add tests for header output

6 years agoMerge pull request #12535 from eileenmcnaughton/export_participant_test
Seamus Lee [Mon, 30 Jul 2018 10:15:04 +0000 (20:15 +1000)]
Merge pull request #12535 from eileenmcnaughton/export_participant_test

Export Add unit test + minor refactor covering specifiable payment output fields for participant export.

6 years agoSet current domain as a sensible default for payment processor domain
eileen [Mon, 30 Jul 2018 05:51:40 +0000 (17:51 +1200)]
Set current domain as a sensible default for payment processor domain

6 years agoMerge pull request #12592 from civicrm/5.4
Eileen McNaughton [Sun, 29 Jul 2018 22:17:17 +0000 (10:17 +1200)]
Merge pull request #12592 from civicrm/5.4

5.4 to master

6 years agoMerge pull request #12590 from totten/5.4-flushcache
Eileen McNaughton [Sun, 29 Jul 2018 22:16:23 +0000 (10:16 +1200)]
Merge pull request #12590 from totten/5.4-flushcache

(dev/core#284) System::flushCache - Reproduce legacy cache behavior. Improve test performance.

6 years agoRemove some fields from the form to rely on EntityTrait
eileen [Sun, 29 Jul 2018 04:30:52 +0000 (16:30 +1200)]
Remove some fields from the form to rely on EntityTrait

6 years agoConvert 'name' & 'description' to use the entity Fields format.
eileen [Sun, 29 Jul 2018 04:25:36 +0000 (16:25 +1200)]
Convert 'name' & 'description' to use the entity Fields format.

Note that doing a partial conversion in the template is just a stepping stone to using the
EntityField template, when lots of fields need conversion / review it allows us to break it up

Simplify converstion of fields, convert 2 more

6 years agoDefine entity data for membership type form
eileen [Sun, 29 Jul 2018 04:12:42 +0000 (16:12 +1200)]
Define entity data for membership type form

6 years agoMerge pull request #12589 from seamuslee001/password_size
Eileen McNaughton [Sun, 29 Jul 2018 02:43:20 +0000 (14:43 +1200)]
Merge pull request #12589 from seamuslee001/password_size

dev/core#291 Allow for field size to be set for password fields

6 years agoOverview
Tim Otten [Sat, 28 Jul 2018 22:31:20 +0000 (15:31 -0700)]
Overview
----------------------------------------

`CRM_Utils_System::flushCache()` calls `CRM_Utils_Cache::singleton()->flush()`.
In `5.3`, this triggered a cascading effect; in development of `5.4.alpha`,
some of the cascades were overzealous and we revised to get tighter control
over cascading.

With an aim to being conservative and reproducing old behavior, I previously
patched `5.4.alpha` to add several extra flushes and simulate the old cascades.
However, it wasn't really as conservative as hoped -- because the "old
behavior" depended on the environment.  This patch brings us closer the "old
behavior".

See also: https://lab.civicrm.org/dev/core/issues/284

Before (Behavior in version <=`5.3`)
----------------------------------------

On systems with memory-backed caches, `flushCache()` had an aggressive
cascading side-effect where several named caches (`settings`, etc) were also
flushed.

On systems with a default configuration (SQL+ArrayCache), `flushCache()` had a
very limited cascading effect -- it *only cleared the in-process ArrayCache*.
The bulk of the cache content was preserved in SQL.

Before (Behavior in version ~= `5.4.alpha`)
----------------------------------------

To simulate the cascading effect, `flushCache()` explicitly flushes a
half-dozen individual caches.  (These half-dozen are chosen to match the old
cascade list and exclude some new things which would problematic.)

On systems with memory-backed caches, this reproduces the aggressive cascading
effect.

On systems with a default configuration (SQL+ArrayCache), this amplifies the
flushing -- because it also destroys the underlying SQL caches.

This has the side-effect of significantly degrading performance of the test
suite.

After (Behavior with patch)
----------------------------------------

`CRM_Utils_System::flushCache` calls `CRM_Utils_Cache::singleton()->flush()`.

To simulate the cascading effect, `flushCache()` explicitly flushes a
half-dozen individual caches...  *but only on memory-backed* systems.

On systems with memory-backed caches, this reproduces the aggressive cascading
effect.

On systems with a default configuration (SQL+ArrayCache), this is closer to the
old behavior.  The bulk of the cache remains available in SQL.

Based on local spot-checking, this restores performance of the test suite.

Comments
----------------------------------------

Deep down, I don't really believe the cascading effect is a good thing.  At
some point, I'd rather just remove these bits.  But in absence of a crystal
ball to predict the side-effects of that, I think it's good to find a better
approximation of the old behavior.

6 years agoMerge pull request #12588 from mattwire/5.4_backportcasefixes
Eileen McNaughton [Sat, 28 Jul 2018 23:05:41 +0000 (11:05 +1200)]
Merge pull request #12588 from mattwire/5.4_backportcasefixes

Backport "Fix regression on case export" to 5.4

6 years agodev/core#291 Allow for field size to be set for password fields
Seamus Lee [Sat, 28 Jul 2018 22:22:52 +0000 (08:22 +1000)]
dev/core#291 Allow for field size to be set for password fields

6 years agoFix regression on case export from recent export fix
eileen [Thu, 19 Jul 2018 22:47:44 +0000 (10:47 +1200)]
Fix regression on case export from recent export fix

https://github.com/civicrm/civicrm-core/commit/3b4adc92793dccfa446cf66f0740edb543f110d7 changed the way componentmode is defined

It now seems inconsistent

6 years agoNon functional changes towards shared functions in Core_Form_Task
Matthew Wire [Fri, 15 Jun 2018 09:23:33 +0000 (10:23 +0100)]
Non functional changes towards shared functions in Core_Form_Task

6 years agoMerge pull request #12578 from JKingsnorth/patch-10
Eileen McNaughton [Fri, 27 Jul 2018 07:05:56 +0000 (19:05 +1200)]
Merge pull request #12578 from JKingsnorth/patch-10

(NFC) Update readme to link to GitLab instead of JIRA

6 years agoMerge pull request #12577 from eileenmcnaughton/export_sql_columns
Seamus Lee [Fri, 27 Jul 2018 03:44:23 +0000 (13:44 +1000)]
Merge pull request #12577 from eileenmcnaughton/export_sql_columns

Export clean up sql columns

6 years agoMerge pull request #12530 from colemanw/plainObject
Eileen McNaughton [Fri, 27 Jul 2018 01:37:22 +0000 (13:37 +1200)]
Merge pull request #12530 from colemanw/plainObject

crmRouteBinder - Don't convert arrays to objects

6 years agoMerge pull request #12573 from pradpnayak/ThrowExceptionOnGetValue
Eileen McNaughton [Fri, 27 Jul 2018 00:17:01 +0000 (12:17 +1200)]
Merge pull request #12573 from pradpnayak/ThrowExceptionOnGetValue

Added code to throw exception on getvalue api call

6 years agoExtract getMungedFieldName
eileen [Thu, 26 Jul 2018 13:48:53 +0000 (01:48 +1200)]
Extract getMungedFieldName

6 years agoExtract getSqlColumnDefinition off to processor class.
eileen [Thu, 26 Jul 2018 13:40:30 +0000 (01:40 +1200)]
Extract getSqlColumnDefinition off to processor class.

Note that I wrote test coverage that was pretty extensive on the output of this function earlier

6 years ago Update readme to link to GitLab instead of JIRA
John Kingsnorth [Thu, 26 Jul 2018 22:19:03 +0000 (23:19 +0100)]
 Update readme to link to GitLab instead of JIRA

6 years agocrmRouteBinder - Don't convert arrays to objects
Coleman Watts [Sat, 21 Jul 2018 21:18:41 +0000 (17:18 -0400)]
crmRouteBinder - Don't convert arrays to objects

6 years agoMerge pull request #12388 from pradpnayak/optionValuePaymentMethod-b
Eileen McNaughton [Thu, 26 Jul 2018 20:51:36 +0000 (08:51 +1200)]
Merge pull request #12388 from pradpnayak/optionValuePaymentMethod-b

dev/financial/issues/24, Moved code from form layer to BAO and used api instead of BAO function

6 years agoMerge pull request #12416 from pradpnayak/232
colemanw [Thu, 26 Jul 2018 14:55:56 +0000 (10:55 -0400)]
Merge pull request #12416 from pradpnayak/232

dev/core/issues/232, Some smart groups and some searches not returning any contacts

6 years agoAdded code to throw exception on getvalue api call
Pradeep Nayak [Thu, 26 Jul 2018 11:05:45 +0000 (12:05 +0100)]
Added code to throw exception on getvalue api call

6 years agoMoved code from form layer to BAO and used api instead of BAO function
Pradeep Nayak [Tue, 26 Jun 2018 23:31:34 +0000 (05:01 +0530)]
Moved code from form layer to BAO and used api instead of BAO function

6 years agoupdated explode function in custom search
Pradeep Nayak [Thu, 26 Jul 2018 09:57:46 +0000 (10:57 +0100)]
updated explode function in custom search

6 years agodev/core/issues/232, fixed how contact sub type is using separator
Pradeep Nayak [Thu, 26 Jul 2018 09:57:14 +0000 (10:57 +0100)]
dev/core/issues/232, fixed how contact sub type is using separator

6 years agoMerge pull request #12556 from totten/master-prevnext-selection
Eileen McNaughton [Thu, 26 Jul 2018 09:55:34 +0000 (21:55 +1200)]
Merge pull request #12556 from totten/master-prevnext-selection

(dev/core#217) PrevNext - Migrate selection methods

6 years agoadded unit test to search contact based on contact sub type
Pradeep Nayak [Fri, 13 Jul 2018 13:26:56 +0000 (14:26 +0100)]
added unit test to search contact based on contact sub type

6 years agoMerge pull request #12571 from civicrm/5.4
Eileen McNaughton [Thu, 26 Jul 2018 06:35:16 +0000 (18:35 +1200)]
Merge pull request #12571 from civicrm/5.4

Add 5.3.2 release notes (#12570)

6 years agoAdd 5.3.2 release notes (#12570)
Seamus Lee [Thu, 26 Jul 2018 06:34:42 +0000 (16:34 +1000)]
Add 5.3.2 release notes (#12570)

6 years ago[reviewed, pending rebase] CRM-20703 - Event Contribution Created When No Payment...
Yashodha Chaku [Thu, 26 Jul 2018 03:12:44 +0000 (08:42 +0530)]
[reviewed, pending rebase] CRM-20703 - Event Contribution Created When No Payment Option Provided (#12367)

* CRM-20703 - Event Contribution Created When No Payment Option Provided

* throw form rule when amount block is active

6 years agoMerge pull request #12569 from civicrm/5.4
Eileen McNaughton [Thu, 26 Jul 2018 03:04:28 +0000 (15:04 +1200)]
Merge pull request #12569 from civicrm/5.4

5.4

6 years agoMerge pull request #12568 from kcristiano/5.4
Eileen McNaughton [Thu, 26 Jul 2018 02:27:36 +0000 (14:27 +1200)]
Merge pull request #12568 from kcristiano/5.4

dev/279 - When Merging two contacts flip, prev, next not working

6 years agoMerge pull request #12563 from eileenmcnaughton/enotice54
Seamus Lee [Thu, 26 Jul 2018 00:29:35 +0000 (10:29 +1000)]
Merge pull request #12563 from eileenmcnaughton/enotice54

dev/core#276 enotice fix