civicrm-core.git
4 years ago[NFC] Add in a unit test of calling the contribution page widget endpoint and remove...
Seamus Lee [Sun, 26 Jul 2020 22:20:45 +0000 (08:20 +1000)]
[NFC] Add in a unit test of calling the contribution page widget endpoint and remove unneded file

4 years agoMerge pull request #17964 from seamuslee001/dev_core_1909_paymentprocessor
Seamus Lee [Sun, 26 Jul 2020 22:28:35 +0000 (08:28 +1000)]
Merge pull request #17964 from seamuslee001/dev_core_1909_paymentprocessor

dev/core#1909 Fix e-notice when adding a payment processor

4 years agodev/core#1909 Fix e-notice when adding a payment processor
Seamus Lee [Sun, 26 Jul 2020 21:21:42 +0000 (07:21 +1000)]
dev/core#1909 Fix e-notice when adding a payment processor

4 years agoMerge pull request #17959 from demeritcowboy/file-case-notice
Seamus Lee [Sun, 26 Jul 2020 21:01:22 +0000 (07:01 +1000)]
Merge pull request #17959 from demeritcowboy/file-case-notice

dev/core#1909 - E_NOTICE opening file-on-case

4 years agoMerge pull request #17941 from eileenmcnaughton/fieldspec
Seamus Lee [Sun, 26 Jul 2020 20:56:58 +0000 (06:56 +1000)]
Merge pull request #17941 from eileenmcnaughton/fieldspec

[Ref] Simplify field reference

4 years agoE_NOTICE opening file-on-case
demeritcowboy [Sat, 25 Jul 2020 15:28:11 +0000 (11:28 -0400)]
E_NOTICE opening file-on-case

4 years agoMerge pull request #17957 from demeritcowboy/combine-createcase
Seamus Lee [Sat, 25 Jul 2020 20:27:35 +0000 (06:27 +1000)]
Merge pull request #17957 from demeritcowboy/combine-createcase

[Test framework] - Combine triplicate createCase functions

4 years agoMerge pull request #17932 from seamuslee001/ref_radio
Seamus Lee [Sat, 25 Jul 2020 20:26:53 +0000 (06:26 +1000)]
Merge pull request #17932 from seamuslee001/ref_radio

[REF] Refactor to use the standard CRM_Core_Form::addRadio function f…

4 years agocombine duplicate functions
demeritcowboy [Sat, 25 Jul 2020 15:41:35 +0000 (11:41 -0400)]
combine duplicate functions

4 years agoMerge pull request #17948 from seamuslee001/mail_mime_upgrade
Seamus Lee [Sat, 25 Jul 2020 08:00:39 +0000 (18:00 +1000)]
Merge pull request #17948 from seamuslee001/mail_mime_upgrade

Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer

4 years agoMerge pull request #17938 from seamuslee001/ref_fix_financial_account
Eileen McNaughton [Sat, 25 Jul 2020 06:34:30 +0000 (18:34 +1200)]
Merge pull request #17938 from seamuslee001/ref_fix_financial_account

[REF] Fix the default to_financial_account_id for generated transactions

4 years agoMerge pull request #17955 from colemanw/superstar
Eileen McNaughton [Sat, 25 Jul 2020 06:25:32 +0000 (18:25 +1200)]
Merge pull request #17955 from colemanw/superstar

APIv4 - Add keyword to select all custom fields

4 years agoUpgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer
Seamus Lee [Fri, 24 Jul 2020 22:41:32 +0000 (08:41 +1000)]
Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer

4 years agoMerge pull request #17946 from seamuslee001/ref_dompdf_upgrade
Eileen McNaughton [Sat, 25 Jul 2020 06:14:23 +0000 (18:14 +1200)]
Merge pull request #17946 from seamuslee001/ref_dompdf_upgrade

[REF] Upgrade dompdf version to be more compatible with PHP7.4

