Seamus Lee [Thu, 2 Nov 2017 00:14:26 +0000 (11:14 +1100)]
CRM-21378 Ensure that email abuse reports are treated as bounce type of spam
Move upgrade steps to .29
Eileen McNaughton [Tue, 21 Nov 2017 21:35:48 +0000 (10:35 +1300)]
Merge pull request #11267 from nbrettell/CRM-21383-master
CRM-21383 - Inclusion of a directive to replace the existing select f…
Eileen McNaughton [Tue, 21 Nov 2017 21:19:17 +0000 (10:19 +1300)]
Merge pull request #11308 from civicrm/4.7.28-rc
4.7.28 rc
Eileen McNaughton [Tue, 21 Nov 2017 20:39:22 +0000 (09:39 +1300)]
Merge pull request #11307 from spalmstr/CRM-21001
CRM-21001
Eileen McNaughton [Tue, 21 Nov 2017 20:33:50 +0000 (09:33 +1300)]
Merge pull request #11258 from seamuslee001/CRM-21411
CRM-21411 Fix issue where unsubscribe group field would not show beca…
Eileen McNaughton [Tue, 21 Nov 2017 20:19:00 +0000 (09:19 +1300)]
Merge pull request #10650 from jitendrapurohit/CRM-20861
CRM-20861 : Location type does not show for custom address fields
spalmstr [Tue, 21 Nov 2017 18:19:28 +0000 (18:19 +0000)]
CRM-21001
Eileen McNaughton [Tue, 21 Nov 2017 04:20:20 +0000 (17:20 +1300)]
Merge pull request #11299 from francescbassas/patch-12
CRM-21454 Add money raised on page contribution widget ajax response
Eileen McNaughton [Tue, 21 Nov 2017 01:19:58 +0000 (14:19 +1300)]
Merge pull request #11302 from totten/master-toxic-json
(NFC) .toxic.json - Update list of functions which yield toxic warnings
Coleman Watts [Tue, 21 Nov 2017 01:17:39 +0000 (20:17 -0500)]
Add comments
Tim Otten [Mon, 20 Nov 2017 22:21:53 +0000 (14:21 -0800)]
(NFC) .toxic.json - Update list of functions which yield toxic warnings
The file `.toxic.json` is supposed to list egregious functions -- any change
to these functions should produce extra comments/suggestsions.
The current list is a few years old, so I've run `pdepend` and updated the list.
The list includes anything which matches one or more of these:
* "Non Comment Lines of Code" (`ncloc`) greater than 300.
* "[NPath](https://modess.io/npath-complexity-cyclomatic-complexity-explained/) complexity" (`npath`) greater than 1 billion.
francescbassas [Sun, 19 Nov 2017 19:57:20 +0000 (20:57 +0100)]
CRM-21454 Add money raised on page contribution widget ajax response
Eileen McNaughton [Sat, 18 Nov 2017 21:04:18 +0000 (10:04 +1300)]
Merge pull request #11289 from kainukempowerment/CRM-21424
CRM-21424 Set receipt date when downloading pdf receipt
Klaas Eikelboom [Sat, 18 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Added test
Mathieu Lu [Sat, 18 Nov 2017 00:43:23 +0000 (19:43 -0500)]
Merge pull request #11296 from jmcclelland/CRM-21449
CRM-21449 - add location field to activity report.
Mathieu Lu [Sat, 18 Nov 2017 00:33:10 +0000 (19:33 -0500)]
Merge pull request #11284 from eileenmcnaughton/towards1
[NFC] code cleanup: split out 2 functions that are mostly unrelated.
colemanw [Fri, 17 Nov 2017 23:20:17 +0000 (18:20 -0500)]
Merge pull request #11268 from mattwire/CRM-21421_allow_updating_existing_casecontact
CRM-21421 Fix to allow updating an existing CaseContact record
colemanw [Fri, 17 Nov 2017 23:15:27 +0000 (18:15 -0500)]
Merge pull request #11295 from mepps/CRM-21448
CRM-21448 Add a link to contact from contribution
Eileen McNaughton [Fri, 17 Nov 2017 22:55:34 +0000 (11:55 +1300)]
Merge pull request #11293 from mlutfy/crm21447
CRM-21447: Relationship Report: move variable handling to beginPostProcessCommon
Eileen McNaughton [Fri, 17 Nov 2017 22:44:55 +0000 (11:44 +1300)]
Merge pull request #11297 from civicrm/4.7.28-rc
4.7.28 rc
Eileen McNaughton [Fri, 17 Nov 2017 22:40:02 +0000 (11:40 +1300)]
Merge pull request #11286 from jitendrapurohit/pay-later-fix
CRM-21436 - Fix fatal error on pay later
Jamie McClelland [Fri, 17 Nov 2017 21:19:55 +0000 (16:19 -0500)]
CRM-21449 - add location field to activity report.
Margaret Epps [Fri, 17 Nov 2017 19:43:40 +0000 (14:43 -0500)]
CRM-21448 Add a link to contact from contribution
Mathieu Lutfy [Fri, 17 Nov 2017 17:45:56 +0000 (12:45 -0500)]
CRM-21447: Contact Relationship Report: move variable handling to beginPostProcessCommon().
Klaas Eikelboom [Fri, 17 Nov 2017 17:42:48 +0000 (17:42 +0000)]
remove obsolete comment
colemanw [Fri, 17 Nov 2017 13:03:12 +0000 (08:03 -0500)]
Merge pull request #11261 from JMAConsulting/CRM-21362
CRM-21362: followup PR which fixes duplicate mailing rows for each job
Jitendra Purohit [Fri, 17 Nov 2017 12:56:28 +0000 (18:26 +0530)]
fix contribution page loading on no processor
Matthew Wire [Wed, 15 Nov 2017 20:50:12 +0000 (20:50 +0000)]
Add unit test for CaseContact.create
Mathieu Lu [Fri, 17 Nov 2017 05:09:00 +0000 (00:09 -0500)]
Merge pull request #11152 from eileenmcnaughton/api
CRM-21324 - Support 'null' on date fields in the api
eileen [Wed, 15 Nov 2017 21:06:25 +0000 (10:06 +1300)]
[NFC] code cleanup: split out 2 functions that are mostly unrelated.
The handling of line items & financial items has been munged together in a way that gains little, adds confusion,
and blocks the financial items portion from being re-usable.
This is a code cleanup preparatory to the actual changes in pr #10962
Mathieu Lu [Fri, 17 Nov 2017 04:43:55 +0000 (23:43 -0500)]
Merge pull request #11259 from eileenmcnaughton/report
CRM-21412 Do not give fatal error on report when no fields selected
Klaas Eikelboom [Thu, 16 Nov 2017 16:38:19 +0000 (16:38 +0000)]
CRM-21424 Set receipt date when downloading pdf receipt
colemanw [Wed, 15 Nov 2017 23:10:40 +0000 (18:10 -0500)]
Merge pull request #11270 from colemanw/CRM-21421
CRM-21421 - Api case update should not re-save case contacts
eileen [Wed, 8 Nov 2017 21:44:09 +0000 (10:44 +1300)]
CRM-21412 Do not give fatal error on report when no fields selected
Mathieu Lu [Wed, 15 Nov 2017 21:27:59 +0000 (16:27 -0500)]
Merge pull request #10674 from herbdool/crm20764
CRM-20764 Allow clean URLs with CiviCRM on Backdrop
Mathieu Lu [Wed, 15 Nov 2017 20:57:59 +0000 (15:57 -0500)]
Merge pull request #11283 from mattwire/CRM-21432_recur_end_date_display
CRM-21432 Fix display of end date for recurring contributions
Mathieu Lu [Wed, 15 Nov 2017 19:59:32 +0000 (14:59 -0500)]
Merge pull request #11278 from eileenmcnaughton/towards1
[NFC] Function extraction and renaming of variable for shorter refere…
Matthew Wire [Wed, 15 Nov 2017 19:42:50 +0000 (19:42 +0000)]
Fix display of end date for recurring contributions
eileen [Tue, 14 Nov 2017 20:09:33 +0000 (09:09 +1300)]
[NFC] Function extraction and renaming of variable for shorter reference.
This is a function extraction towards CRM-19273. I haven't changed the logic but it is apparent that
we are changing the contribution financial type to 'the financial type of the last line
item' - which is a little dubious although it might work in practice. We should expose the field &
let people choose it
Mathieu Lu [Wed, 15 Nov 2017 05:19:45 +0000 (00:19 -0500)]
Merge pull request #9739 from nditech/CRM-19915
Fixes CRM-19915
Mathieu Lu [Wed, 15 Nov 2017 05:15:08 +0000 (00:15 -0500)]
Merge pull request #11034 from ejegg/docStrings
[NFC] Fix a bunch of docstrings
Eileen McNaughton [Wed, 15 Nov 2017 04:49:24 +0000 (17:49 +1300)]
Merge pull request #11138 from mattwire/CRM-21312_bootstrap_css_fix
CRM-21312 Fix display of 'Recent Items' when using a bootstrap theme
Elliott Eggleston [Wed, 15 Nov 2017 04:43:49 +0000 (23:43 -0500)]
Update sendMail return type
Mathieu Lu [Wed, 15 Nov 2017 03:53:21 +0000 (22:53 -0500)]
Merge pull request #11233 from seanmadsen/CRM-14343-import-error-limit
CRM-14343 - Remove limit of downloading only 250 errors during CSV import
Mathieu Lu [Wed, 15 Nov 2017 03:10:34 +0000 (22:10 -0500)]
Merge pull request #11255 from tschuettler/CRM-21407
CRM-21407 - Fix ISO compliance for German counties
Mathieu Lu [Wed, 15 Nov 2017 03:02:26 +0000 (22:02 -0500)]
Merge pull request #11266 from eileenmcnaughton/additional-test
[NFC] Additional test
colemanw [Wed, 15 Nov 2017 02:48:53 +0000 (21:48 -0500)]
Merge pull request #11277 from mihaelmladenov/NDI-14-cancel-event-participants
CRM-21426: Removed duplicate submit buttons on Cancel/Delete Event Participants
Mihael Mladenov [Tue, 14 Nov 2017 21:17:42 +0000 (23:17 +0200)]
NDI-14: Removed top submit buttons on Delete Event Participants task
Mihael Mladenov [Tue, 14 Nov 2017 19:18:49 +0000 (21:18 +0200)]
NDI-14: Changed label of cancel event participants submit button
Eileen McNaughton [Tue, 14 Nov 2017 19:18:47 +0000 (08:18 +1300)]
Merge pull request #11273 from aydun/CRM-21422_london_timezone
CRM-21422 - Fix handling of 0 timezone offset
Aidan Saunders [Tue, 14 Nov 2017 15:18:11 +0000 (15:18 +0000)]
Code improvement as per Eileen's comment
Mihael Mladenov [Tue, 14 Nov 2017 12:23:08 +0000 (14:23 +0200)]
NDI-14: Removed duplicate submit buttons on Cancel Event Participants page
Monish Deb [Tue, 14 Nov 2017 10:03:48 +0000 (15:33 +0530)]
Merge pull request #11272 from eileenmcnaughton/towards1
NFC code tidy up preparatory to CRM-19273
Eileen McNaughton [Tue, 14 Nov 2017 08:42:50 +0000 (21:42 +1300)]
Merge pull request #11275 from civicrm/4.7.28-rc
4.7.28 rc
Eileen McNaughton [Tue, 14 Nov 2017 07:45:07 +0000 (20:45 +1300)]
CRM-21304 quash form reload message when refreshing (#11122)
* CRM-21304 quash form reload message when refreshing
* CRM-21304 - Disable unsaved changes warning on dedupe form
----------------------------------------
* CRM-21304: Dedupe usablity, quash refresh message in more cases
https://issues.civicrm.org/jira/browse/CRM-21304
Eileen McNaughton [Tue, 14 Nov 2017 07:33:59 +0000 (20:33 +1300)]
Merge pull request #11072 from cividesk/CRM-21265-4.7
CRM-21265: update payment status to Failed if membership transaction…
Eileen McNaughton [Tue, 14 Nov 2017 06:06:26 +0000 (19:06 +1300)]
Merge pull request #11205 from agileware/CRM-20166
CRM-20166: Making CVV always required for front-end pages.
Jitendra Purohit [Tue, 14 Nov 2017 03:26:32 +0000 (08:56 +0530)]
Fix fatal error on pay later
colemanw [Tue, 14 Nov 2017 01:53:15 +0000 (20:53 -0500)]
Merge pull request #11264 from seanmadsen/CRM-21419-activity-separation
CRM-21419 Prevent users from accidentally creating a single activity when they want multiple
colemanw [Mon, 13 Nov 2017 23:14:13 +0000 (18:14 -0500)]
Merge pull request #11269 from varshith/CRM-21041_respect_default_communication_style_on_api_contact_create
CRM-21041: Respect default 'Communication Style' when creating a …
Vinu Varshith S [Mon, 13 Nov 2017 17:19:30 +0000 (22:49 +0530)]
clear weird character causing warnings
colemanw [Mon, 13 Nov 2017 13:47:08 +0000 (08:47 -0500)]
Merge pull request #11254 from colemanw/CRM-21406
CRM-21406 - Standalone export form
Aidan Saunders [Mon, 13 Nov 2017 13:11:12 +0000 (13:11 +0000)]
Fix handling of 0 offset
Alok Patel [Wed, 8 Nov 2017 07:29:29 +0000 (12:59 +0530)]
CRM-20166: Making CVV always required for front-end contribution pages.
Vinu Varshith S [Mon, 13 Nov 2017 11:20:14 +0000 (16:50 +0530)]
Adding test cases for CRM-21041
nbrettell [Mon, 13 Nov 2017 10:13:16 +0000 (10:13 +0000)]
Fix syntax check and remove irrelevant Ajax params
eileen [Mon, 13 Nov 2017 07:57:49 +0000 (20:57 +1300)]
NFC code tidy up, convert result to array more cleanly
eileen [Mon, 13 Nov 2017 07:18:14 +0000 (20:18 +1300)]
NFC code tidy up preparatory to CRM-19273
As part of reducing https://github.com/civicrm/civicrm-core/pull/10962/files easier to parse this makes some small
code tidy ups
1) renames functions to not use the deprecated convention of leading underscore
2) renames function to getLineItemsToAlter rather than 'to add & update'
(later changes will cause this array to include 'to_cancel' & 'to_resurrect')
3) changes the array return format for that function to be an array of requiredChanges
4) rename function _getFinancialItemsToRecord to getReverseFinancialItemsToRecord to
reflect the fact it is generating an array of reversals to perform
Vinu Varshith S [Sun, 12 Nov 2017 05:05:08 +0000 (10:35 +0530)]
Avoid 'array_pop calling a function' situation
colemanw [Sat, 11 Nov 2017 16:37:20 +0000 (11:37 -0500)]
Merge pull request #11195 from jitendrapurohit/CRM-21349
CRM-21349: Increase timeout of status message after batch merge
Coleman Watts [Sat, 11 Nov 2017 16:32:04 +0000 (11:32 -0500)]
CRM-21421 - Api case update should not re-save case contacts
Vinu Varshith S [Sat, 11 Nov 2017 11:10:35 +0000 (16:40 +0530)]
CRM-21041: Respect default 'Communication Style' when creating a Contact via API
Jitendra Purohit [Sat, 11 Nov 2017 11:06:27 +0000 (16:36 +0530)]
minor fix
colemanw [Fri, 10 Nov 2017 21:40:30 +0000 (16:40 -0500)]
Merge pull request #11204 from MiyaNoctem/CRM-21360-make-open-case-manageable
CRM-21360: Make 'Open Case' Activity Optional
nbrettell [Fri, 10 Nov 2017 17:20:50 +0000 (17:20 +0000)]
CRM-21383 - Inclusion of a directive to replace the existing select field for loading Message templates on demand in the CiviMail compose UI
colemanw [Fri, 10 Nov 2017 14:22:17 +0000 (09:22 -0500)]
Merge pull request #11224 from colemanw/CRM-21384
CRM-21384 - Don't show deleted contacts in case relations
colemanw [Fri, 10 Nov 2017 12:54:02 +0000 (07:54 -0500)]
Merge pull request #11260 from JMAConsulting/CRM-21416
CRM-21416: Add reset link beside 'Search' button below Advance Search form
deb.monish [Thu, 9 Nov 2017 08:11:20 +0000 (13:41 +0530)]
CRM-21416: Add reset link beside 'Search' button below Advance Search form
eileen [Fri, 10 Nov 2017 00:15:48 +0000 (13:15 +1300)]
Add unit test on financial items for pending payments.
This test was supposed to demonstrate a failure but actually it demonstrates something working.
Still, good to have an additional test
Tim Otten [Fri, 10 Nov 2017 01:59:08 +0000 (17:59 -0800)]
Merge pull request #11265 from eileenmcnaughton/test
[NFC] Minor refactor of test to allow re-use
eileen [Sun, 22 Oct 2017 03:29:51 +0000 (14:29 +1100)]
[NFC] Minor refactor of test to allow re-use
Change-Id: Ie0ec7ff504420aa41641abc6de4edb8cfb5a4b64
Tim Otten [Thu, 9 Nov 2017 20:58:20 +0000 (12:58 -0800)]
Merge pull request #11253 from christianwach/CRM-20358
CRM-20358: Fix WordPress Access Control table
Sean Madsen [Thu, 9 Nov 2017 16:02:32 +0000 (11:02 -0500)]
CRM-21419 Radio options create separate activities
Instead of a checkbox for the user to choose to create separate
activities for each contact, use a set of radio options in order to
prompt the user to make a decision. This helps prevent users from
accidentally choosing to create combined activities.
Coleman Watts [Thu, 9 Nov 2017 13:33:12 +0000 (08:33 -0500)]
CRM-21349 - Improve batch merge status message
Jitendra Purohit [Thu, 9 Nov 2017 10:50:46 +0000 (16:20 +0530)]
include title
Christian Wach [Wed, 8 Nov 2017 12:13:20 +0000 (12:13 +0000)]
CRM-20358: fix WordPress Access Control table
deb.monish [Thu, 9 Nov 2017 08:21:37 +0000 (13:51 +0530)]
CRM-21362: followup PR which fixes duplicate mailing rows for each job
Seamus Lee [Wed, 8 Nov 2017 20:09:53 +0000 (07:09 +1100)]
CRM-21411 Fix issue where unsubscribe group field would not show because CRM.crmMailing.groupNames was empty
Tim Otten [Wed, 8 Nov 2017 19:05:15 +0000 (11:05 -0800)]
Merge pull request #11256 from colemanw/CRM-21408
CRM-21408 - Api explorer - better defaults for sequential checkbox
Coleman Watts [Wed, 8 Nov 2017 14:40:27 +0000 (09:40 -0500)]
CRM-21408 - Api explorer - better defaults for sequential checkbox
----------------------------------------
* CRM-21408: Api explorer - better defaults for sequential checkbox
https://issues.civicrm.org/jira/browse/CRM-21408
Coleman Watts [Wed, 8 Nov 2017 13:31:37 +0000 (08:31 -0500)]
CRM-21406 - Make standalone export work in popup context
Thomas Schüttler [Wed, 8 Nov 2017 13:21:14 +0000 (14:21 +0100)]
Fix ISO compliance for German counties
Coleman Watts [Wed, 8 Nov 2017 12:44:57 +0000 (07:44 -0500)]
CRM-21406 - Standalone export form
----------------------------------------
* CRM-21406: Create Standalone Export Form
https://issues.civicrm.org/jira/browse/CRM-21406
colemanw [Wed, 8 Nov 2017 10:40:28 +0000 (05:40 -0500)]
Merge pull request #11223 from colemanw/CRM-21382
CRM-21382 - Fix print/merge document on case and support multiple cases
colemanw [Wed, 8 Nov 2017 10:38:47 +0000 (05:38 -0500)]
Merge pull request #11245 from colemanw/CRM-21398
CRM-21398 - Fix fatal error when exporting cases
Tim Otten [Wed, 8 Nov 2017 08:21:36 +0000 (00:21 -0800)]
Merge pull request #11251 from totten/master-mailtest
CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once
Tim Otten [Wed, 8 Nov 2017 06:47:19 +0000 (22:47 -0800)]
CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once
Overview
--------
Remove an unnecessary line from test suite.
Before
------
The test worked when executed as part of the `api_v3` suite, but it failed
when run individually (because the `require_once` doesn't work). Moreover,
the tests for `org.civicrm.flexmailer` failed
After
-----
The tests work on their own.
Comment
-------
This change deals entirely with the packaging/framing of a test-case. It
neither (a) involves the runtime behavior of the application nor (b) the
semantics/behavior of the test. Consequently, it should be safe to merge as
long as the test-runner remains happy.
Eileen McNaughton [Wed, 8 Nov 2017 05:24:03 +0000 (18:24 +1300)]
Merge pull request #11249 from seamuslee001/CRM-21363-maria
CRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default g…
Eileen McNaughton [Wed, 8 Nov 2017 00:52:00 +0000 (13:52 +1300)]
Merge pull request #11059 from JMAConsulting/CRM-21200
CRM-21200: Pay Now payment overwrites the contribution
Eileen McNaughton [Tue, 7 Nov 2017 21:53:51 +0000 (10:53 +1300)]
Merge pull request #10901 from JMAConsulting/CRM-21106
CRM-21106, removed code related to Financial type acl from report