colemanw [Wed, 13 Dec 2017 14:36:38 +0000 (09:36 -0500)]
Merge pull request #11400 from eileenmcnaughton/removal
CRM-21544 - Remove unused CRM_Contact_BAO_Contact_Optimizer class
Eileen McNaughton [Tue, 12 Dec 2017 22:31:05 +0000 (11:31 +1300)]
Merge pull request #11305 from jmcclelland/CRM-21465
CRM-21465 - avoid fatal error when clicking through pledge email.
eileen [Tue, 12 Dec 2017 20:37:12 +0000 (09:37 +1300)]
CRM-21544 - Remove unused CRM_Contact_BAO_Contact_Optimizer class
colemanw [Tue, 12 Dec 2017 18:13:09 +0000 (13:13 -0500)]
Merge pull request #11399 from JMAConsulting/CRM-19704
CRM-19704: mailing body stripped if image only
colemanw [Tue, 12 Dec 2017 18:09:36 +0000 (13:09 -0500)]
Merge pull request #11397 from totten/master-wpver
CRM-16241 - distmaker - Set version in WP zip files
colemanw [Tue, 12 Dec 2017 18:05:12 +0000 (13:05 -0500)]
Merge pull request #11396 from mukeshcompucorp/fix-page-structure
CRM-21539: Fixed structure for administrative pages
deb.monish [Tue, 12 Dec 2017 15:58:15 +0000 (21:28 +0530)]
CRM-19704: mailing body stripped if image only
Tim Otten [Tue, 12 Dec 2017 05:37:35 +0000 (21:37 -0800)]
CRM-16421 - distmaker - Simplify shared code
Tim Otten [Tue, 12 Dec 2017 05:17:03 +0000 (21:17 -0800)]
CRM-16421 - distmaker - Set version in WP zip files
colemanw [Mon, 11 Dec 2017 16:34:21 +0000 (11:34 -0500)]
Merge pull request #11395 from seamuslee001/CRM-21534
CRM-21534 - Fix invocation of test for MariaDB
colemanw [Mon, 11 Dec 2017 16:00:03 +0000 (11:00 -0500)]
Merge pull request #11386 from agileware/CIVICRM-754
CRM-21535: Custom file upload field not showing up when Viewing Activity from Case Report.
Mukesh Ram [Mon, 11 Dec 2017 13:31:37 +0000 (19:01 +0530)]
Fixed structure for administrative pages
Mark Hanna [Sat, 9 Dec 2017 19:50:22 +0000 (13:50 -0600)]
Merge pull request #11381 from mydropwizard/crm-21526
CRM-21526: CRM_Utils_System_Drupal8::authenticate() should change the Drupal user
Seamus Lee [Sat, 9 Dec 2017 01:35:36 +0000 (12:35 +1100)]
CRM-21534 fix invokation of test for MariaDB
colemanw [Fri, 8 Dec 2017 20:34:18 +0000 (15:34 -0500)]
Merge pull request #11222 from jitendrapurohit/CRM-21380
CRM-21380: Add setting to block activity types from sending assignee …
colemanw [Fri, 8 Dec 2017 12:46:08 +0000 (07:46 -0500)]
Merge pull request #11389 from eileenmcnaughton/reportsM
CRM-19060 preliminary tidy up
Monish Deb [Fri, 8 Dec 2017 06:02:41 +0000 (11:32 +0530)]
Merge pull request #11388 from MegaphoneJon/CRM-21531
CRM-21531 - replace regex with POSIX-compliant alternative for MariaD…
Jitendra Purohit [Fri, 8 Dec 2017 06:00:48 +0000 (11:30 +0530)]
use json encode for assigning smarty vars to js
eileen [Fri, 8 Dec 2017 00:39:38 +0000 (13:39 +1300)]
CRM-19060 preliminary extract code to store group by array
eileen [Thu, 7 Dec 2017 21:59:44 +0000 (10:59 +1300)]
CRM-19060 preliminary tidy up, remove redundant functions, use isTableSelected
eileen [Thu, 7 Dec 2017 21:55:28 +0000 (10:55 +1300)]
CRM-19060 preliminary tidy up, get unit tests running on report, optimise group filter
Jon goldberg [Thu, 7 Dec 2017 21:05:53 +0000 (16:05 -0500)]
CRM-21531 - replace regex with POSIX-compliant alternative for MariaDB compatibility
Eileen McNaughton [Thu, 7 Dec 2017 20:24:57 +0000 (09:24 +1300)]
Merge pull request #11387 from civicrm/4.7.28-rc
Update `master` with final `4.7.28` changes
Coleman Watts [Thu, 7 Dec 2017 17:33:50 +0000 (12:33 -0500)]
Rename variable for consistency
colemanw [Thu, 7 Dec 2017 17:01:22 +0000 (12:01 -0500)]
Merge pull request #11385 from jitendrapurohit/CRM-21530
CRM-21530 - Call post hook after linking activity to the case
Alok Patel [Thu, 7 Dec 2017 12:45:16 +0000 (18:15 +0530)]
CIVICRM-754: Displaying Activity custom fields(Files) when opening from Case Report.
Jitendra Purohit [Thu, 7 Dec 2017 09:55:50 +0000 (15:25 +0530)]
CRM-21530 - Call post hook after linking activity to the case
Eileen McNaughton [Thu, 7 Dec 2017 07:19:19 +0000 (20:19 +1300)]
Merge pull request #11338 from MegaphoneJon/CRM-21492
CRM-21492 - Don't reject recurring contributions whose amount is diff…
Jitendra Purohit [Thu, 7 Dec 2017 06:02:23 +0000 (11:32 +0530)]
additional js cleanup done by coleman
Jitendra Purohit [Thu, 7 Dec 2017 05:43:09 +0000 (11:13 +0530)]
Label fix and handle notif msg on activity forms
Tim Otten [Thu, 7 Dec 2017 04:10:05 +0000 (20:10 -0800)]
Merge pull request #11384 from totten/4.7.28-rc-rev8837
Revert 8837 - Fix "Membership Detail" regression
Tim Otten [Thu, 7 Dec 2017 02:48:31 +0000 (18:48 -0800)]
Revert "CRM-19060 fix Payment table join in membership Detail report to ensure latest membership payment is picked up"
This reverts commit
9b213560fe662e0fc7626226ff70266779c8599a.
Tim Otten [Thu, 7 Dec 2017 02:48:30 +0000 (18:48 -0800)]
Revert "Alter Index to be of structure as suggeted by Dave for performance improvement and change the group by on temporary table to be that of membership_id not contact_id so it correctly reports the max receive_date matching the memebership record"
This reverts commit
bdb10f0c1e21b7f07d778760202a7439b7f24f4d.
Tim Otten [Thu, 7 Dec 2017 01:19:18 +0000 (17:19 -0800)]
Merge pull request #11378 from eileenmcnaughton/test
Add test for processing multipart-related emails in fetch_bounces
Tim Otten [Wed, 6 Dec 2017 23:32:18 +0000 (15:32 -0800)]
test_sample_message.eml - Be a little more polite
colemanw [Wed, 6 Dec 2017 21:19:30 +0000 (16:19 -0500)]
Merge pull request #11382 from colemanw/CRM-21527
CRM-21527 - Add default to extra address::create param
Coleman Watts [Wed, 6 Dec 2017 20:24:09 +0000 (15:24 -0500)]
CRM-21527 - Add default to extra address::create param
mountev [Wed, 6 Dec 2017 19:38:15 +0000 (19:38 +0000)]
CRM-21494 trigger pre hook on mailing bounce (#11353)
* create mailing bounce hook
* CRM-21494 create-edit action and post-hook
* CRM-21494 - pre hook 3rd arg
colemanw [Wed, 6 Dec 2017 16:02:54 +0000 (11:02 -0500)]
Merge pull request #11373 from agh1/4.7.28-releasenotes
4.7.28 release notes
colemanw [Wed, 6 Dec 2017 15:54:21 +0000 (10:54 -0500)]
Merge pull request #11369 from mukeshcompucorp/NDI-30-style-admin-pages
CRM-21518: Added missing containers to template
David Snopek [Wed, 6 Dec 2017 15:53:42 +0000 (09:53 -0600)]
CRM-21526: CRM_Utils_System_Drupal8::authenticate() should change the current Drupal user
colemanw [Wed, 6 Dec 2017 15:47:18 +0000 (10:47 -0500)]
Merge pull request #11379 from mydropwizard/crm-21093
CRM-21093: Call ->initialize() on the CiviCRM service now that Drupal 8 module has changed
Jitendra Purohit [Wed, 6 Dec 2017 10:44:28 +0000 (16:14 +0530)]
js fix and naming modification
eileen [Wed, 6 Dec 2017 02:16:37 +0000 (15:16 +1300)]
Add test for processing multipart-related emails in fetch_bounces
I was trying to replicate an error but didn't manage. Submitting test
Andrew Hunt [Wed, 6 Dec 2017 06:40:41 +0000 (01:40 -0500)]
4.7.28 release notes: finished
Andrew Hunt [Wed, 6 Dec 2017 05:36:28 +0000 (00:36 -0500)]
4.7.28 release notes: contributors finished
Andrew Hunt [Tue, 5 Dec 2017 22:58:44 +0000 (17:58 -0500)]
4.7.28 release notes: partway through bugs
Mukesh Ram [Wed, 6 Dec 2017 04:39:19 +0000 (10:09 +0530)]
CRM-21518: Fixed spacing
David Snopek [Wed, 6 Dec 2017 04:12:27 +0000 (22:12 -0600)]
CRM-21093: Call ->initialize() on the CiviCRM service now that Drupal 8 module has changed
Andrew Hunt [Tue, 5 Dec 2017 22:13:35 +0000 (17:13 -0500)]
4.7.28 release notes: done with features
Andrew Hunt [Tue, 5 Dec 2017 20:07:04 +0000 (15:07 -0500)]
4.7.28 release notes: first features
Andrew Hunt [Tue, 5 Dec 2017 17:40:23 +0000 (12:40 -0500)]
4.7.28 release notes: added boilerplate
Andrew Hunt [Tue, 5 Dec 2017 16:23:48 +0000 (11:23 -0500)]
4.7.28 release notes: raw from script
colemanw [Tue, 5 Dec 2017 16:17:26 +0000 (11:17 -0500)]
Merge pull request #11368 from JMAConsulting/CRM-21499
CRM-21499: Add filter for tagset page
Mukesh Ram [Tue, 5 Dec 2017 13:20:01 +0000 (18:50 +0530)]
NDI-30: Added more templates to repair structure
Mukesh Ram [Tue, 5 Dec 2017 06:32:50 +0000 (12:02 +0530)]
NDI-30: Added missing containers to template
Coleman Watts [Tue, 5 Dec 2017 05:44:51 +0000 (00:44 -0500)]
CRM-21499 - Add clear button to search form and cleanup/bugfixes
colemanw [Mon, 4 Dec 2017 23:38:20 +0000 (18:38 -0500)]
Merge pull request #11364 from eileenmcnaughton/ps1
CRM-21180: Inline changes to custom fields aren't reflected in custom greetings + CRM-21474 add support for setting non-required fields to 'null'
Eileen McNaughton [Mon, 4 Dec 2017 22:21:06 +0000 (11:21 +1300)]
Merge pull request #11367 from mattwire/CRM_21517_updatesub_optiongroup
CRM-21517 OptionGroup->PseudoConstant in UpdateSubscription
deb.monish [Mon, 4 Dec 2017 20:59:01 +0000 (02:29 +0530)]
CRM-21499: Add filter for tagset page
Matthew Wire [Mon, 4 Dec 2017 20:03:46 +0000 (20:03 +0000)]
OptionGroup->PseudoConstant in UpdateSubscription
Mathieu Lu [Mon, 4 Dec 2017 15:20:05 +0000 (10:20 -0500)]
Merge pull request #11091 from JMAConsulting/CRM-21279
CRM-21279: Rebuild recipient list and calculate count on demand, store result in cache
deb.monish [Mon, 30 Oct 2017 17:25:28 +0000 (22:55 +0530)]
minor fixes
deb.monish [Thu, 12 Oct 2017 20:12:28 +0000 (01:42 +0530)]
additional fixes
deb.monish [Mon, 9 Oct 2017 14:20:15 +0000 (19:50 +0530)]
Rebuild recipient list and calculate count on demand, store result in
eileen [Mon, 4 Dec 2017 08:37:43 +0000 (21:37 +1300)]
CRM-21474, CRM-21880 fix error in Contact schema causing test fail.
The pseudoConstant was against the wrong field
eileen [Mon, 4 Dec 2017 05:10:01 +0000 (18:10 +1300)]
CRM-21474 add support for setting non-required fields to 'null'
When a field is not required in the database the 'null' should be pass through the pseudoconstant validation.
Note the unit test on this is failing because the BAO is not respecting setting null. Follow up patch
Allen Shaw [Wed, 8 Nov 2017 09:46:50 +0000 (03:46 -0600)]
Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings.
Includes unit test.
Toward CRM-21180: Better static var handling.
Toward CRM-21180: removed static vars; removed unused method parameters.
CRM-21180 add unit test for custom field being set in address
CRM-21180 Inline changes to custom fields aren't reflected in custom greetings
This incorporates Allan's work to cause custom fields to be updated
when a custom value is updated. These have been reconciled with the changes to allow
greeting fields to be set to null per CRM-21474
m
Eileen McNaughton [Mon, 4 Dec 2017 04:45:54 +0000 (17:45 +1300)]
Merge pull request #11363 from civicrm/4.7.28-rc
4.7.28 rc
Eileen McNaughton [Mon, 4 Dec 2017 04:00:32 +0000 (17:00 +1300)]
Merge pull request #11310 from eileenmcnaughton/greet
CRM-21466 - Fix (obscure) enotice when updating greeting for contact,…
eileen [Wed, 22 Nov 2017 23:13:10 +0000 (12:13 +1300)]
CRM-21466 follow up, add unit test to ensure custom fields can be populated.
This involves fixing the caching to be flushed during testing
Eileen McNaughton [Mon, 4 Dec 2017 00:49:19 +0000 (13:49 +1300)]
Merge pull request #11361 from seamuslee001/CRM-21508
CRM-21508 Fix column Information for civicrm_mailing.created_date pas…
colemanw [Mon, 4 Dec 2017 00:08:41 +0000 (19:08 -0500)]
Merge pull request #11360 from seanmadsen/CRM-21507
CRM-21507 Fix error when creating case activities
Sean Madsen [Sun, 3 Dec 2017 23:20:03 +0000 (18:20 -0500)]
CRM-21507 Improve Activity Separation field logic
Only display the this field on the form if it's defined in the form
class. Only define it in the form class if the class property says to do
so.
Seamus Lee [Sun, 3 Dec 2017 20:10:49 +0000 (07:10 +1100)]
CRM-21508 Fix column Information for civicrm_mailing.created_date passed to Docker When
Sean Madsen [Sun, 3 Dec 2017 17:03:40 +0000 (12:03 -0500)]
CRM-21507 Fix error when creating case activities
Before: When adding a new activity to a case, an error message
"Activity Separation is a required field" appears and prevents the user
from submitting the form. There is no way to get around this error.
After: The user can create case activities without hitting this error
message. Also the error still displays as expected when creating
non-case activities that have multiple target contacts.
This changes fixes a regression caused by my fix for CRM-21419.
colemanw [Sat, 2 Dec 2017 23:25:10 +0000 (18:25 -0500)]
Merge pull request #11250 from agh1/no-update-indices
CRM-21298 System check: bypass missing indices check until update indices works
colemanw [Sat, 2 Dec 2017 23:20:03 +0000 (18:20 -0500)]
Merge pull request #9648 from MegaphoneJon/CRM-19608
CRM-19608 - Show/hide auto-renew element on membership pages even whe…
colemanw [Sat, 2 Dec 2017 23:16:45 +0000 (18:16 -0500)]
Merge pull request #11198 from jitendrapurohit/CRM-20343-fix
CRM-20343: Override membership status when contribution is cancelled
Eileen McNaughton [Sat, 2 Dec 2017 22:27:28 +0000 (11:27 +1300)]
Merge pull request #11359 from eileenmcnaughton/recur
CRM-20800 follow on fix per Matt review
eileen [Thu, 30 Nov 2017 19:57:04 +0000 (08:57 +1300)]
CRM-20800 follow on fix per Matt review
Eileen McNaughton [Sat, 2 Dec 2017 21:17:23 +0000 (10:17 +1300)]
Merge pull request #11290 from yashodha/CRM-21443
CRM-21443 - Add support for auto-complete fields in the batch update …
eileen [Wed, 22 Nov 2017 04:17:59 +0000 (17:17 +1300)]
CRM-21466 - Fix (obscure) enotice when updating greeting for contact, add test
colemanw [Sat, 2 Dec 2017 16:52:09 +0000 (11:52 -0500)]
Merge pull request #11358 from mattwire/CRM-21504_membership_on_recurring_detail
CRM-21504 Add membership to recurring contribution detail
colemanw [Sat, 2 Dec 2017 16:50:20 +0000 (11:50 -0500)]
Merge pull request #11281 from nielosz/recent-items-dupe-check
CRM-21433: Optimize dupe checking in Recent Items stack
colemanw [Sat, 2 Dec 2017 16:45:50 +0000 (11:45 -0500)]
Merge pull request #11313 from eileenmcnaughton/greet2
CRM-21471 remove unused core function CRM_Core_Pseudoconstant::greeti…
colemanw [Sat, 2 Dec 2017 16:22:33 +0000 (11:22 -0500)]
Merge pull request #11187 from yashodha/CRM-21342
CRM-21342 - Contribution note is not wiped if the value is removed
colemanw [Sat, 2 Dec 2017 16:20:30 +0000 (11:20 -0500)]
Merge pull request #11193 from MiyaNoctem/CRM-21328-warning-on-empty-visibility
CRM-21328: Remove '-select-' Option From Visibility
Matthew Wire [Sat, 2 Dec 2017 15:03:28 +0000 (15:03 +0000)]
Add membership to recurring contribution detail
Eileen McNaughton [Sat, 2 Dec 2017 03:52:45 +0000 (16:52 +1300)]
Merge pull request #11323 from samuelsov/CRM-21478
CRM-21478 Using contribution status id instead of label in if statement
Eileen McNaughton [Sat, 2 Dec 2017 03:32:51 +0000 (16:32 +1300)]
Merge pull request #11010 from seamuslee001/CRM-21206
CRM-21206 Ensure that the recipients field of AB Test results is fill…
Eileen McNaughton [Fri, 1 Dec 2017 22:18:33 +0000 (11:18 +1300)]
Merge pull request #11357 from eileenmcnaughton/reportts
Fix ts() functions to have variable on the outside.
Eileen McNaughton [Fri, 1 Dec 2017 21:33:53 +0000 (10:33 +1300)]
Merge pull request #11103 from yashodha/CRM-21286
CRM-21286 - expose active flag in UI for group
eileen [Fri, 1 Dec 2017 21:22:17 +0000 (10:22 +1300)]
Fix ts() functions to have variable on the outside.
colemanw [Fri, 1 Dec 2017 15:40:17 +0000 (10:40 -0500)]
Merge pull request #11276 from eileenmcnaughton/report-c
CRM-20545 - port extended reports metadata approach to adding columns
colemanw [Fri, 1 Dec 2017 14:46:15 +0000 (09:46 -0500)]
Merge pull request #11349 from JMAConsulting/CRM-21468
CRM-21468: mailing recipients field limits how many groups can be selected
Eileen McNaughton [Fri, 1 Dec 2017 07:36:23 +0000 (20:36 +1300)]
Merge pull request #11334 from jitendrapurohit/CRM-21436-unittest
Unit test for CRM-21436
Eileen McNaughton [Fri, 1 Dec 2017 01:21:22 +0000 (14:21 +1300)]
Merge pull request #11343 from agileware/CRM-21457
CRM-21457: Setting receipt date to current date when requesting a receipt to be emailed on Credit card contribution form.
Eileen McNaughton [Fri, 1 Dec 2017 00:13:12 +0000 (13:13 +1300)]
Merge pull request #11354 from lcdservices/CRM-21501
CRM-21501 bounce report date filter type fix
Brian Shaughnessy [Thu, 30 Nov 2017 18:38:09 +0000 (13:38 -0500)]
CRM-21501 bounce report date filter type fix