4 years agoAPIv4 - Add keyword to select all custom fields
Coleman Watts [Sat, 25 Jul 2020 01:44:13 +0000 (21:44 -0400)]
APIv4 - Add keyword to select all custom fields

4 years agoMerge pull request #17939 from eileenmcnaughton/ex_meta
Seamus Lee [Sat, 25 Jul 2020 00:50:42 +0000 (10:50 +1000)]
Merge pull request #17939 from eileenmcnaughton/ex_meta

[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements

4 years agoMerge pull request #17914 from demeritcowboy/invisible-messages
Eileen McNaughton [Sat, 25 Jul 2020 00:45:34 +0000 (12:45 +1200)]
Merge pull request #17914 from demeritcowboy/invisible-messages

dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes

4 years agoMerge pull request #17953 from civicrm/5.28
Eileen McNaughton [Sat, 25 Jul 2020 00:40:46 +0000 (12:40 +1200)]
Merge pull request #17953 from civicrm/5.28

5.28 to master

4 years agoMerge pull request #17947 from agh1/dev-core-1899-5-28
Eileen McNaughton [Sat, 25 Jul 2020 00:40:20 +0000 (12:40 +1200)]
Merge pull request #17947 from agh1/dev-core-1899-5-28

dev/core#1899 specify display mode for action links with icons

4 years agoMerge pull request #17949 from eileenmcnaughton/export_im
Eileen McNaughton [Fri, 24 Jul 2020 23:54:22 +0000 (11:54 +1200)]
Merge pull request #17949 from eileenmcnaughton/export_im

[REF] Remove unnecessary complexity on im export

4 years ago[REF] Remove unnecessary complexity on im export
eileen [Fri, 24 Jul 2020 22:54:20 +0000 (10:54 +1200)]
[REF] Remove unnecessary complexity on im export

This just removes a couple of lines that were already marked as being likely unhelpful. Because the impact of
these lines is tested the test needs tweaking too - but it only affects the name of the fields in the temp
table and in internal php keys

4 years agodev/core#1899 specify display mode for action links with icons
Andrew Hunt [Fri, 24 Jul 2020 00:46:27 +0000 (20:46 -0400)]
dev/core#1899 specify display mode for action links with icons

4 years ago[REF] Upgrade dompdf version to be more compatible with PHP7.4
Seamus Lee [Fri, 24 Jul 2020 21:50:26 +0000 (07:50 +1000)]
[REF] Upgrade dompdf version to be more compatible with PHP7.4

4 years agoMerge pull request #17945 from colemanw/commentCleanup
Seamus Lee [Fri, 24 Jul 2020 21:40:08 +0000 (07:40 +1000)]
Merge pull request #17945 from colemanw/commentCleanup

NFC - Docblock cleanup

4 years agoMerge pull request #17944 from colemanw/caseCheck
colemanw [Fri, 24 Jul 2020 19:13:20 +0000 (15:13 -0400)]
Merge pull request #17944 from colemanw/caseCheck

CRM_Utils_Check_Component_Case - Guard against post-upgrade crash

4 years agoNFC - Expand CRM-* comments with full @see annotations
Coleman Watts [Fri, 24 Jul 2020 19:10:29 +0000 (15:10 -0400)]
NFC - Expand CRM-* comments with full @see annotations

4 years agoNFC - Fix @return annotation in CRM_Utils_Check_Component_*
Coleman Watts [Fri, 24 Jul 2020 18:23:16 +0000 (14:23 -0400)]
NFC - Fix @return annotation in CRM_Utils_Check_Component_*

4 years agoCRM_Utils_Check_Component_Case - Guard against post-upgrade crash
Coleman Watts [Fri, 24 Jul 2020 17:45:18 +0000 (13:45 -0400)]
CRM_Utils_Check_Component_Case - Guard against post-upgrade crash

4 years agoMerge pull request #17940 from eileenmcnaughton/abort
colemanw [Fri, 24 Jul 2020 13:36:35 +0000 (09:36 -0400)]
Merge pull request #17940 from eileenmcnaughton/abort

Remove error checking by-pass in tests

4 years agoMerge pull request #17936 from eileenmcnaughton/cache
colemanw [Fri, 24 Jul 2020 12:59:04 +0000 (08:59 -0400)]
Merge pull request #17936 from eileenmcnaughton/cache

Remove extraneous opportunistic cache flush.

4 years ago[Ref] Simplify field reference
eileen [Fri, 24 Jul 2020 07:35:01 +0000 (19:35 +1200)]
[Ref] Simplify field reference

4 years agoRemove error checking by-pass in tests
eileen [Fri, 24 Jul 2020 07:01:13 +0000 (19:01 +1200)]
Remove error checking by-pass in tests

4 years ago[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements
eileen [Fri, 24 Jul 2020 06:50:23 +0000 (18:50 +1200)]
[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements

4 years ago[REF] Fix the default to_financial_account_id for generated transactions
Seamus Lee [Fri, 24 Jul 2020 05:42:05 +0000 (15:42 +1000)]
[REF] Fix the default to_financial_account_id for generated transactions

4 years agoRemove extraneous opportunistic cache flush.
eileen [Thu, 23 Jul 2020 03:57:48 +0000 (15:57 +1200)]
Remove extraneous opportunistic cache flush.

The opportunistic cache flush is already called by contact create and then again by each of the places
where the contact might be added to a group so this is just extraneous

4 years ago[REF] Refactor to use the standard CRM_Core_Form::addRadio function for a number...
Seamus Lee [Fri, 24 Jul 2020 00:12:37 +0000 (10:12 +1000)]
[REF] Refactor to use the standard CRM_Core_Form::addRadio function for a number of radio elements

4 years agoMerge pull request #17930 from twomice/1902_contrib_source_profile
Eileen McNaughton [Fri, 24 Jul 2020 00:05:22 +0000 (12:05 +1200)]
Merge pull request #17930 from twomice/1902_contrib_source_profile

dev/core#1902: "Contribution Source" profile field has no effect

4 years agoMerge pull request #17928 from colemanw/groupContactCleanup
Eileen McNaughton [Thu, 23 Jul 2020 23:01:53 +0000 (11:01 +1200)]
Merge pull request #17928 from colemanw/groupContactCleanup

[REF] GroupContact BAO - Minor code cleanup

4 years agoMerge pull request #17931 from civicrm/5.28
Eileen McNaughton [Thu, 23 Jul 2020 22:45:30 +0000 (10:45 +1200)]
Merge pull request #17931 from civicrm/5.28

5.28 to master

4 years agoMerge pull request #17929 from demeritcowboy/required-not-5.28
Eileen McNaughton [Thu, 23 Jul 2020 22:42:12 +0000 (10:42 +1200)]
Merge pull request #17929 from demeritcowboy/required-not-5.28

dev/core#1903 - Avoid E_WARNING and remove code

4 years agodev/core#1902: "Contribution Source" profile field has no effect on new contribution.
Allen Shaw [Thu, 23 Jul 2020 22:19:39 +0000 (17:19 -0500)]
dev/core#1902: "Contribution Source" profile field has no effect on new contribution.

4 years agoavoid E_WARNING and remove code
demeritcowboy [Thu, 23 Jul 2020 20:26:11 +0000 (16:26 -0400)]
avoid E_WARNING and remove code

4 years agoGroupContact BAO - Minor code cleanup
Coleman Watts [Thu, 23 Jul 2020 16:23:11 +0000 (12:23 -0400)]
GroupContact BAO - Minor code cleanup

4 years agoMerge pull request #17922 from eileenmcnaughton/group_contact
colemanw [Thu, 23 Jul 2020 16:18:26 +0000 (12:18 -0400)]
Merge pull request #17922 from eileenmcnaughton/group_contact

[REF] Minor function signuture cleanup

4 years agoMerge pull request #17921 from eileenmcnaughton/format
colemanw [Thu, 23 Jul 2020 13:05:41 +0000 (09:05 -0400)]
Merge pull request #17921 from eileenmcnaughton/format

[REF] Do not pass variable by reference

4 years agoMerge pull request #17926 from civicrm/5.28
Eileen McNaughton [Thu, 23 Jul 2020 08:41:38 +0000 (20:41 +1200)]
Merge pull request #17926 from civicrm/5.28

5.28

4 years ago[REF] Minor function signuturre cleanup
eileen [Thu, 23 Jul 2020 04:06:23 +0000 (16:06 +1200)]
[REF] Minor function signuturre cleanup

 is never altered so it is unnecessary to pass by reference. visibility is just
used to set ignorePermissions

4 years agoMerge pull request #17925 from seamuslee001/5.28
Seamus Lee [Thu, 23 Jul 2020 06:44:09 +0000 (16:44 +1000)]
Merge pull request #17925 from seamuslee001/5.28

Add release-notes/5.27.3

4 years agoAdd release-notes/5.27.3
Tim Otten [Thu, 23 Jul 2020 04:53:40 +0000 (21:53 -0700)]
Add release-notes/5.27.3

4 years agoMerge pull request #17918 from mlutfy/docUpdates
Eileen McNaughton [Thu, 23 Jul 2020 04:20:45 +0000 (16:20 +1200)]
Merge pull request #17918 from mlutfy/docUpdates

[NFC] Update a few doc/wiki links in code comments

4 years ago[REF] Do not pass variable by reference
eileen [Thu, 23 Jul 2020 03:52:55 +0000 (15:52 +1200)]
[REF] Do not pass variable by reference

This variable is not altered in the function so does not need to be passed by reference

4 years agoMerge pull request #17916 from colemanw/domainCache
Seamus Lee [Thu, 23 Jul 2020 02:43:35 +0000 (12:43 +1000)]
Merge pull request #17916 from colemanw/domainCache

Improve caching of current domain

4 years agoMerge pull request #17778 from totten/master-setup-validate
Seamus Lee [Wed, 22 Jul 2020 21:49:10 +0000 (07:49 +1000)]
Merge pull request #17778 from totten/master-setup-validate

Setup UI - Validate that at least one "Component" is enabled

4 years agoMerge pull request #17911 from agh1/memberdetailreportautorenew
Seamus Lee [Wed, 22 Jul 2020 21:12:27 +0000 (07:12 +1000)]
Merge pull request #17911 from agh1/memberdetailreportautorenew

Member detail report: nest "in" options in parentheses

4 years agoUpdate a few doc/wiki links in code comments
Mathieu Lutfy [Wed, 22 Jul 2020 20:14:49 +0000 (16:14 -0400)]
Update a few doc/wiki links in code comments

4 years agoAPIv3 - If requesting current domain, read from cache
Coleman Watts [Wed, 22 Jul 2020 14:20:26 +0000 (10:20 -0400)]
APIv3 - If requesting current domain, read from cache

4 years agoUse sensible caching for current domain
Coleman Watts [Thu, 18 Jun 2020 16:21:54 +0000 (12:21 -0400)]
Use sensible caching for current domain

4 years agoMerge pull request #17917 from christianwach/lab-core-1901
colemanw [Wed, 22 Jul 2020 15:41:55 +0000 (11:41 -0400)]
Merge pull request #17917 from christianwach/lab-core-1901

Fix sticky table header on "Find Activities" page

4 years agoFix sticky table header on "Find Activities" page
Christian Wach [Wed, 22 Jul 2020 15:03:05 +0000 (16:03 +0100)]
Fix sticky table header on "Find Activities" page

4 years agoavoid messages not being shown
demeritcowboy [Wed, 22 Jul 2020 04:21:14 +0000 (00:21 -0400)]
avoid messages not being shown

4 years agoMember detail report: nest "in" options in parentheses
Andrew Hunt [Wed, 22 Jul 2020 01:49:20 +0000 (21:49 -0400)]
Member detail report: nest "in" options in parentheses

4 years agoMerge pull request #17908 from civicrm/5.28
Seamus Lee [Wed, 22 Jul 2020 00:26:56 +0000 (10:26 +1000)]
Merge pull request #17908 from civicrm/5.28

5.28

4 years agoMerge branch 'master' into 5.28
Seamus Lee [Wed, 22 Jul 2020 00:25:58 +0000 (10:25 +1000)]
Merge branch 'master' into 5.28

4 years agoMerge pull request #17906 from seamuslee001/lab_core_1846
Seamus Lee [Wed, 22 Jul 2020 00:13:27 +0000 (10:13 +1000)]
Merge pull request #17906 from seamuslee001/lab_core_1846

dev/core#1846 Make DAO upgrade safe

4 years agoFix failing settingTest and mark setting.fill as deprecated
Coleman Watts [Fri, 3 Jul 2020 16:20:04 +0000 (12:20 -0400)]
Fix failing settingTest and mark setting.fill as deprecated

The settingTest class was being too aggressive about creating and deleting domains,
this teaches it to not delete pre-existing domains.
Also marks an old unused api function deprecated.

4 years agoAdd upgrade-safe DAO::getSupportedFields method
Coleman Watts [Wed, 1 Jul 2020 17:25:31 +0000 (13:25 -0400)]
Add upgrade-safe DAO::getSupportedFields method

Switches api v3 and v4 to use that method so they are upgrade-safe by default.

4 years agoMerge pull request #17903 from eileenmcnaughton/format
Seamus Lee [Tue, 21 Jul 2020 22:23:45 +0000 (08:23 +1000)]
Merge pull request #17903 from eileenmcnaughton/format

[REF] remove unnecessary variable variables

4 years agoMerge pull request #17901 from demeritcowboy/outputhandler2
Seamus Lee [Tue, 21 Jul 2020 22:12:08 +0000 (08:12 +1000)]
Merge pull request #17901 from demeritcowboy/outputhandler2

dev/core#1855 - Allow different output formats for CiviReport results and untangle code

4 years agoMerge pull request #17650 from colemanw/getMultilingual
Seamus Lee [Tue, 21 Jul 2020 22:07:17 +0000 (08:07 +1000)]
Merge pull request #17650 from colemanw/getMultilingual

[REF] - Add helper function for the repetitive task of fetching multilingual

4 years agoMerge pull request #17905 from MegaphoneJon/fix-dummy-processor
Seamus Lee [Tue, 21 Jul 2020 20:31:44 +0000 (06:31 +1000)]
Merge pull request #17905 from MegaphoneJon/fix-dummy-processor

[unreleased regression] Dummy processor now is ID 7 on buildkit sites

4 years ago[REF] - Add helper function for the repetitive task of fetching multilingual
Coleman Watts [Thu, 18 Jun 2020 16:21:54 +0000 (12:21 -0400)]
[REF] - Add helper function for the repetitive task of fetching multilingual

Adds the function CRM_Core_I18n::getMultilingual() and replaces a bunch of
places where the work was being done manually.

This also fixes a suspected bug where multiple domains may not have been compatible
with multiple languages, as the current domain id was previously ignored,
but is respected in the helper function.

4 years agoMerge pull request #17904 from christianwach/lab-core-1890
Matthew Wire [Tue, 21 Jul 2020 18:46:36 +0000 (19:46 +0100)]
Merge pull request #17904 from christianwach/lab-core-1890

Remove unused "ufUniqID" session variable

4 years agoDummy processor now is ID 7 on buildkit sites
Jon Goldberg [Tue, 21 Jul 2020 18:00:14 +0000 (14:00 -0400)]
Dummy processor now is ID 7 on buildkit sites

4 years agoMerge pull request #17900 from aydun/wiki_changes
colemanw [Tue, 21 Jul 2020 14:45:00 +0000 (10:45 -0400)]
Merge pull request #17900 from aydun/wiki_changes

Replace a load of references to the wiki with docs links

4 years agoRemove unused "ufUniqID" session variable
Christian Wach [Tue, 21 Jul 2020 13:03:50 +0000 (14:03 +0100)]
Remove unused "ufUniqID" session variable

4 years agoReplace a load of references to the wiki with docs links
Aidan Saunders [Mon, 20 Jul 2020 21:07:30 +0000 (22:07 +0100)]
Replace a load of references to the wiki with docs links
Change docs links to 'latest' not 'stable'

4 years agoMerge pull request #17902 from demeritcowboy/test-activity-qill
Eileen McNaughton [Tue, 21 Jul 2020 05:21:25 +0000 (17:21 +1200)]
Merge pull request #17902 from demeritcowboy/test-activity-qill

dev/core#1894 - Make CRM_Activity_Form_SearchTest::testQill less time-sensitive

4 years ago[REF] remove unnecessary variable variables
eileen [Tue, 21 Jul 2020 04:17:42 +0000 (16:17 +1200)]
[REF] remove unnecessary variable variables

For a brief but terrifying spell this arvo I delved into this function to try to understand
the purpose of 'preserveDBName'. Obviously I ran screaming from the room but I thought I could disarm these
few lines to slighly file down the fangs of the beast.

Code is heavily covered by tests

4 years agomake test less time-sensitive
demeritcowboy [Tue, 21 Jul 2020 03:14:46 +0000 (23:14 -0400)]
make test less time-sensitive

4 years agoAllow extensions to provide their own formats and clean up tangled code
demeritcowboy [Mon, 20 Jul 2020 01:09:55 +0000 (21:09 -0400)]
Allow extensions to provide their own formats and clean up tangled code

4 years agoMerge pull request #17827 from eileenmcnaughton/utf_import
Seamus Lee [Mon, 20 Jul 2020 22:32:37 +0000 (08:32 +1000)]
Merge pull request #17827 from eileenmcnaughton/utf_import

dev/core#183 Use TempTable builder to generate table for import

4 years agoMerge pull request #17771 from mattwire/ufmatch_validemail
Eileen McNaughton [Mon, 20 Jul 2020 22:14:06 +0000 (10:14 +1200)]
Merge pull request #17771 from mattwire/ufmatch_validemail

Remove check for valid email in synchronizeUFMatch

4 years agoMerge pull request #17881 from eileenmcnaughton/activity
colemanw [Mon, 20 Jul 2020 21:34:00 +0000 (17:34 -0400)]
Merge pull request #17881 from eileenmcnaughton/activity

Call apiv4 from Contribution create rather than fugly addActivity function

4 years agoMerge pull request #17899 from colemanw/basicEntity
Eileen McNaughton [Mon, 20 Jul 2020 21:30:55 +0000 (09:30 +1200)]
Merge pull request #17899 from colemanw/basicEntity

APIv4 - Add BasicEntity helper class

4 years agoCall apiv4 from Contribution create rather than fugly addActivity function
eileen [Sat, 18 Jul 2020 02:02:47 +0000 (14:02 +1200)]
Call apiv4 from Contribution create rather than fugly addActivity function

I took a look at https://github.com/civicrm/civicrm-core/pull/17274 which has blocking test failures - but felt that
the shared function was adding nothing and simply using the api to create the activity made more sense. The
shared function does a lot of silly wrangling for very little shared functionality and is
hard to read. In this call only 2 params are passed in - so most of the wranglingg
doesn't apply anyway. I ensured the 2 JIRA issues referenced in the removed code have test cover (one already
had a test written by Monish & I added in the campaign check

4 years agodev/core#183 Fix import csv to use temp table builder
eileen [Tue, 14 Jul 2020 05:57:39 +0000 (17:57 +1200)]
dev/core#183 Fix import csv to use temp table builder

4 years agoUse TempTable builder to generate table for import
eileen [Tue, 14 Jul 2020 05:36:24 +0000 (17:36 +1200)]
Use TempTable builder to generate table for import

4 years agoMerge pull request #17867 from MegaphoneJon/mailing-70
colemanw [Mon, 20 Jul 2020 18:45:47 +0000 (14:45 -0400)]
Merge pull request #17867 from MegaphoneJon/mailing-70

mailing#70 Don't create users for test mail if user doesn't have permission

4 years agoAPIv4 - Add BasicEntity helper class
Coleman Watts [Mon, 20 Jul 2020 18:30:35 +0000 (14:30 -0400)]
APIv4 - Add BasicEntity helper class

4 years agoMerge pull request #17879 from colemanw/relCacheApi
colemanw [Mon, 20 Jul 2020 14:43:32 +0000 (10:43 -0400)]
Merge pull request #17879 from colemanw/relCacheApi

Add APIv4 and pseudoconstants for RelationshipCache

4 years agoMerge pull request #17580 from samuelsov/dev/core#1670
Eileen McNaughton [Mon, 20 Jul 2020 07:11:33 +0000 (19:11 +1200)]
Merge pull request #17580 from samuelsov/dev/core#1670

dev/core#1670 copy custom fields from master to shared address

4 years agoMerge pull request #17560 from eileenmcnaughton/import
Seamus Lee [Mon, 20 Jul 2020 06:59:08 +0000 (16:59 +1000)]
Merge pull request #17560 from eileenmcnaughton/import

[Ref] Unit test attempt to create reported bugs , minor cleanup

4 years agoMerge pull request #17897 from seamuslee001/setver_new
Seamus Lee [Mon, 20 Jul 2020 05:14:13 +0000 (15:14 +1000)]
Merge pull request #17897 from seamuslee001/setver_new

Update version in the test_data_second_domain file and also update th…

4 years agoMerge pull request #17898 from demeritcowboy/smartgroupmarker
Eileen McNaughton [Mon, 20 Jul 2020 03:50:42 +0000 (15:50 +1200)]
Merge pull request #17898 from demeritcowboy/smartgroupmarker

dev/core#1888 - Fix one line in PR 17888

4 years agoUpdate version in the test_data_second_domain file and also update the setVersion...
Seamus Lee [Mon, 20 Jul 2020 01:42:23 +0000 (11:42 +1000)]
Update version in the test_data_second_domain file and also update the setVersion script to update the file version as necessary

Set setting indicating system has been installed after loading in the 2nd domain

4 years agosomehow messed up a line in revert ba2ad46
demeritcowboy [Mon, 20 Jul 2020 02:44:07 +0000 (22:44 -0400)]
somehow messed up a line in revert ba2ad46

4 years ago[Ref] Unit test attempt to create reported bugs , minor refactor
eileen [Tue, 9 Jun 2020 07:50:02 +0000 (19:50 +1200)]
[Ref] Unit test attempt to create reported bugs , minor refactor

This lays the ground work to test a couple of reported bugs. Minor cleanup of code

4 years agoMerge pull request #17896 from eileenmcnaughton/pdfletter
colemanw [Mon, 20 Jul 2020 02:25:52 +0000 (22:25 -0400)]
Merge pull request #17896 from eileenmcnaughton/pdfletter

Be a little less supportive to cvs

4 years agoMerge pull request #17888 from demeritcowboy/groups-warnings
Eileen McNaughton [Mon, 20 Jul 2020 02:16:17 +0000 (14:16 +1200)]
Merge pull request #17888 from demeritcowboy/groups-warnings

dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form

4 years agoBe a little less supportive to cvs
eileen [Mon, 20 Jul 2020 00:48:29 +0000 (12:48 +1200)]
Be a little less supportive to cvs