Coleman Watts [Thu, 13 Jun 2019 20:26:02 +0000 (16:26 -0400)]
Rewrite submitOnce function, deprecate old one
New function works on a per-form basis, not per button.
It changes the button icon instead of the button text.
Eileen McNaughton [Sun, 16 Jun 2019 13:55:07 +0000 (09:55 -0400)]
Merge pull request #14557 from civicrm/5.15
5.15 to master
Eileen McNaughton [Sun, 16 Jun 2019 13:53:57 +0000 (09:53 -0400)]
Merge pull request #14545 from demeritcowboy/temp-remove-submit-once
Temporarily remove activity submit once pending PR 14519
Seamus Lee [Sun, 16 Jun 2019 08:37:53 +0000 (18:37 +1000)]
Merge pull request #14556 from eileenmcnaughton/null_another
dev/core#1047 Fix instance of null contamination
Seamus Lee [Sun, 16 Jun 2019 08:37:15 +0000 (18:37 +1000)]
Merge pull request #14555 from eileenmcnaughton/null
dev/core#1047 Fix instance of null contamination
eileen [Sun, 16 Jun 2019 01:36:34 +0000 (21:36 -0400)]
dev/core#1047 Fix instance of null contamination
Eileen McNaughton [Sun, 16 Jun 2019 01:29:52 +0000 (21:29 -0400)]
Merge pull request #14552 from eileenmcnaughton/tear
[test] Call parent tearDown more consistently
eileen [Sat, 15 Jun 2019 11:55:53 +0000 (07:55 -0400)]
dev/core#1047 Fix instance of null contamination
eileen [Sat, 15 Jun 2019 15:25:44 +0000 (11:25 -0400)]
[test] Call parent tearDown more consistently
Primarliy consistentcy - also supports checking nullArray is cleared per
https://github.com/civicrm/civicrm-core/pull/14550
Seamus Lee [Sat, 15 Jun 2019 21:52:42 +0000 (07:52 +1000)]
Merge pull request #14550 from eileenmcnaughton/null_fix
dev/core#1047 Fix instance of NULL contamination
Eileen McNaughton [Sat, 15 Jun 2019 15:13:48 +0000 (11:13 -0400)]
Merge pull request #14551 from totten/master-theme-cleanup
CRM-18792, dev/core#378 - Catch-up on settings metadata
Tim Otten [Sat, 15 Jun 2019 15:09:47 +0000 (11:09 -0400)]
CRM-18792, dev/core#378 - Catch-up on settings metadata
This is a follow-up to #12929. In the interim between the writing and
merging of the PR, the version numbers changed.
eileen [Sat, 15 Jun 2019 09:43:47 +0000 (05:43 -0400)]
Fix instance of NULL contamination
Matthew Wire [Sat, 15 Jun 2019 10:45:02 +0000 (11:45 +0100)]
Merge pull request #14443 from eileenmcnaughton/export
Fix duplicate households on 'Merge same household' exports
Eileen McNaughton [Sat, 15 Jun 2019 01:49:04 +0000 (21:49 -0400)]
Merge pull request #14549 from seamuslee001/master
5.15
Seamus Lee [Sat, 15 Jun 2019 01:45:51 +0000 (11:45 +1000)]
Merge in 5.15
Seamus Lee [Sat, 15 Jun 2019 01:44:25 +0000 (11:44 +1000)]
Merge pull request #14525 from seamuslee001/feature_timeout_setting
dev/core#1035 Add in new setting http_timeout to set how long in seco…
Seamus Lee [Sat, 15 Jun 2019 01:33:26 +0000 (11:33 +1000)]
Merge pull request #12929 from totten/master-theming-rb
CRM-18792, dev/core#378 - Create CSS theming subsystem
Seamus Lee [Sat, 15 Jun 2019 00:56:49 +0000 (10:56 +1000)]
Merge pull request #14542 from eileenmcnaughton/tests
[TEST] Fix intermittent test fail on NULL array getting contaminated
Seamus Lee [Fri, 14 Jun 2019 02:31:14 +0000 (12:31 +1000)]
dev/core#1035 Add in new setting http_timeout to set how long in seconds should HTTP requests last for to fix dev/core#1035
Handle situations where a 0 timeout is passed in
Remove from form
Update variable name as per EIleen
Seamus Lee [Sat, 15 Jun 2019 00:20:54 +0000 (10:20 +1000)]
Merge pull request #14548 from seamuslee001/nfc_declaration_fix
[NFC] Fix Test function delcaration to match change in CiviUnitTestCa…
Tim Otten [Tue, 7 Jun 2016 00:23:27 +0000 (18:23 -0600)]
CRM-18792 - CRM_Core_Theme - Add helper for loading CSS files from themes
CRM-18792 - CRM_Core_Resources - Load civicrm.css through theme system
CRM-18792 - Rename `CRM_Core_Theme` to `\Civi\Core\Theme`
CRM-18792 - Civi\Core\Theme - Remove statics
WIP
CRM_Core_Resources::addCoreStyles - Revert change
CRM-18792 - addStyleFile - Always pass through to theme. Support fallback.
Rename `Civi\Core\Theme` to `Civi\Core\Themes`
The class manages a list of themes -- not just a single theme.
CRM-18792 - Add org.civicrm.demotheme
CRM-18792 - Add uncommitted test files (`Civi\Core\Themes`)
CRM-18792 - Fix regression in CRM_Core_ResourceTest
CRM-18792 - Theme naming - Use prefix '_' for hidden themes
This cleans up a few things:
* Previously, there was a special case for using FALLBACK in `search_order`.
* If you're creating a multitheme extension, you may want to define a base theme
(which is extended by the others). Previously, you were required to show this
base theme as a user-selectable option. Now, it can be hidden.
* There was a bug where `resolveUrl()` would sometimes call the wrong callback.
(It used resolver for `$active` instead of `$themeKey`.)
CRM-18792 - Themes - File overrides and excludes should use same naming
Previously, when using `addStyleFile($cssExt,$css$file)`, the file overrides
and exlcudes would combine them differently e.g.
* For `addStyleFile('civicrm','css/bootstrap.css')`
* Override `css/bootstrap.css`
* Exclude `civicrm:css/bootstrap.css`
* For `('org.foo.bar','css/bang.css')`
* Override `org.foo.bar-css/bang.css`
* Exclude `org.foo.bar:css/bang.css`
Now, they use the same notation:
* For `addStyleFile('civicrm','css/bootstrap.css')`
* Override `css/bootstrap.css`
* Exclude `css/bootstrap.css`
* For `('org.foo.bar','css/bang.css')`
* Override `org.foo.bar-css/bang.css`
* Exclude `org.foo.bar-css/bang.css`
"Display Preferences" - Add the `theme_backend` and `theme_frontend` settings
hook_civicrm_activeTheme - Allow extensions and CMS modules to choose active theme
CRM_Utils_Hook::themes() - Tweak docblock
Civi\Core\Themes - Move cache from `short` to `long`
Remove tools/extensions/org.civicrm.demotheme
Fix merge ahem errors
Eileen McNaughton [Fri, 14 Jun 2019 23:59:54 +0000 (19:59 -0400)]
Merge pull request #14547 from civicrm/5.15
5.15 to master
eileen [Fri, 14 Jun 2019 20:58:05 +0000 (16:58 -0400)]
Fix intermittent test fail on NULL array getting contaminated & causing later tests to pass the wrong thing
Seamus Lee [Fri, 14 Jun 2019 22:57:01 +0000 (08:57 +1000)]
[NFC] Fix Test function delcaration to match change in CiviUnitTestCase class
Seamus Lee [Fri, 14 Jun 2019 22:32:23 +0000 (08:32 +1000)]
Merge pull request #14544 from totten/5.15-JPG
(dev/core#1044) Extension/MIME matching should be case insensitive
Seamus Lee [Fri, 14 Jun 2019 21:40:30 +0000 (07:40 +1000)]
Merge pull request #14540 from eileenmcnaughton/anettest
Fix A.net to resolve time when using default
Seamus Lee [Fri, 14 Jun 2019 21:33:37 +0000 (07:33 +1000)]
Merge pull request #14533 from eileenmcnaughton/deprecate
Deprecate contribution_date as a parameter
Eileen McNaughton [Fri, 14 Jun 2019 21:18:19 +0000 (17:18 -0400)]
Merge pull request #14537 from colemanw/jsDecode
Add CRM_Utils_JS::decode function for decoding js objects
DemeritCowboy [Fri, 14 Jun 2019 21:10:17 +0000 (17:10 -0400)]
temporarily remove activity submit once pending PR 14519
Tim Otten [Fri, 14 Jun 2019 20:57:55 +0000 (16:57 -0400)]
(dev/core#1044) Extension/MIME matching should be case insensitive
Overview
--------
For CIVI-SA-2019-15, the delivery of file attachments was tightened to
ensure that the file-extension and mime-type were in agreement. However,
the check yields a false-negative in the common case where the filename has
been capitalized. It should treat `foo.jpg`, `foo.JPG`, and `FOO.JPG` as
equally valid.
Before
------
* When viewing a contact profile image ending with `.JPG`, there is an error
message, `Supplied mime-type does not match file extension`.
After
-----
* When viewing a contact profile image ending with `.JPG`, the image is
delivered.
Comments
--------
See also:
* https://civicrm.org/advisory/civi-sa-2019-15-xss-via-forged-mime-type
* https://lab.civicrm.org/dev/core/issues/1044
Tim Otten [Fri, 14 Jun 2019 20:40:58 +0000 (16:40 -0400)]
Merge pull request #14524 from eileenmcnaughton/csv
Add csv reader package
Tim Otten [Fri, 14 Jun 2019 20:13:02 +0000 (16:13 -0400)]
Merge pull request #14538 from civicrm/eileenmcnaughton-patch-2
[test] truncate pledge block when cleaning up financial entities
Eileen McNaughton [Fri, 14 Jun 2019 20:11:20 +0000 (16:11 -0400)]
Merge pull request #14535 from colemanw/addressCustom
Address BAO - Handle standard 'custom' param as well as individual fields
Eileen McNaughton [Fri, 14 Jun 2019 20:08:18 +0000 (16:08 -0400)]
Merge pull request #14541 from civicrm/5.15
5.15 to master
Eileen McNaughton [Fri, 14 Jun 2019 20:07:53 +0000 (16:07 -0400)]
Merge pull request #14539 from totten/5.15-tap-yaml
Civi/Test/TAP - Replace Symfony YAML dependency
Tim Otten [Fri, 14 Jun 2019 18:23:37 +0000 (14:23 -0400)]
Civi/Test/TAP - Replace Symfony YAML dependency
This allows two paths:
1. If you have the YAML PECL extension, then that will be used.
To get the best output, you can install it.
2. If you don't, then it'll output JSON. JSON is considered valid YAML.
It's not clear that everyone reading the document will handle
the full range YAML (incl JSON), but... we don't actually have any
listeners that care to parse the TAP output...
Tim Otten [Fri, 14 Jun 2019 18:21:47 +0000 (14:21 -0400)]
tools/scripts/phpunit - Flip back to preferring 'php' for subprocess
Rationale:
* On the test servers, `php` is wrapper script.
* Outside the test servers, you should be able to use `phpunit` directly
(rather than calling `tools/scripts/phpunit`), and then it's
not our problem.
eileen [Fri, 14 Jun 2019 19:50:27 +0000 (15:50 -0400)]
Fix A.net to resolve time when using default
This is presumably passed through to the contribution api & hence it is not so grumpy but when
passed to the activity create fn it is failing when the test is run in isolation (& maybe other scenarios?)
due to 'now' not being parsed
Eileen McNaughton [Fri, 14 Jun 2019 17:53:21 +0000 (13:53 -0400)]
[test] truncate pledge block when cleaning up financial entities
Keep hunting down the test cleanup issue
Coleman Watts [Fri, 14 Jun 2019 17:51:40 +0000 (13:51 -0400)]
Add CRM_Utils_JS::decode function for decoding js objects
Eileen McNaughton [Fri, 14 Jun 2019 17:17:13 +0000 (13:17 -0400)]
Merge pull request #14536 from civicrm/5.15
5.15 to master
Eileen McNaughton [Fri, 14 Jun 2019 17:16:50 +0000 (13:16 -0400)]
Merge pull request #14511 from eileenmcnaughton/jungle
Add Unit test for testing smart group flow
colemanw [Fri, 14 Jun 2019 17:14:56 +0000 (13:14 -0400)]
Merge pull request #14522 from colemanw/ActivityForm
ActivityForm - Redirect to contact page or activity view in standalone mode
eileen [Thu, 13 Jun 2019 17:01:40 +0000 (13:01 -0400)]
Add Unit test for testing smart group flow
eileen [Fri, 14 Jun 2019 15:46:23 +0000 (11:46 -0400)]
Deprecate contribution_date as a parameter
Matthew Wire [Fri, 14 Jun 2019 15:25:31 +0000 (16:25 +0100)]
Merge pull request #14512 from agh1/refactor-before-14349
[REF] CRM_Case_BAO_Case::addcaseActivityLinks to CRM_Case_Selector_Search
Eileen McNaughton [Fri, 14 Jun 2019 15:20:05 +0000 (11:20 -0400)]
Merge pull request #14486 from seamuslee001/contribution_date_search_561
[REF] dev/core#561 Convert Contribution Date field to use date picker…
Eileen McNaughton [Fri, 14 Jun 2019 14:29:25 +0000 (10:29 -0400)]
Merge pull request #14531 from eileenmcnaughton/72
Php 7.2 notices fix on import
Eileen McNaughton [Fri, 14 Jun 2019 13:54:57 +0000 (09:54 -0400)]
Merge pull request #14530 from yashodha/mem_reports
Expose Primary member only/Non primary member only filter in membersh…
Eileen McNaughton [Fri, 14 Jun 2019 13:51:13 +0000 (09:51 -0400)]
Merge pull request #14532 from brianPHM/Updating_contributor_yml
Adding myself to the contributors file
Brian Matemachani [Fri, 14 Jun 2019 13:30:32 +0000 (14:30 +0100)]
Adding myself to the contributors file
eileen [Fri, 14 Jun 2019 12:03:33 +0000 (08:03 -0400)]
Php 7.2 fix on import
Fixes a known issue where php 7.2 is 'noisy' if you try to count NULL - solution is to use an empty array
Coleman Watts [Fri, 14 Jun 2019 11:46:00 +0000 (07:46 -0400)]
Address BAO - Handle standard 'custom' param as well as individual fields
The Address BAO was an oddball in that it took raw unformatted custom field input and processed it.
Other BAOs expect the custom field input to alreay be processed.
This allows it to handle either format.
yashodha [Fri, 14 Jun 2019 11:09:29 +0000 (16:39 +0530)]
Expose Primary member only/Non primary member only filter in membership reports
Eileen McNaughton [Fri, 14 Jun 2019 11:08:12 +0000 (07:08 -0400)]
Merge pull request #14523 from kcristiano/cividist
CiviDist fails on BSD flavor of 'cp' with '-r -p' switch to '-R -p'
eileen [Fri, 14 Jun 2019 01:58:28 +0000 (21:58 -0400)]
Add csv reader package
Adds https://csv.thephpleague.com/9.0/ because we can now (since we are php 7.x+ now).
Apart from being a pretty good package it will help with writing tests for csv output
It will also help us cleanup some of our csv code down the way
Seamus Lee [Fri, 14 Jun 2019 05:22:07 +0000 (15:22 +1000)]
Merge pull request #14528 from civicrm/5.15
5.15
Monish Deb [Fri, 14 Jun 2019 04:45:01 +0000 (10:15 +0530)]
Merge pull request #14526 from seamuslee001/nfc_fix_template_indent_misc
[NFC] Fix indenting in Misc Setting Template
Seamus Lee [Fri, 14 Jun 2019 03:55:23 +0000 (13:55 +1000)]
Merge pull request #14527 from totten/5.15-yaml-dg
(REF) Convert YAML fixtures to JSON. Reset symfony/yaml dependency.
Seamus Lee [Fri, 14 Jun 2019 03:38:00 +0000 (13:38 +1000)]
Merge pull request #14505 from seamuslee001/legacy_psr16_multisite
Update PSR16 handling for multisite extension legacy caching group
Tim Otten [Fri, 14 Jun 2019 02:48:01 +0000 (22:48 -0400)]
(REF) Convert YAML fixtures to JSON fixtures. Reset symfony/yaml dependency.
Overview
--------
The test suite includes some tests that read fixture data files (i.e. YAML files). This patch
provides a safer way to address a dependency-management issue with parsing YAML files.
Before
------
* In the last public release (`5.14`), the `symfony/yaml` package was not included with `civicrm-core`.
However, it was loaded during testing by virtue of running `phpunit6`.
* In the `5.15` RC code, `symfony/yaml` was added -- so that the test suite worked in `phpunit6`.
However, this also added `symfony/yaml` to the general runtime distribution - which is liable to create conflicts
with Civi extensions and CMS modules that also bundle `symfony/yaml`. (It's a popular package.)
After
-----
* The test suite no longer uses YAML, and the build no longer requires `symfony/yaml`. Instead, it uses JSON.
Seamus Lee [Fri, 14 Jun 2019 02:39:13 +0000 (12:39 +1000)]
[NFC] Fix indenting in Misc Setting Template
Kevin Cristiano [Fri, 14 Jun 2019 01:47:52 +0000 (21:47 -0400)]
CiviDist fails on BSD flavor of 'cp' with '-r -p' switch to '-R -p'
Seamus Lee [Fri, 14 Jun 2019 01:26:40 +0000 (11:26 +1000)]
Add in deprecated notice about code path being removed at end of 2019
Coleman Watts [Thu, 13 Jun 2019 23:24:23 +0000 (19:24 -0400)]
ActivityForm - Redirect to contact page or activity view in standalone mode
Eileen McNaughton [Thu, 13 Jun 2019 23:10:53 +0000 (19:10 -0400)]
Merge pull request #14501 from mattwire/attachment_description
Display description next to 'paperclip' file icon - usually the filename
Seamus Lee [Thu, 13 Jun 2019 21:49:15 +0000 (07:49 +1000)]
Merge pull request #14513 from eileenmcnaughton/export_sc_just_change
dev/core#1015 fix regression on exporting soft credits - more robust …
Seamus Lee [Thu, 13 Jun 2019 21:05:02 +0000 (07:05 +1000)]
Merge pull request #14518 from colemanw/paymentEditFix
dev/core#965 Fix destination in payment edit
Seamus Lee [Thu, 13 Jun 2019 21:04:48 +0000 (07:04 +1000)]
Merge pull request #14517 from eileenmcnaughton/test_fix
Fix test which fails when run in isolation.
Seamus Lee [Thu, 13 Jun 2019 20:44:20 +0000 (06:44 +1000)]
Merge pull request #14471 from eileenmcnaughton/tests
[NFC] test cleanup. Uses CRM_Core_Exceptions, properly outputs unfiltered results
Eileen McNaughton [Thu, 13 Jun 2019 20:40:17 +0000 (16:40 -0400)]
Merge pull request #14520 from civicrm/5.15
5.15
Eileen McNaughton [Thu, 13 Jun 2019 20:38:18 +0000 (16:38 -0400)]
Merge pull request #14484 from seamuslee001/l18n_improved_schema
Improve I18n schema by including comments and default and NOT NULL or…
colemanw [Thu, 13 Jun 2019 20:34:26 +0000 (16:34 -0400)]
Merge pull request #14154 from greenpeace-cee/fix-quicksearch-font
Fix placeholder font in Quicksearch
Tim Otten [Thu, 13 Jun 2019 20:32:19 +0000 (16:32 -0400)]
Merge pull request #14516 from eileenmcnaughton/except
[test] Add PrematureExitException to support unit testing where the code would otherwise exit
Eileen McNaughton [Thu, 13 Jun 2019 20:23:20 +0000 (16:23 -0400)]
Merge pull request #13966 from agileware/CIVICRM-1168
Fixed visibility logic on Price field options.
Coleman Watts [Thu, 13 Jun 2019 20:21:12 +0000 (16:21 -0400)]
dev/core#965 Fix destination in payment edit
eileen [Thu, 13 Jun 2019 20:19:19 +0000 (16:19 -0400)]
Fix test which fails when run in isolation.
There is a mystery contamination in our test suite somewhere where this test passes in a
suite & not by itself - this fixes although the fact this passes when not alone is
probably behind a few hard to find issues
colemanw [Thu, 13 Jun 2019 20:11:36 +0000 (16:11 -0400)]
Merge pull request #14250 from totten/master-select-null
CRM_Utils_SQL_* - Properly interpolate NULL values
eileen [Thu, 13 Jun 2019 18:53:17 +0000 (14:53 -0400)]
Add PrematureExitException to support unit testing where the code would otherwise exit
brianPHMatemachani [Thu, 13 Jun 2019 18:34:27 +0000 (19:34 +0100)]
Bugfix - getting id from hash (#14508)
* Bugfix - getting id from hash
* Styling changes, using single quotes as preferred.
* Correcting public link when hashed url is set
* Bugfix : correcting if statement. Public link setting the hash instead of id when 'hashed' setting is on.
* Coding standards changes. Spacing after close parenthesis and space after keyword
colemanw [Thu, 13 Jun 2019 18:18:49 +0000 (14:18 -0400)]
Merge pull request #14506 from seamuslee001/lab_core_1039
dev/core#1039 Make the contact details in the contact summary screen …
Eileen McNaughton [Thu, 13 Jun 2019 18:14:25 +0000 (14:14 -0400)]
Merge pull request #14510 from totten/master-relax-get-to-it
Civi\Angular\ChangeSet - Relax debug-mode consistency check
eileen [Wed, 5 Jun 2019 23:30:21 +0000 (11:30 +1200)]
dev/core#1015 fix regression on exporting soft credits - more robust version
This applies a full fix to a regression we fixed with a less robust fix due to test issues
https://github.com/civicrm/civicrm-core/pull/13748/commits/
7f59431188688d4697bff55738fe17996abe442f#diff-e54381bfdf51e31cab376c71ca0d66ffR2716
removed a space that was required when exporting soft credits. The fix makes the addition of a space in
a more sensible way (doesn't rely on it being done correctly in dozens of places
eileen [Fri, 7 Jun 2019 00:27:32 +0000 (12:27 +1200)]
[NFC] test cleanup. Uses CRM_Core_Exceptions, properly outputs unfiltered results
The comment blocks should show all exceptions thrown by a function so trying to stdise a little.
Also fixed failed output of unfiltered results when retrieval fails
Andrew Hunt [Thu, 13 Jun 2019 17:26:08 +0000 (13:26 -0400)]
[REF] CRM_Case_BAO_Case::addcaseActivityLinks to CRM_Case_Selector_Search
Tim Otten [Thu, 13 Jun 2019 16:30:41 +0000 (12:30 -0400)]
Civi\Angular\ChangeSet - Relax debug-mode consistency check
Overview
--------
The Angular subsystem *sometimes* includes a consistency-check. The consistency check ensures that an HTML document is
read/written in consistency format (i.e. `encode(decode($html)) === $html`). However, the check is not often run, and
it sometimes produces errors on consistency issues which we don't care about.
This approach here is to relaxes the checks in `civicrm-core` and reproduce them in separate developer-oriented tooling.
Before
------
* If an Angular HTML partial is not altered (`hook_civicrm_alterAngular`), then the partial is *not* checked for consistency.
* If a site is in production/non-debug mode, then the partial is *not* checked for consistency.
* If a site is in debug mode, then the partial *is* checked for consistency.
After
-----
* The partial is not checked for consistency.
* A task is recorded on the [Afform roadmap](https://github.com/totten/afform/blob/master/docs/roadmap.md) to include
better consistency checks in the `afform_auditor` extension.
Eileen McNaughton [Thu, 13 Jun 2019 15:01:34 +0000 (11:01 -0400)]
Merge pull request #13959 from mlutfy/setMessageError
dev/drupal#63 Drupal8: override setMessage(), because drupal_set_message is deprecated
Eileen McNaughton [Thu, 13 Jun 2019 12:08:34 +0000 (08:08 -0400)]
Merge pull request #14507 from yashodha/mem_reports
Expose Primary member only/Non primary member only filter in membersh…
yashodha [Thu, 13 Jun 2019 09:19:33 +0000 (14:49 +0530)]
Expose Primary member only/Non primary member only filter in membership reports
Seamus Lee [Thu, 13 Jun 2019 06:55:49 +0000 (16:55 +1000)]
dev/core#1039 Make the contact details in the contact summary screen popup on merge screens non bold a-la contact summary screen
Update to Monish's suggestion
Seamus Lee [Thu, 13 Jun 2019 06:07:25 +0000 (16:07 +1000)]
Update PSR16 handling for multisite extension legacy caching group
Fix version to compare against
Monish Deb [Thu, 13 Jun 2019 03:37:20 +0000 (09:07 +0530)]
Merge pull request #14500 from mattwire/extract_recaptcha
REF Deduplicate recaptcha handling code
Monish Deb [Thu, 13 Jun 2019 03:01:10 +0000 (08:31 +0530)]
Merge pull request #14504 from seamuslee001/ref_remove_unneded_search_code_contirbution_recur
Remove duplicated code in contribution recur search build function
Seamus Lee [Thu, 13 Jun 2019 02:34:49 +0000 (12:34 +1000)]
Merge pull request #14492 from colemanw/sub_type
Fix deletion of contact sub_type in api4
Coleman Watts [Tue, 11 Jun 2019 11:46:11 +0000 (07:46 -0400)]
Update contact_sub_type to ignore null values for consistency
For better or worse, every other field gets ignored by bao::add functions when passed as null,
so this test had an incorrect assumption about how it was supposed to work.
Seamus Lee [Wed, 12 Jun 2019 21:51:18 +0000 (07:51 +1000)]
Remove duplicated code in contribution recur search build function
Seamus Lee [Wed, 12 Jun 2019 21:33:23 +0000 (07:33 +1000)]
Merge pull request #14496 from mattwire/extract_overridedefaultcurrency
REF Extract override default currency function
Matthew Wire [Wed, 12 Jun 2019 19:02:00 +0000 (20:02 +0100)]
Merge pull request #14444 from eileenmcnaughton/export_up
[REF] Minor code cleanup on string concatenation
Matthew Wire [Wed, 12 Jun 2019 18:59:39 +0000 (19:59 +0100)]
Merge pull request #14436 from eileenmcnaughton/pay
Fix proportional test to test Payment.create & for the test to make more sense