Matthew Wire [Fri, 3 Nov 2017 21:50:09 +0000 (21:50 +0000)]
Add search option to view groups as other components
Eileen McNaughton [Thu, 5 Apr 2018 22:52:34 +0000 (10:52 +1200)]
Merge pull request #11950 from mattwire/cust_data_tpl_extract
Extract custom data edit template code to shared template
Seamus Lee [Thu, 5 Apr 2018 20:37:36 +0000 (06:37 +1000)]
Merge pull request #11900 from eileenmcnaughton/ref
Simple function extraction on editing Address (within main contact edit)
Matthew Wire [Thu, 5 Apr 2018 16:44:03 +0000 (17:44 +0100)]
Extract custom data edit template code to shared template
CiviCRM [Thu, 5 Apr 2018 06:57:04 +0000 (06:57 +0000)]
Set version to 5.2.alpha1
CiviCRM [Thu, 5 Apr 2018 06:51:50 +0000 (06:51 +0000)]
Set version to 5.1.beta1
Eileen McNaughton [Wed, 4 Apr 2018 23:05:17 +0000 (11:05 +1200)]
Merge pull request #11942 from civicrm/5.0
5.0 merge to master
Tim Otten [Wed, 4 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Merge pull request #11924 from JMAConsulting/dev-42
(dev/mail/6) Fix recipient calculation when system has mixed records. Add multilingual test.
Eileen McNaughton [Wed, 4 Apr 2018 19:06:35 +0000 (07:06 +1200)]
Merge pull request #11941 from civicrm/5.0
5.0 to master
Eileen McNaughton [Wed, 4 Apr 2018 19:05:58 +0000 (07:05 +1200)]
Merge pull request #11940 from agh1/5.0.0-release-notes-update
5.0.0 release notes: last-minute change merged
Andrew Hunt [Wed, 4 Apr 2018 16:06:10 +0000 (12:06 -0400)]
5.0.0 release notes: René Olivo works for CompuCorp
Andrew Hunt [Wed, 4 Apr 2018 15:17:26 +0000 (11:17 -0400)]
5.0.0 release notes: last-minute change merged
Monish Deb [Wed, 4 Apr 2018 14:41:11 +0000 (20:11 +0530)]
Merge pull request #11934 from eileenmcnaughton/fees
Fix fatal error when selecting a $0 price option in change fee selection
Eileen McNaughton [Wed, 4 Apr 2018 13:13:44 +0000 (01:13 +1200)]
Merge pull request #11930 from agh1/translate-phone-extension
Phone: standardize appearance and translation of extension label
Eileen McNaughton [Wed, 4 Apr 2018 13:04:33 +0000 (01:04 +1200)]
Merge pull request #11884 from eileenmcnaughton/hold
Tidy up on_hold handling in holdEmail function.
Eileen McNaughton [Wed, 4 Apr 2018 10:16:33 +0000 (22:16 +1200)]
Merge pull request #11935 from civicrm/5.0
5.0 to master
Andrew Hunt [Wed, 4 Apr 2018 10:15:56 +0000 (06:15 -0400)]
5.0.0 release notes (#11931)
* 5.0.0 release notes: raw from script
* 5.0.0 release notes: starting from the top
* 5.0.0 release notes: finished features next steps start with bugs
* 5.0.0 release notes: a few more bugs
* 5.0.0 release notes: cleaning up
* 5.0.0 release notes: fixed up features and bugs sections
* 5.0.0 release notes: updated contributors and boilerplate
* 5.0.0 release notes: late changes to RC
Monish Deb [Wed, 4 Apr 2018 09:11:52 +0000 (14:41 +0530)]
Merge pull request #11666 from eileenmcnaughton/validate_json
CRM-21753 add json validation for incoming criteria
Eileen McNaughton [Wed, 4 Apr 2018 05:54:15 +0000 (17:54 +1200)]
Merge pull request #11865 from seamuslee001/core_dev_18
Fix Core/Dev 18# where logging fails if the AUTO INCREMENT column is …
eileen [Wed, 4 Apr 2018 05:52:14 +0000 (17:52 +1200)]
Fix fatal error when selecting a /bin/bash price option.
The code for creating a new price option creates a new financial transaction but when choosing a /bin/bash price option
it fails as the api does not accept /bin/bash EntityFinancialTrxn, skip if /bin/bash
Eileen McNaughton [Wed, 4 Apr 2018 05:42:39 +0000 (17:42 +1200)]
Merge pull request #11933 from civicrm/5.0
5.0 to master
Eileen McNaughton [Wed, 4 Apr 2018 05:42:10 +0000 (17:42 +1200)]
Merge pull request #11932 from colemanw/8
Core/8 - Fix fatal error on Print/Merge Document for cases
Andrew Hunt [Wed, 4 Apr 2018 01:59:23 +0000 (21:59 -0400)]
Phone: standardize appearance and translation of extension label
Coleman Watts [Tue, 3 Apr 2018 14:52:08 +0000 (10:52 -0400)]
Core/8 - Fix fatal error on Print/Merge Document for cases
Conflicts:
CRM/Case/Form/Task.php
Eileen McNaughton [Wed, 4 Apr 2018 01:36:46 +0000 (13:36 +1200)]
Merge pull request #11929 from civicrm/5.0
5.0 merge to master
Eileen McNaughton [Wed, 4 Apr 2018 01:36:15 +0000 (13:36 +1200)]
Merge pull request #11928 from seamuslee001/case_pre_process_task
Re Add CRM_Case_Form_Task::PreProcessCommon()
Seamus Lee [Tue, 3 Apr 2018 21:44:07 +0000 (07:44 +1000)]
Re Add CRM_Case_Form_Task::PreProcessCommon()
Simplify down and use parent PreProcess function
Eileen McNaughton [Tue, 3 Apr 2018 23:00:46 +0000 (11:00 +1200)]
Merge pull request #11927 from samuelsov/NFC-taxts
(NFC) make (includes taxes) translation work
Samuel Vanhove [Tue, 3 Apr 2018 20:49:48 +0000 (16:49 -0400)]
(NFC) make (includes taxes) translation work
colemanw [Tue, 3 Apr 2018 13:03:38 +0000 (09:03 -0400)]
Merge pull request #11885 from eileenmcnaughton/report_filter_eq
Handle eq (equals) operator in the report url
deb.monish [Tue, 3 Apr 2018 06:37:55 +0000 (12:07 +0530)]
(dev/mail/6) additional fix and added unit test
Eileen McNaughton [Mon, 2 Apr 2018 19:30:28 +0000 (07:30 +1200)]
Merge pull request #11921 from civicrm/5.0
5.0 merge to master
Eileen McNaughton [Mon, 2 Apr 2018 19:28:39 +0000 (07:28 +1200)]
Merge pull request #11917 from eileenmcnaughton/cont_report
CRM-21831 & dev/report/issues/1 Fix regressions in contribution detail report relating to soft credits
Eileen McNaughton [Mon, 2 Apr 2018 19:27:50 +0000 (07:27 +1200)]
Merge pull request #11919 from eileenmcnaughton/top
Fix fatal on topDonor report
Monish Deb [Mon, 2 Apr 2018 10:53:34 +0000 (16:23 +0530)]
Merge pull request #11918 from eileenmcnaughton/export
Extract fetchRelationshipDetails function
eileen [Mon, 2 Apr 2018 08:46:09 +0000 (20:46 +1200)]
Fix fatal on topDonor report
Yashodha Chaku [Mon, 2 Apr 2018 04:25:30 +0000 (09:55 +0530)]
Merge pull request #11814 from eileenmcnaughton/report
CRM-21677 - Report improvements
eileen [Sun, 1 Apr 2018 23:17:36 +0000 (11:17 +1200)]
Extract fetchRelationshipDetails function
Eileen McNaughton [Sun, 1 Apr 2018 22:51:46 +0000 (10:51 +1200)]
Merge pull request #11914 from seamuslee001/CRM-21244-doc
CRM-21244 Update documetnation so it makes sense when setting is disabled
eileen [Sun, 1 Apr 2018 22:36:01 +0000 (10:36 +1200)]
Fix bugs in contribution detail report relating to soft credits
Eileen McNaughton [Sun, 1 Apr 2018 21:52:11 +0000 (09:52 +1200)]
Merge pull request #11915 from civicrm/5.0
5.0
Eileen McNaughton [Sun, 1 Apr 2018 21:50:04 +0000 (09:50 +1200)]
Merge pull request #11906 from JMAConsulting/dev-42
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list
Monish Deb [Sun, 1 Apr 2018 11:57:37 +0000 (17:27 +0530)]
Merge pull request #11905 from seamuslee001/CRM-21244-consistancy
CRM-21244 Ensure consistancy with previous behavior where user emails …
Seamus Lee [Sun, 1 Apr 2018 04:12:52 +0000 (14:12 +1000)]
Merge pull request #11909 from mattwire/membershiptype_comments
NFC Minor comments cleanup on MembershipType
Seamus Lee [Sat, 31 Mar 2018 22:26:06 +0000 (08:26 +1000)]
Merge pull request #11668 from elisseck/CRM-21763
CRM-21763 Util to subtract currencies using integers for precision
Seamus Lee [Sat, 31 Mar 2018 22:08:58 +0000 (08:08 +1000)]
Merge pull request #11911 from JMAConsulting/dev-7
(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count
Seamus Lee [Sat, 31 Mar 2018 21:27:27 +0000 (07:27 +1000)]
Update documetnation so it makes sense when setting is disabled
Seamus Lee [Sat, 31 Mar 2018 00:23:57 +0000 (11:23 +1100)]
CRM-2144 Ensure consistancy with previous behavior where user emails are first then system from emails.
Add unit test to try to verify order of emails
Fix issue where email was not being used as array key causing wrong email to be used
deb.monish [Sat, 31 Mar 2018 11:58:02 +0000 (17:28 +0530)]
(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count
deb.monish [Sat, 31 Mar 2018 09:49:45 +0000 (15:19 +0530)]
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list
Matthew Wire [Sat, 31 Mar 2018 10:16:17 +0000 (11:16 +0100)]
Minor comments cleanup on MembershipType
Monish Deb [Sat, 31 Mar 2018 07:25:06 +0000 (12:55 +0530)]
Merge pull request #11904 from totten/5.0-preview-regr
(dev/mail/5) "New Mailing" - Previews should not schedule real blasts
yashodha [Thu, 18 Jan 2018 10:41:16 +0000 (16:11 +0530)]
CRM-21677 - Report improvements
CRM-21677 - fix DB error and more clean up
CRM-21677 - generalised function
minor fix
CRM-21677 - keep the naming consistent
style fix
Eileen McNaughton [Sat, 31 Mar 2018 02:29:26 +0000 (15:29 +1300)]
Merge pull request #11898 from eileenmcnaughton/min_report
CRM-21677 reduce unnecessary joins in reports
Tim Otten [Fri, 30 Mar 2018 22:02:42 +0000 (15:02 -0700)]
(dev/mail/5) "New Mailing" - Previews should not schedule real blasts
In `CRM_Mailing_BAO_Mailing::create` and `Mailing.create` API, there is a
(*ahem*) special behavior where setting the `scheduled_date` will
immediately trigger scheduling. One shouldn't submit `scheduled_date` for a
preview.
This was not symptomatic before #11142/v4.7.31 because all preview
operations were wrapped in a transaction and rolled back. But now previews
are allowed to have side-effects, so we need some other means to prevent.
This copies the workaround from `crmMailingMgr.save()` and applies
it to `crmMailingMgr.preview()` (etal).
Eileen McNaughton [Fri, 30 Mar 2018 00:13:05 +0000 (13:13 +1300)]
Merge pull request #11878 from mattwire/CRM-21791_financial_batch_pseudoconstant
CRM-21791 Use name for comparison instead of label (alternative)
eileen [Thu, 29 Mar 2018 11:17:21 +0000 (00:17 +1300)]
Simple function extraction on editing Address (within main contact edit
eileen [Thu, 29 Mar 2018 08:48:39 +0000 (21:48 +1300)]
CRM-21677 reduce unnecessary joins in reports
Eileen McNaughton [Thu, 29 Mar 2018 08:11:48 +0000 (21:11 +1300)]
Merge pull request #11889 from eileenmcnaughton/min_report
CRM-21677 reduce unnecessary joins in reports
Eileen McNaughton [Thu, 29 Mar 2018 08:07:06 +0000 (21:07 +1300)]
Merge pull request #11890 from otetard/bugfix/fix-deceases-membership-processing
Fix CRM-19920 regression: “Deceased” status could be translated.
Olivier Tétard [Wed, 28 Mar 2018 12:21:27 +0000 (14:21 +0200)]
Fix CRM-19920 regression: “Deceased” status could be translated.
Find “Deceased” `status_id` by using `CRM_Core_PseudoConstant::getKey()` and check use this status is enabled by using this `status_id` instead of its label (which could be translated).
Monish Deb [Thu, 29 Mar 2018 05:46:13 +0000 (11:16 +0530)]
Merge pull request #11703 from eileenmcnaughton/export
Remove cloning hack from export and add unit tests
Eileen McNaughton [Thu, 29 Mar 2018 02:23:08 +0000 (15:23 +1300)]
Merge pull request #11895 from totten/master-ext-check
CRM_Utils_Check - Soften messages for read-only extensionsDir
Tim Otten [Wed, 28 Mar 2018 22:33:57 +0000 (15:33 -0700)]
CRM_Utils_Check_Component_Env::checkExtensions - Fix typo
Tim Otten [Wed, 28 Mar 2018 21:59:27 +0000 (14:59 -0700)]
CRM_Utils_Check_Component_Env - Soften messages for read-only extDir
There are competing schools of thought on whether extension folders should be web-writable:
* Sometimes, the most active (or the only) admins are web-based. Making the folder writeable lets them keep extensions up-to-date through the web UI.
This includes applying security-fixes for extensions. Thus, sites with writeable extdir are harder to attack (more secure).
* Sometimes, the most active (or the only) admins don't use the web-based admin UI, and they don't trust any web-based users to do administration.
They don't want the folder to be writeable.
* If there's a flaw that allows writing to the filesystem, it could be escalated to writing+executing code. Thus, sites with read-only
extdir are harder to attack (more secure).
This commit tries to accept each scenario as valid -- but communicate
better. Instead of flatly describing the read-only dir as erroreous,
present a warning with some choice/trade-off.
Tim Otten [Wed, 28 Mar 2018 21:39:13 +0000 (14:39 -0700)]
CRM_Utils_Check_Component_Env - Remove redundant check for extensionsDir
When you have a non-writeable extensions directory, *two* status checks will
copmlain about it (`checkDirsWritable`, `checkExtensions`). Between the two,
`checkExtensions` is smarter.
Eileen McNaughton [Wed, 28 Mar 2018 20:15:08 +0000 (09:15 +1300)]
Merge pull request #11891 from nielosz/Add-activities-to-recent-items
CRM-21434: Add activities to recent items stack
Seamus Lee [Wed, 28 Mar 2018 19:11:51 +0000 (06:11 +1100)]
Merge pull request #11888 from mattwire/formrule_typo
NFC Fix function name typo
Eli Lisseck [Wed, 14 Feb 2018 20:40:05 +0000 (12:40 -0800)]
CRM-21763 add money util to subtract currency floats with precisely and implement in CRM_Core_BAO_FinancialTrxn::getPartialPaymentWithType
Niels Heinemann [Wed, 28 Mar 2018 12:49:06 +0000 (14:49 +0200)]
Add items to recents items
Eileen McNaughton [Wed, 28 Mar 2018 10:34:03 +0000 (23:34 +1300)]
Merge pull request #11886 from eileenmcnaughton/varName
[NFC] Fix mispelled variable and simplify a couple of other vars
eileen [Wed, 28 Mar 2018 10:30:54 +0000 (23:30 +1300)]
CRM-21677 reduce unnecessary joins in reports
Eileen McNaughton [Wed, 28 Mar 2018 10:24:00 +0000 (23:24 +1300)]
Merge pull request #11880 from eileenmcnaughton/min_report
CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports
Matthew Wire [Wed, 28 Mar 2018 09:36:57 +0000 (10:36 +0100)]
Fix function name typo
eileen [Mon, 26 Mar 2018 21:10:18 +0000 (10:10 +1300)]
CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports
eileen [Wed, 28 Mar 2018 07:30:53 +0000 (20:30 +1300)]
[NFC] Fix mispelled variable and simplify a couple of other vars
Eileen McNaughton [Wed, 28 Mar 2018 07:15:58 +0000 (20:15 +1300)]
Merge pull request #11882 from eileenmcnaughton/report_filter
Fix report form isTableSelected to treat relative date filters as filters
eileen [Wed, 28 Mar 2018 04:44:41 +0000 (17:44 +1300)]
Handle eq (equals) operator in the report url
eileen [Wed, 28 Mar 2018 01:56:31 +0000 (14:56 +1300)]
Tidy up on_hold handling in holdEmail function.
Follow up on https://github.com/civicrm/civicrm-core/pull/11807
Eileen McNaughton [Wed, 28 Mar 2018 01:45:50 +0000 (14:45 +1300)]
Merge pull request #11807 from lyyana/patch-1
"hold_date" not updated if civimail_multiple_bulk_emails is true + test
Seamus Lee [Wed, 28 Mar 2018 00:48:37 +0000 (11:48 +1100)]
Merge pull request #11336 from eileenmcnaughton/live
CRM-21489 document new constant in civicrm.settings.php
colemanw [Tue, 27 Mar 2018 19:54:33 +0000 (15:54 -0400)]
Merge pull request #11863 from eileenmcnaughton/payment_view
Tweak layout on contribution view screen to make payments clearer
eileen [Wed, 14 Feb 2018 06:27:43 +0000 (19:27 +1300)]
CRM-21753 - addition of json validation
Per https://github.com/civicrm/civicrm-core/pull/11658
the dedupe code has a mechanism to handle a nuanced array of criteria.
This PR is purely to support the passing of that json through the url criteria with
a proposed validation rule.
The criteria in the url might look like
criteria={"contact" : {"first_name" :{"IN" : ["Peter", "Paul", "Mary"]]]}
This is passed to the contact api to limit the contacts to look for matches
for (before actually finding the matches). In discussion the biggest risk seemed to
be the possibility of chaining so I have added a filter on the
criteria & set check_permissions (acls are applied in the next step but
having it on the api call is clearer & may reduce matches for the next step).
eileen [Tue, 27 Mar 2018 04:30:43 +0000 (17:30 +1300)]
Fix report form isTableSelected to treat relative date filters as filters.
isTableSelected looks to see if the filter has been passed in. Without this it looks in ->_params[{}_value] &
for {}_op to be null or 'not null' but misses relative date filters.
Eileen McNaughton [Tue, 27 Mar 2018 01:06:11 +0000 (14:06 +1300)]
Merge pull request #11879 from MegaphoneJon/CRM-21842
CRM-21842 - Fix links to documentation
Seamus Lee [Mon, 26 Mar 2018 22:20:46 +0000 (09:20 +1100)]
Merge pull request #11874 from eileenmcnaughton/cust_data
[NFC] remove unused vars
Matthew Wire [Mon, 26 Mar 2018 16:20:56 +0000 (17:20 +0100)]
CRM-21791 Use name instead of label
Eileen McNaughton [Mon, 26 Mar 2018 20:23:57 +0000 (09:23 +1300)]
Merge pull request #11876 from yashodha/report_improv
CRM-21677 reduce unnecessary joins in mailing reports
Jon Goldberg [Mon, 26 Mar 2018 17:41:02 +0000 (13:41 -0400)]
CRM-21842 - Fix links to documentation
yashodha [Mon, 26 Mar 2018 06:44:49 +0000 (12:14 +0530)]
CRM-21677 reduce unnecessary joins in mailing reports
Yashodha Chaku [Mon, 26 Mar 2018 06:23:35 +0000 (11:53 +0530)]
Merge pull request #11875 from eileenmcnaughton/min_report
CRM-21677 reduce unnecessary joins in pledge reports
eileen [Mon, 26 Mar 2018 04:37:29 +0000 (17:37 +1300)]
CRM-21677 reduce unnecessary joins in pledge reports
And walklist report:
Pledge/Detail
pledge/pbnp
pledge/summary
walklist/walklist
Seamus Lee [Sat, 24 Mar 2018 05:09:50 +0000 (16:09 +1100)]
Merge pull request #11872 from totten/master-test-trait
CiviUnitTestCase - Extract Api3TestTrait and Api3DocTrait
Tim Otten [Fri, 23 Mar 2018 23:27:40 +0000 (16:27 -0700)]
CiviUnitTestCase - Extract Civi\Test\Api3DocTrait
This makes `CiviUnitTestCase` more readable, and it allows other tests to
benefit from these helpers (even if they don't use everything from
`CiviUnitTestCase`).
Tim Otten [Fri, 23 Mar 2018 23:16:24 +0000 (16:16 -0700)]
CiviUnitTestCase - Extract Civi\Test\Api3TestTrait
This makes `CiviUnitTestCase` more readable, and it allows other tests to
benefit from these helpers (even if they don't use everything from
`CiviUnitTestCase`).
Eileen McNaughton [Sat, 24 Mar 2018 02:54:01 +0000 (15:54 +1300)]
Merge pull request #11697 from mattwire/CRM-21784_recur_customdata
CRM-21784 Display custom data when viewing recurring contributions
eileen [Sat, 24 Mar 2018 02:30:37 +0000 (15:30 +1300)]
[NFC] remove unused vars
Eileen McNaughton [Fri, 23 Mar 2018 21:54:29 +0000 (10:54 +1300)]
Merge pull request #11826 from eileenmcnaughton/karing
Use try catch when deleting groups (dev/core/issues/22 )
Eileen McNaughton [Fri, 23 Mar 2018 20:10:00 +0000 (09:10 +1300)]
Merge pull request #11867 from eileenmcnaughton/min_report
CRM-21677 reduce unnecessary joins in membership reports
colemanw [Fri, 23 Mar 2018 16:10:59 +0000 (12:10 -0400)]
Merge pull request #11864 from colemanw/upgradeVersion
Increment minimum upgradable version