Seamus Lee [Sun, 18 Aug 2019 04:37:08 +0000 (14:37 +1000)]
[NFC] Fix test syntax
Eileen McNaughton [Sun, 18 Aug 2019 04:02:19 +0000 (16:02 +1200)]
Merge pull request #15065 from civicrm/5.17
5.17
Seamus Lee [Sun, 18 Aug 2019 03:36:44 +0000 (13:36 +1000)]
Merge pull request #15018 from eileenmcnaughton/metadata
[Ref] [Import] move metadata calculations to a trait
Seamus Lee [Sun, 18 Aug 2019 03:33:12 +0000 (13:33 +1000)]
Merge pull request #15048 from eileenmcnaughton/5.17
Fix unreleased regression on import
Eileen McNaughton [Sat, 17 Aug 2019 20:13:47 +0000 (08:13 +1200)]
Merge pull request #15043 from prondubuisi/fix-civi-api3-exception
dev/core#1188 Fix API v3 error Class or interface CiviCRM_API3_Exception does not exist
Eileen McNaughton [Sat, 17 Aug 2019 20:11:57 +0000 (08:11 +1200)]
Merge pull request #15059 from civicrm/5.17
5.17
Eileen McNaughton [Sat, 17 Aug 2019 20:11:16 +0000 (08:11 +1200)]
Merge pull request #15060 from bsilvern/event-10.1
dev/event#10 - Prevent old notes from being exposed in event confirmation email
Bob Silvern [Sat, 17 Aug 2019 18:08:27 +0000 (11:08 -0700)]
dev/event#10 - Prevent old notes exposed in event confirmation email
Seamus Lee [Sat, 17 Aug 2019 08:10:48 +0000 (18:10 +1000)]
Merge pull request #15058 from seamuslee001/dev_core_1186
dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #1…
Seamus Lee [Sat, 17 Aug 2019 05:48:40 +0000 (15:48 +1000)]
Merge pull request #15057 from seamuslee001/nfc_upgrade_template_reformat
[NFC] Update Upgrade Template to use short array syntax
Eileen McNaughton [Sat, 17 Aug 2019 04:48:01 +0000 (16:48 +1200)]
Merge pull request #15055 from demeritcowboy/file-no-description
dev/core#1186 - ignore exception if no description field
Seamus Lee [Sat, 17 Aug 2019 04:42:33 +0000 (14:42 +1000)]
dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #15055
Seamus Lee [Sat, 17 Aug 2019 03:53:58 +0000 (13:53 +1000)]
[NFC] Update Upgrade Template to use short array syntax
Eileen McNaughton [Sat, 17 Aug 2019 03:39:51 +0000 (15:39 +1200)]
Merge pull request #15046 from 19ATF77/Fix_Activitytpl
Do not show Activity Separation on when viewing an Activity
Eileen McNaughton [Sat, 17 Aug 2019 03:34:49 +0000 (15:34 +1200)]
Merge pull request #15056 from civicrm/5.17
5.17
Tim Otten [Sat, 17 Aug 2019 01:46:01 +0000 (18:46 -0700)]
Merge pull request #15054 from colemanw/select2
Update select2 to latest 3.x + patches
Seamus Lee [Sat, 17 Aug 2019 01:42:49 +0000 (11:42 +1000)]
Merge pull request #15047 from eileenmcnaughton/pptx
dev/core#1190 Add pptx to safe file types
DemeritCowboy [Sat, 17 Aug 2019 01:31:42 +0000 (21:31 -0400)]
catch exception when no description
Coleman Watts [Fri, 16 Aug 2019 23:18:59 +0000 (19:18 -0400)]
Update select2 to latest 3.x + patches
Eileen McNaughton [Fri, 16 Aug 2019 21:13:05 +0000 (09:13 +1200)]
Merge pull request #15029 from reecebenson/bugfix/reports-remove-sorting-filters
Allow for the deselection of sorting filters
Micah [Thu, 15 Aug 2019 12:34:33 +0000 (13:34 +0100)]
Do not show Activity Separation on when viewing an Activity
Reece Benson [Fri, 16 Aug 2019 06:31:31 +0000 (07:31 +0100)]
Fix undefined index when setting value to empty when removing order by filters
eileen [Sun, 11 Aug 2019 22:53:17 +0000 (10:53 +1200)]
Extract metadata definition into a trait.
This metadata needs to be shared between multiple import forms. They do not have a common parent.
Curently this is done via calculating once & passing via quickform. However, the formats
are convoluted & hard to read.
Information that is user generated should be calculated per form - not so much metadata
Seamus Lee [Thu, 15 Aug 2019 22:46:51 +0000 (08:46 +1000)]
Merge pull request #15015 from eileenmcnaughton/import_message
[REF] [Import] Minor cleanup on status setting.
Seamus Lee [Thu, 15 Aug 2019 22:46:07 +0000 (08:46 +1000)]
Merge pull request #15017 from eileenmcnaughton/import_cont
[REF] [Import] extract saved mapping code to parent class
Seamus Lee [Thu, 15 Aug 2019 22:42:43 +0000 (08:42 +1000)]
Merge pull request #14981 from eileenmcnaughton/load_extract
[Import] [Cleanup] remove unused parameters
Seamus Lee [Thu, 15 Aug 2019 22:41:27 +0000 (08:41 +1000)]
Merge pull request #15028 from eileenmcnaughton/import_processor
[Test] [Ref] [Import]Add wrapper class for importProcessor
eileen [Thu, 15 Aug 2019 20:54:20 +0000 (08:54 +1200)]
dev/core#1190 Add pptx to safe file types
I feel like it would be better to store these as an array somewhere - maybe as the first step to
a metadata construct for Option groups...
eileen [Wed, 14 Aug 2019 03:26:56 +0000 (15:26 +1200)]
Fix unreleased regression on import
https://github.com/civicrm/civicrm-core/commit/
2adc819d0e59d71ffcf14c6799a379f108b07d60
made the code a little more readable but changed the indexing from 0-based to column based.
See https://pear.php.net/manual/en/package.database.db.db-common.setfetchmode.php
THis can be replicated by trying to update an existing mapping
Eileen McNaughton [Thu, 15 Aug 2019 21:27:10 +0000 (09:27 +1200)]
Merge pull request #15032 from demeritcowboy/human-label-function
dev/core#1116 - towards fixing activity type name vs label
Eileen McNaughton [Thu, 15 Aug 2019 21:25:35 +0000 (09:25 +1200)]
Merge pull request #15045 from mattwire/detaillogging_viewdelete
Enable view/revert delete action for detail logging
Eileen McNaughton [Thu, 15 Aug 2019 21:24:17 +0000 (09:24 +1200)]
Merge pull request #15035 from scardinius/core-1185
Display only own assignees contact(s) on batch activity form
Matthew Wire [Thu, 15 Aug 2019 17:17:22 +0000 (18:17 +0100)]
Merge pull request #14992 from sushantpaste/membership-fee-token
Membership fee token fix dev/core/#377
Matthew Wire (MJW Consulting) [Thu, 15 Aug 2019 11:03:25 +0000 (12:03 +0100)]
Enable view/revert delete action for detail logging
Onyemenam Ndubuisi [Thu, 15 Aug 2019 09:00:16 +0000 (10:00 +0100)]
fix API v3 exception class not found erro
Eileen McNaughton [Thu, 15 Aug 2019 05:41:24 +0000 (17:41 +1200)]
Merge pull request #15042 from civicrm/5.17
5.17
Seamus Lee [Thu, 15 Aug 2019 04:43:04 +0000 (14:43 +1000)]
Merge pull request #15041 from seamuslee001/5.17
Add release-notes/5.16.2.md
Tim Otten [Thu, 15 Aug 2019 03:10:55 +0000 (20:10 -0700)]
Add release-notes/5.16.2.md
Eileen McNaughton [Wed, 14 Aug 2019 22:30:30 +0000 (10:30 +1200)]
Merge pull request #15038 from civicrm/5.17
5.17 to master
Eileen McNaughton [Wed, 14 Aug 2019 22:29:58 +0000 (10:29 +1200)]
Merge pull request #15037 from demeritcowboy/fin-account-limbo
dev/financial#65 - Revert recent changes that cause financial account edit form to be blank
DemeritCowboy [Wed, 14 Aug 2019 21:07:31 +0000 (17:07 -0400)]
dev/financial#65
Eileen McNaughton [Wed, 14 Aug 2019 18:58:29 +0000 (06:58 +1200)]
Merge pull request #15036 from reecebenson/contributor-add
Add myself to the contributor list
DemeritCowboy [Wed, 14 Aug 2019 03:38:13 +0000 (23:38 -0400)]
make temporary function towards bigger changes
Reece Benson [Wed, 14 Aug 2019 12:55:19 +0000 (13:55 +0100)]
Add myself to the contributor list
Seamus Lee [Wed, 14 Aug 2019 09:01:10 +0000 (19:01 +1000)]
Merge pull request #15033 from eileenmcnaughton/dumb
Remove silly dumb unreachable lines
scardinius [Wed, 14 Aug 2019 08:56:15 +0000 (10:56 +0200)]
dev/core#1185 Display only own assignees contact(s) on batch activity form
eileen [Wed, 14 Aug 2019 06:57:45 +0000 (18:57 +1200)]
Remove silly dumb unreachable lines
eileen [Tue, 13 Aug 2019 10:46:49 +0000 (22:46 +1200)]
Add wrapper class for importProcessor
With the export cleanup creating a new sensible class & migrating code to it turned out to be a good approach.
This adds a class that wraps around the Importer Object, taking the mapping_field db format of fields
as a format - this is also where we wound up with the Export - using that format as it is what is saed.
There is a gap as I noted in https://lab.civicrm.org/dev/core/issues/1172 around the schema's adequacy.
That is not such an issue for this - in that we are not dealing with Contribution import and
this is really just exposing the wrapper for the unit tests at this stage - the only change to
'live' code is a little less php v4 support - we have removed a bunch of these from the constructor of the
other objects already with no observed issues
Eileen McNaughton [Tue, 13 Aug 2019 21:38:09 +0000 (09:38 +1200)]
Merge pull request #15000 from demeritcowboy/activityName-1116
dev/core#1116 - rename local var activityName
Eileen McNaughton [Tue, 13 Aug 2019 21:37:09 +0000 (09:37 +1200)]
Merge pull request #15031 from mfb/upgrade-fix
Fix upgrade version for #13487
mark burdett [Tue, 13 Aug 2019 17:25:25 +0000 (10:25 -0700)]
Fix upgrade version for https://github.com/civicrm/civicrm-core/pull/13487
colemanw [Tue, 13 Aug 2019 15:31:28 +0000 (11:31 -0400)]
Merge pull request #15027 from demeritcowboy/is-nullish
[Test] Demonstrate the truthiness of CRM_Utils_System::isNull
Reece Benson [Tue, 13 Aug 2019 14:31:28 +0000 (15:31 +0100)]
Allow for the deselection of sorting filters
Eileen McNaughton [Tue, 13 Aug 2019 10:26:02 +0000 (22:26 +1200)]
Merge pull request #15012 from seamuslee001/dev_core_752
dev/core#752 Add cid parameter when loading custom data via backend f…
DemeritCowboy [Thu, 8 Aug 2019 23:01:48 +0000 (19:01 -0400)]
Seamus Lee [Tue, 13 Aug 2019 00:13:16 +0000 (10:13 +1000)]
Merge pull request #14988 from eileenmcnaughton/sc
Unit test for custom date parsing
Eileen McNaughton [Tue, 13 Aug 2019 00:12:09 +0000 (12:12 +1200)]
Merge pull request #14999 from demeritcowboy/activityTName-1116
dev/core#1116 - just rename local var activityTName
Eileen McNaughton [Mon, 12 Aug 2019 23:21:43 +0000 (11:21 +1200)]
Merge pull request #15026 from civicrm/5.17
5.17 to master
Eileen McNaughton [Mon, 12 Aug 2019 23:21:18 +0000 (11:21 +1200)]
Merge pull request #15025 from seamuslee001/5_16_1_release_notes
5.16.1 release notes
Seamus Lee [Mon, 12 Aug 2019 23:20:58 +0000 (09:20 +1000)]
Merge pull request #15016 from eileenmcnaughton/act_speed
[NFC] [Test] dev/core#1098 Add unit test & code comments relating to the slow activity search
Tim Otten [Mon, 12 Aug 2019 22:55:38 +0000 (15:55 -0700)]
Update 5.16.1.md
Seamus Lee [Mon, 12 Aug 2019 22:17:36 +0000 (08:17 +1000)]
Add in release notes for 5.16.1
Seamus Lee [Mon, 12 Aug 2019 22:51:38 +0000 (08:51 +1000)]
Merge pull request #15024 from civicrm/5.17
5.17
Seamus Lee [Mon, 12 Aug 2019 22:51:13 +0000 (08:51 +1000)]
Merge pull request #15021 from seamuslee001/5.17
core#1182 - revert crm.menubar.js changes
DemeritCowboy [Mon, 12 Aug 2019 21:44:57 +0000 (17:44 -0400)]
demonstrate isNull
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes
Eileen McNaughton [Mon, 12 Aug 2019 20:38:28 +0000 (08:38 +1200)]
Merge pull request #15005 from colemanw/empty
Swap CRM_Utils_Array::value for empty() in conditionals
colemanw [Mon, 12 Aug 2019 18:12:48 +0000 (14:12 -0400)]
Merge pull request #15020 from MegaphoneJon/core-1182-517
core#1182 - revert crm.menubar.js changes
colemanw [Mon, 12 Aug 2019 18:12:33 +0000 (14:12 -0400)]
Merge pull request #15019 from MegaphoneJon/core-1182
core#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes
Coleman Watts [Fri, 9 Aug 2019 12:31:18 +0000 (08:31 -0400)]
Swap CRM_Utils_Array::value for empty() or isset() in conditionals
eileen [Mon, 12 Aug 2019 02:09:28 +0000 (14:09 +1200)]
[REF] [Import] extract saved mapping code to parent class
I will follow up with narrower adds
Eileen McNaughton [Mon, 12 Aug 2019 01:58:56 +0000 (13:58 +1200)]
Merge pull request #15013 from eileenmcnaughton/member_import
[Import] Minor cleanup on membership import
eileen [Tue, 2 Jul 2019 20:56:46 +0000 (08:56 +1200)]
dev/core#1098 Add unit test & code comments relating to the slow activity search
The issue is the joining in of component filtering - we should fix this but do it correctly....
We probably need to extend the test to reflect contact ACLs first
eileen [Sun, 11 Aug 2019 21:40:30 +0000 (09:40 +1200)]
[Import] Minor cleanup on membership import
We have a nasty construct (perhaps due to php4 limitations) where the code iterates the _mapperKeys
array & sets a class property specifying the key it occupies. We later use this to check it occupies a key.
This could be much more readable by just checking the array at the right time.
Also I removed an unused private property & a require_once to api.php which is always included
eileen [Sun, 11 Aug 2019 22:33:09 +0000 (10:33 +1200)]
Minor cleanup on status setting.
It appears that this complicated handling is because in the past the setStatus did not have the
ability to ensure a given message was set only once - hence it's being set multiple times
Seamus Lee [Sun, 11 Aug 2019 06:28:48 +0000 (16:28 +1000)]
dev/core#752 Add cid paramater when loading custom data via backend forms so that hooks can modifiy based on contact_id being viewed
Add in handling for cid not being set
Fix assign of cid and switch to using javascript if rather than smarty
Eileen McNaughton [Sat, 10 Aug 2019 22:10:26 +0000 (10:10 +1200)]
Merge pull request #15010 from eileenmcnaughton/event_inv
Event confirm - (very) minor cleanup + test
eileen [Sat, 10 Aug 2019 03:46:31 +0000 (15:46 +1200)]
Update test to reflect test setup change
eileen [Sat, 10 Aug 2019 02:08:52 +0000 (14:08 +1200)]
Event confirm - minor cleanup + test
I've just started delving into this & have
1) added a test
2) removed an assign that is ALSO done in the sendMail function - ie participantID - this is tested
3) removed a pass-by-reference that I checked was not required
Seamus Lee [Sat, 10 Aug 2019 01:05:40 +0000 (11:05 +1000)]
Merge pull request #15008 from civicrm/5.17
5.17
Seamus Lee [Fri, 9 Aug 2019 23:36:40 +0000 (09:36 +1000)]
Merge pull request #15007 from MegaphoneJon/core-1175-517
core#1175 - fix custom searches
Jon Goldberg [Fri, 9 Aug 2019 18:43:36 +0000 (14:43 -0400)]
core#1175 - fix custom searches
DemeritCowboy [Thu, 8 Aug 2019 23:01:48 +0000 (19:01 -0400)]
just rename local var activityTName
Eileen McNaughton [Fri, 9 Aug 2019 10:18:14 +0000 (22:18 +1200)]
Merge pull request #14995 from mfb/context-fix
Error log improvements: Provide priority level
Eileen McNaughton [Fri, 9 Aug 2019 06:28:38 +0000 (18:28 +1200)]
Merge pull request #14715 from eileenmcnaughton/cache_sub
Rewrite subTypeInfo to use caching mechanism
Eileen McNaughton [Fri, 9 Aug 2019 06:20:46 +0000 (18:20 +1200)]
Merge pull request #14998 from seamuslee001/manual_geo_code_export
Allow Manual Geo Code flag to be exported
Seamus Lee [Thu, 8 Aug 2019 21:59:53 +0000 (07:59 +1000)]
Allow Manual Geo Code flag to be exported
FIx Export tests by altering to include the manual_geo_code field
Update to title case
Eileen McNaughton [Fri, 9 Aug 2019 05:08:57 +0000 (17:08 +1200)]
Merge pull request #14955 from eileenmcnaughton/rel_alok_ref
[REF] Extract chunk of code relating to whether to disabled an inherited relationship
eileen [Wed, 3 Jul 2019 01:20:52 +0000 (13:20 +1200)]
Rewrite subTypeInfo to use caching mechanism
This seems to be getting a lot of cache misses on prod - presumably due to a lack of sub types
so fixing to use 'modern caching';
mark burdett [Fri, 9 Aug 2019 01:20:54 +0000 (18:20 -0700)]
CRM_Core_Error::debug_var() should have a priority arg.
Seamus Lee [Thu, 8 Aug 2019 22:12:07 +0000 (08:12 +1000)]
Merge pull request #14980 from eileenmcnaughton/mem_renew
[clean up][ export] Remove membership_auto_renew from defaultReturn properties
Eileen McNaughton [Thu, 8 Aug 2019 21:36:07 +0000 (09:36 +1200)]
Merge pull request #14997 from civicrm/5.17
5.17 to master
Eileen McNaughton [Thu, 8 Aug 2019 21:35:31 +0000 (09:35 +1200)]
Merge pull request #14996 from mfb/revert-14222
Revert #14222 on RC branch
mark burdett [Thu, 8 Aug 2019 21:28:13 +0000 (14:28 -0700)]
Revert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods could use Civi::log() internally; prefix param support for Civi::log()."
Due to regression https://lab.civicrm.org/dev/core/issues/1174
This reverts commit
3ac984a463d71d796096d5c78c4abd2de0d0a27d.
colemanw [Thu, 8 Aug 2019 12:53:51 +0000 (08:53 -0400)]
Merge pull request #14990 from eileenmcnaughton/free
Remove ?last? instances of ->free() dev/core#562
sushantpaste [Thu, 8 Aug 2019 12:17:18 +0000 (17:47 +0530)]
Membership fee token fix dev/core/#377
Eileen McNaughton [Thu, 8 Aug 2019 08:04:18 +0000 (20:04 +1200)]
Merge pull request #14927 from seamuslee001/remove_template_field_mosaico
Remove template field if using Mosaico in non shoreditch mode
CiviCRM [Thu, 8 Aug 2019 05:20:07 +0000 (05:20 +0000)]
Set version to 5.18.alpha1