mark burdett [Mon, 24 Dec 2018 04:47:06 +0000 (20:47 -0800)]
optimize CRM_Utils_String::ellipsify() method
Seamus Lee [Fri, 21 Dec 2018 21:59:16 +0000 (08:59 +1100)]
Merge pull request #13341 from yashodha/campaign_reports
add suport for order by clause for campaign and clean up
colemanw [Fri, 21 Dec 2018 15:58:32 +0000 (10:58 -0500)]
Merge pull request #13291 from eileenmcnaughton/process_default_active
Add default of TRUE for is_active on PaymentProcessor.create api.
colemanw [Fri, 21 Dec 2018 15:56:50 +0000 (10:56 -0500)]
Merge pull request #13329 from eileenmcnaughton/activity_extract
[REF] Add caching to function to determine if activity type is permitted.
Monish Deb [Fri, 21 Dec 2018 13:47:34 +0000 (19:17 +0530)]
Merge pull request #13250 from francescbassas/patch-16
#469 - Error on action "Email - schedule/send via CiviMail" with mult…
yashodha [Fri, 21 Dec 2018 12:40:39 +0000 (18:10 +0530)]
add suport for order by clause for campaign and clean up
Monish Deb [Fri, 21 Dec 2018 10:18:07 +0000 (15:48 +0530)]
Merge pull request #13241 from seamuslee001/561_schedule_reminders
dev/core#561 Convert Scheduled Reminders Form to use datepicker and e…
Seamus Lee [Fri, 21 Dec 2018 06:45:40 +0000 (17:45 +1100)]
Merge pull request #13281 from yashodha/campaign
campaign cleanup for household summary
colemanw [Fri, 21 Dec 2018 04:33:51 +0000 (23:33 -0500)]
Merge pull request #13311 from mattwire/entityform_customsubtype
Support customdata subtype on entityform (for activity/relationship types)
colemanw [Fri, 21 Dec 2018 02:44:23 +0000 (21:44 -0500)]
Merge pull request #13337 from GinkgoFJG/crmPageTitle
NFC: Improved documentation of crmPageTitle directive.
Frank J. Gómez [Thu, 20 Dec 2018 21:46:30 +0000 (16:46 -0500)]
Improved documentation of crmPageTitle directive.
Documented assumption that AngularJS base page be named "CiviCRM."
Seamus Lee [Thu, 20 Dec 2018 21:28:46 +0000 (08:28 +1100)]
Merge pull request #13335 from mattwire/opencase_comments
NFC Minor tweaks to docblocks on opencase form
Matthew Wire (MJW Consulting) [Thu, 20 Dec 2018 15:51:10 +0000 (15:51 +0000)]
Minor tweaks to docblocks on opencase form
Eileen McNaughton [Thu, 20 Dec 2018 08:21:36 +0000 (21:21 +1300)]
Merge pull request #13321 from yashodha/campaign-clean
campaign cleanup for sybunt report and show disabled campaigns as well
Monish Deb [Thu, 20 Dec 2018 06:09:23 +0000 (11:39 +0530)]
Merge pull request #13323 from JMAConsulting/dedupe_zero
Unit test for PR#12699
Monish Deb [Wed, 19 Dec 2018 19:33:10 +0000 (01:03 +0530)]
Unit test for PR#12699
Monish Deb [Thu, 20 Dec 2018 04:40:45 +0000 (10:10 +0530)]
Merge pull request #12669 from eileenmcnaughton/dedupe_zero
Fix duplicate merge to not disregard zero values.
Eileen McNaughton [Thu, 20 Dec 2018 04:17:44 +0000 (17:17 +1300)]
Merge pull request #13322 from JMAConsulting/dev-report-5
dev/report#5 - Fix mailing report unique count issue
eileen [Wed, 24 Oct 2018 02:29:55 +0000 (15:29 +1300)]
Add caching to function to determine if activity type is permitted.
This adds caching & re-usability to the activity type checking
Tim Otten [Thu, 20 Dec 2018 02:02:52 +0000 (18:02 -0800)]
Merge pull request #13326 from mlutfy/intall-php72
installer: PHP 7.2 compatibility fixes
Mathieu Lutfy [Wed, 19 Dec 2018 22:27:16 +0000 (17:27 -0500)]
installer: PHP 7.2 compatibility fixes
Monish Deb [Wed, 19 Dec 2018 20:00:32 +0000 (01:30 +0530)]
Merge pull request #13313 from kainuk/issues-607
Search Builder fails with an error when searching for State if the location type differs from the display name.
Monish Deb [Wed, 19 Dec 2018 14:41:58 +0000 (20:11 +0530)]
Added test case
Klaas Eikelboom [Wed, 19 Dec 2018 14:03:28 +0000 (15:03 +0100)]
CiviLint
Sunil Pawar [Wed, 11 Jul 2018 10:45:30 +0000 (16:15 +0530)]
Test case for report
Sunil Pawar [Mon, 2 Jul 2018 15:40:02 +0000 (21:10 +0530)]
dev/report/#5 - Fix mailing report unique count issue
yashodha [Wed, 19 Dec 2018 08:30:50 +0000 (14:00 +0530)]
campaign cleanup for sybunt report and show disabled campaigns as well
colemanw [Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)]
Merge pull request #12995 from eileenmcnaughton/activity_extract2
dev/core/454 rationalise activity case permissions & code
Eileen McNaughton [Tue, 18 Dec 2018 19:45:55 +0000 (08:45 +1300)]
Merge pull request #13170 from elisseck/dev/core/485
dev/core/485 Website type should be required as other type values are
Klaas Eikelboom [Tue, 18 Dec 2018 14:03:44 +0000 (15:03 +0100)]
Fix for issue 607
Seamus Lee [Tue, 18 Dec 2018 11:03:38 +0000 (22:03 +1100)]
Merge pull request #13309 from seamuslee001/min_php_version_bump
Bump Minimum Required PHP to be 5.6
Matthew Wire (MJW Consulting) [Tue, 18 Dec 2018 10:01:49 +0000 (10:01 +0000)]
Support customdata subtype on entityform (for activity/relationship types)
Yashodha Chaku [Tue, 18 Dec 2018 07:53:27 +0000 (13:23 +0530)]
Merge pull request #13296 from mathavanveda/603_case_summary_report
dev/core#603 not set default value yes/no for active relationship filters
Seamus Lee [Tue, 18 Dec 2018 06:07:09 +0000 (17:07 +1100)]
Bump Recommended PHP version to 7.2 and min recommend to be 7.1 as per Eileen
Seamus Lee [Tue, 18 Dec 2018 06:00:47 +0000 (17:00 +1100)]
Bump Minimum Required PHP to be 5.6
colemanw [Tue, 18 Dec 2018 03:22:11 +0000 (22:22 -0500)]
Merge pull request #13293 from seamuslee001/nfc_additional_javascript_metadata
(NFC) Just some additional package metadata
Eileen McNaughton [Tue, 18 Dec 2018 03:19:18 +0000 (16:19 +1300)]
Merge pull request #13306 from civicrm/5.9
5.9 to master
Eileen McNaughton [Tue, 18 Dec 2018 03:16:26 +0000 (16:16 +1300)]
Merge pull request #13304 from mattwire/fixtargetcontactoncasecreate
dev/core#585 Fix setting target contact on activities when creating a case with activity sequence.
Eileen McNaughton [Tue, 18 Dec 2018 01:01:23 +0000 (14:01 +1300)]
Merge pull request #13301 from civicrm/5.9
5.9
Seamus Lee [Tue, 18 Dec 2018 01:00:48 +0000 (12:00 +1100)]
Merge pull request #13303 from seamuslee001/5.9
dev/core#593 - Fix quicksearch by email
Seamus Lee [Mon, 17 Dec 2018 23:20:36 +0000 (10:20 +1100)]
Merge pull request #13275 from eileenmcnaughton/export_more_im
[REF] Export add test for phone details, fix phone_type_id
Matthew Wire (MJW Consulting) [Mon, 17 Dec 2018 21:25:08 +0000 (21:25 +0000)]
Specify target contact ID when creating case activities in sequence
Matthew Wire (MJW Consulting) [Mon, 17 Dec 2018 21:24:45 +0000 (21:24 +0000)]
Switch to buildOptions for activity case create
Seamus Lee [Mon, 17 Dec 2018 23:06:16 +0000 (10:06 +1100)]
Merge pull request #13277 from ixiam/dev-netAmount_freeze
Fix netAmount null object on freeze
Seamus Lee [Mon, 17 Dec 2018 20:45:03 +0000 (07:45 +1100)]
Add in unit test to confirm fix of quicksearch filter on email
Coleman Watts [Mon, 17 Dec 2018 17:11:02 +0000 (12:11 -0500)]
dev/core#593 - Fix quicksearch by email
Seamus Lee [Mon, 17 Dec 2018 20:21:47 +0000 (07:21 +1100)]
Merge pull request #13273 from eileenmcnaughton/ftype
dev/core#597 Fix broken api get filter on financial_type
Eileen McNaughton [Mon, 17 Dec 2018 19:53:31 +0000 (08:53 +1300)]
Merge pull request #13290 from eileenmcnaughton/recur_required
Declare 'amount' as required on ContributionRecur api
Eileen McNaughton [Mon, 17 Dec 2018 19:52:22 +0000 (08:52 +1300)]
Merge pull request #12344 from jitendrapurohit/core-192
dev/core#192 - Search builder fails for != smart group filter
Joe Murray [Mon, 17 Dec 2018 17:43:42 +0000 (12:43 -0500)]
Merge pull request #13294 from seamuslee001/joomla_receipeients_compatability
dev/joomla#3 CRM-21780 Fix Mailings Recipients box incompatabilites …
Joe Murray [Mon, 17 Dec 2018 17:43:15 +0000 (12:43 -0500)]
Merge pull request #13295 from andrewpthompson/andrewpthompson-dev-core-602
Fix PHP 7 strict warnings CRM_Core_DAO::getContactIDsFromComponent passed by reference
Mathavan Veeramuthu [Mon, 17 Dec 2018 12:01:57 +0000 (12:01 +0000)]
dev/core#603 not set default value yes/no for active relationship filter. to avoid DB error
Luciano Spiegel [Mon, 17 Dec 2018 09:16:00 +0000 (10:16 +0100)]
Fix netAmount null object on freeze
andrewpthompson [Mon, 17 Dec 2018 01:37:24 +0000 (12:07 +1030)]
Fix e-notice
only variables should be passed by reference
andrewpthompson [Mon, 17 Dec 2018 01:36:38 +0000 (12:06 +1030)]
Fix e-notice
only variables should be passed by reference
andrewpthompson [Mon, 17 Dec 2018 01:35:24 +0000 (12:05 +1030)]
Fix e-notice
only variables should be passed by reference
andrewpthompson [Mon, 17 Dec 2018 01:33:54 +0000 (12:03 +1030)]
Fix e-notice
only variables should be passed by reference
andrewpthompson [Mon, 17 Dec 2018 01:32:55 +0000 (12:02 +1030)]
Fix e-notice
only variables should be passed by reference
Seamus Lee [Mon, 17 Dec 2018 00:48:37 +0000 (11:48 +1100)]
dev/joomla#3 CRM-21780 Fix Mailings Receipients box incompatabilites with certain instances of Joomla
Seamus Lee [Mon, 17 Dec 2018 00:48:28 +0000 (11:48 +1100)]
(NFC) Just some additional package metadata
eileen [Sun, 16 Dec 2018 21:05:45 +0000 (10:05 +1300)]
Add default of TRUE for is_active on PaymentProcessor.create api.
This is consistent with UFGroup, CustomGroup, ComtributionPage etc
Seamus Lee [Mon, 17 Dec 2018 00:23:19 +0000 (11:23 +1100)]
Merge pull request #13292 from seamuslee001/CRM-21097
Generalise the UsersTableName Setting name to support Backdrop
Seamus Lee [Sun, 16 Dec 2018 21:15:25 +0000 (08:15 +1100)]
Generalise the UsersTableName Setting name to support Backdrop
Set Deafault as well to be users
eileen [Sun, 16 Dec 2018 20:39:35 +0000 (09:39 +1300)]
Declare 'amount' as required on ContributionRecur api
This is effectively required already as you get a DB error without it.
The field is not required at the DB level (it probably should be that too) but
it has no default value so you wind up with
[nativecode=1364 ** Field 'amount' doesn't have a default value]
Note that making it required at the DB level won't change the need for this
patch & is separate. The api declares what is required at the api level
- somethings are required at the DB level but not at the api level as they are
calculated in the BAO
Eileen McNaughton [Sat, 15 Dec 2018 02:27:42 +0000 (15:27 +1300)]
Merge pull request #13257 from vinuvarshith/BASW-316-unable-to-mark-price-set-as-inactive
Unable to mark price set field as inactive
Eileen McNaughton [Sat, 15 Dec 2018 02:07:41 +0000 (15:07 +1300)]
Merge pull request #13269 from eileenmcnaughton/acltesttrait
[REF] Minor Test clean up
Eileen McNaughton [Sat, 15 Dec 2018 02:06:59 +0000 (15:06 +1300)]
Merge pull request #13216 from eileenmcnaughton/export_postal
[REF] Export cleanup - filter at point of query on postal exports
Francesc Bassas i Bullich [Fri, 14 Dec 2018 20:39:15 +0000 (21:39 +0100)]
Rewrite testHiddenSmartGroup
yashodha [Fri, 14 Dec 2018 14:25:32 +0000 (19:55 +0530)]
campaign cleanup for household summary
Monish Deb [Fri, 14 Dec 2018 13:12:38 +0000 (18:42 +0530)]
Merge pull request #13272 from eileenmcnaughton/mem_form
dev/core#595 Fix label default not being set on membership status form
Francesc Bassas i Bullich [Fri, 14 Dec 2018 11:15:13 +0000 (12:15 +0100)]
Assign the translated formValues to itself
varshith89 [Fri, 14 Dec 2018 06:51:27 +0000 (06:51 +0000)]
Remove Unwanted 'is_active' Param That Causes Issues On Save
Eileen McNaughton [Fri, 14 Dec 2018 03:54:45 +0000 (16:54 +1300)]
Merge pull request #13274 from civicrm/5.9
5.9 to master
eileen [Thu, 13 Dec 2018 21:48:22 +0000 (10:48 +1300)]
Fix phone_type_id in export per test
eileen [Mon, 19 Nov 2018 05:57:19 +0000 (18:57 +1300)]
Add test for phone type handling
eileen [Mon, 3 Dec 2018 12:41:54 +0000 (01:41 +1300)]
Exclude unpostallable contacts rather than write & delete
Seamus Lee [Thu, 13 Dec 2018 20:44:20 +0000 (07:44 +1100)]
Merge pull request #13213 from eileenmcnaughton/export_array
[REF] Build single array of information about output specifications when exporting
eileen [Thu, 13 Dec 2018 20:24:34 +0000 (09:24 +1300)]
Fix broken api get filter on financial_type
eileen [Thu, 13 Dec 2018 18:41:32 +0000 (07:41 +1300)]
Fix label default not being set on membership status form
Monish Deb [Thu, 13 Dec 2018 14:31:22 +0000 (20:01 +0530)]
Merge pull request #13271 from seamuslee001/header_whitespace_fixes
(NFC) whitespace header fixes
eileen [Thu, 13 Dec 2018 02:51:58 +0000 (15:51 +1300)]
Remove unused function from test class
Seamus Lee [Thu, 13 Dec 2018 09:31:26 +0000 (20:31 +1100)]
(NFC) whitespace header fixes
eileen [Thu, 13 Dec 2018 06:16:19 +0000 (19:16 +1300)]
Remove phone_type_id from special handling per review
Eileen McNaughton [Thu, 13 Dec 2018 06:43:36 +0000 (19:43 +1300)]
Merge pull request #13270 from civicrm/5.9
5.9
Eileen McNaughton [Thu, 13 Dec 2018 06:43:10 +0000 (19:43 +1300)]
Merge pull request #13268 from seamuslee001/copywrite_510
(NFC) Update Copyright in FiveTen upgrade file to be 2019
Eileen McNaughton [Thu, 13 Dec 2018 06:42:49 +0000 (19:42 +1300)]
Merge pull request #13267 from seamuslee001/copywrite_year_update
(NFC) Update Copyrite year to be 2019
Seamus Lee [Thu, 13 Dec 2018 06:27:10 +0000 (17:27 +1100)]
Merge pull request #13263 from eileenmcnaughton/api_ex
dev/core#592 Add default for in Exception class.
eileen [Thu, 13 Dec 2018 06:14:16 +0000 (19:14 +1300)]
Fix export extra column on merge-same-address
eileen [Thu, 13 Dec 2018 05:32:22 +0000 (18:32 +1300)]
Fix output of payment fields (per review)
eileen [Mon, 3 Dec 2018 03:51:34 +0000 (16:51 +1300)]
Compress setting sql columns into output specification
eileen [Mon, 3 Dec 2018 03:48:54 +0000 (16:48 +1300)]
Move sql column definition to to the processor class
eileen [Thu, 13 Dec 2018 05:17:33 +0000 (18:17 +1300)]
Add test for membership payment fields
Seamus Lee [Thu, 13 Dec 2018 03:56:56 +0000 (14:56 +1100)]
Merge pull request #13265 from eileenmcnaughton/mail_sub
dev/core#588 fix "CiviMail Draft" appears twice in non-Mosaico test emails
eileen [Thu, 13 Dec 2018 02:51:36 +0000 (15:51 +1300)]
Comment fix
eileen [Thu, 13 Dec 2018 02:48:54 +0000 (15:48 +1300)]
Use trait rather than parent class for acl test functions
This got separated out over a few recent commits (the first one seems to have somewhat
accidentally included the trait & then some others added using it. Am just pushing in this tidy up
Seamus Lee [Thu, 13 Dec 2018 02:15:43 +0000 (13:15 +1100)]
Update Copywrite in FiveTen upgrade file to be 2019
Seamus Lee [Thu, 13 Dec 2018 01:38:38 +0000 (12:38 +1100)]
Update Copywrite year to be 2019
eileen [Thu, 13 Dec 2018 00:55:36 +0000 (13:55 +1300)]
Revert "Adding [CiviMail Draft] on test mailing (for mosaico)"
This reverts commit
29cfa0ffae971c99116a2a0a069c4e486b83bffa.
Eileen McNaughton [Thu, 13 Dec 2018 00:54:40 +0000 (13:54 +1300)]
Merge pull request #13264 from civicrm/5.9
5.9 to master
Eileen McNaughton [Thu, 13 Dec 2018 00:26:11 +0000 (13:26 +1300)]
Merge pull request #13258 from eileenmcnaughton/isam
dev/core#591 Exclude civicrm_tmp% from isam check