civicrm-core.git
5 years agofixup templates/CRM/Admin/Form/Setting/Smtp.hlp
Tim Otten [Thu, 14 Nov 2019 01:01:00 +0000 (17:01 -0800)]
fixup templates/CRM/Admin/Form/Setting/Smtp.hlp

5 years ago(NFC) (dev/core#878) Simplify copyright header (CRM/*)
Tim Otten [Wed, 13 Nov 2019 08:38:12 +0000 (00:38 -0800)]
(NFC) (dev/core#878) Simplify copyright header (CRM/*)

5 years ago(NFC) (dev/core#878) Simplify copyright header (templates/*)
Tim Otten [Wed, 13 Nov 2019 08:39:04 +0000 (00:39 -0800)]
(NFC) (dev/core#878) Simplify copyright header (templates/*)

5 years ago(NFC) (dev/core#878) Simplify copyright header (misc)
Tim Otten [Wed, 13 Nov 2019 08:39:52 +0000 (00:39 -0800)]
(NFC) (dev/core#878) Simplify copyright header (misc)

5 years ago(NFC) (dev/core#878) Simplify copyright header (api/*)
Tim Otten [Wed, 13 Nov 2019 08:39:26 +0000 (00:39 -0800)]
(NFC) (dev/core#878) Simplify copyright header (api/*)

5 years ago(NFC) (dev/core#878) Simplify copyright header (tests/*)
Tim Otten [Wed, 13 Nov 2019 08:38:48 +0000 (00:38 -0800)]
(NFC) (dev/core#878) Simplify copyright header (tests/*)

5 years ago(NFC) (dev/core#878) Simplify copyright header (Civi/*)
Tim Otten [Wed, 13 Nov 2019 08:38:33 +0000 (00:38 -0800)]
(NFC) (dev/core#878) Simplify copyright header (Civi/*)

5 years ago(NFC) (dev/core#878) Simplify copyright header template
Tim Otten [Wed, 13 Nov 2019 08:24:47 +0000 (00:24 -0800)]
(NFC) (dev/core#878) Simplify copyright header template

https://lab.civicrm.org/dev/core/issues/878

5 years ago(NFC) (dev/core#878) Simplify '@copyright' annotation
Tim Otten [Wed, 13 Nov 2019 23:49:34 +0000 (15:49 -0800)]
(NFC) (dev/core#878) Simplify '@copyright' annotation

5 years agoMerge pull request #15833 from yashodha/participant_edit
Eileen McNaughton [Tue, 12 Nov 2019 20:48:58 +0000 (09:48 +1300)]
Merge pull request #15833 from yashodha/participant_edit

(dev/core#1065) Contact missing in membership renewal form

5 years agoMerge pull request #15835 from demeritcowboy/unused-reporturl
Seamus Lee [Tue, 12 Nov 2019 19:50:43 +0000 (06:50 +1100)]
Merge pull request #15835 from demeritcowboy/unused-reporturl

[NFC] Remove unused variable not used since v4.4

5 years agounused variable since v4.5
DemeritCowboy [Tue, 12 Nov 2019 14:57:45 +0000 (09:57 -0500)]
unused variable since v4.5

5 years agoMerge pull request #15756 from eileenmcnaughton/qfbug
Yashodha Chaku [Tue, 12 Nov 2019 12:24:00 +0000 (17:54 +0530)]
Merge pull request #15756 from eileenmcnaughton/qfbug

[REF] very minor tidy up

5 years ago(dev/core#1065) Contact missing in membership renewal form
yashodha [Tue, 12 Nov 2019 11:43:51 +0000 (17:13 +0530)]
(dev/core#1065) Contact missing in membership renewal form

5 years agoMerge pull request #15832 from eileenmcnaughton/mail_s
Seamus Lee [Tue, 12 Nov 2019 06:06:06 +0000 (17:06 +1100)]
Merge pull request #15832 from eileenmcnaughton/mail_s

[NFC] minimal test for Mailing.update_email_resetdate

5 years ago[NFC] minimal test for Mailing.update_email_resetdate
eileen [Tue, 12 Nov 2019 03:55:59 +0000 (16:55 +1300)]
[NFC] minimal test for Mailing.update_email_resetdate

ALso removes a couple of unused variables, adds a few exception comments

5 years agoMerge pull request #15823 from seamuslee001/dev_core_183_mailing
Eileen McNaughton [Tue, 12 Nov 2019 03:54:29 +0000 (16:54 +1300)]
Merge pull request #15823 from seamuslee001/dev_core_183_mailing

dev/core#183 Convert creating of temporary tables in CRM/Mailing file…

5 years agodev/core#183 Convert creating of temporary tables in CRM/Mailing files to using CRM_U...
Seamus Lee [Mon, 11 Nov 2019 22:13:06 +0000 (09:13 +1100)]
dev/core#183 Convert creating of temporary tables in CRM/Mailing files to using CRM_Utils_SQL_TempTable

5 years agoMerge pull request #15822 from eileenmcnaughton/label
Seamus Lee [Mon, 11 Nov 2019 22:09:57 +0000 (09:09 +1100)]
Merge pull request #15822 from eileenmcnaughton/label

Fix LabelFormat class to throw exceptions rather than fatals

5 years agoMerge pull request #15803 from eileenmcnaughton/participant
Seamus Lee [Mon, 11 Nov 2019 22:09:40 +0000 (09:09 +1100)]
Merge pull request #15803 from eileenmcnaughton/participant

Add unit test for searching by participant_status_id & switch to generic function

5 years agoFix LabelFormat class to throw exceptions rather than fatals
eileen [Mon, 11 Nov 2019 21:01:54 +0000 (10:01 +1300)]
Fix LabelFormat class to throw exceptions rather than fatals

I also added some throws to the comment blocks & fixed on fn not to be called by ref

5 years agoAdd unit test for searching by participant_status_id & switch to generic function
eileen [Mon, 11 Nov 2019 01:51:50 +0000 (14:51 +1300)]
Add unit test for searching by participant_status_id & switch to generic function

5 years agoMerge pull request #15791 from seamuslee001/event_search_url_variables
Seamus Lee [Mon, 11 Nov 2019 09:07:22 +0000 (20:07 +1100)]
Merge pull request #15791 from seamuslee001/event_search_url_variables

Fix Participant Search in force mode to support query parameters in URL

5 years agoMerge pull request #15812 from eileenmcnaughton/fee
Seamus Lee [Mon, 11 Nov 2019 09:07:01 +0000 (20:07 +1100)]
Merge pull request #15812 from eileenmcnaughton/fee

Convert fee selection test to use Order api

5 years agoMerge pull request #15809 from eileenmcnaughton/except
Seamus Lee [Mon, 11 Nov 2019 08:07:59 +0000 (19:07 +1100)]
Merge pull request #15809 from eileenmcnaughton/except

[NFC] declare thrown exceptions

5 years agoConvert fee selection test to use Order api
eileen [Mon, 11 Nov 2019 07:25:54 +0000 (20:25 +1300)]
Convert fee selection test to use Order api

This switches the changeFeeSelection test to use Order api to set up the line items etc correctly

I had to remove a couple of checks that were no longer true but they were never 'true' in a
real working flow

5 years agoMerge pull request #15699 from mattwire/participant_cleanup_completeOrderPBRef
Eileen McNaughton [Mon, 11 Nov 2019 06:00:46 +0000 (19:00 +1300)]
Merge pull request #15699 from mattwire/participant_cleanup_completeOrderPBRef

Don't pass \$input to completeOrder by reference - return values are never used

5 years agoFix Participant Search in force mode to support query parameters in URL in Advanced...
Seamus Lee [Sat, 9 Nov 2019 20:09:16 +0000 (07:09 +1100)]
Fix Participant Search in force mode to support query parameters in URL in Advanced Search.

5 years ago[NFC] declare thrown exceptions
eileen [Mon, 11 Nov 2019 03:38:46 +0000 (16:38 +1300)]
[NFC] declare thrown exceptions

5 years agoMerge pull request #15807 from eileenmcnaughton/part_status
Seamus Lee [Mon, 11 Nov 2019 04:47:54 +0000 (15:47 +1100)]
Merge pull request #15807 from eileenmcnaughton/part_status

Handling comma separated list of participant statuses in url

5 years agoMerge pull request #15806 from eileenmcnaughton/member_urls
Eileen McNaughton [Mon, 11 Nov 2019 04:32:40 +0000 (17:32 +1300)]
Merge pull request #15806 from eileenmcnaughton/member_urls

[REF] Add setSearchMetadata to each of the classes that extend CRM_Core_Form_Search

5 years agoMerge pull request #15805 from eileenmcnaughton/cont_urls
Eileen McNaughton [Mon, 11 Nov 2019 04:32:23 +0000 (17:32 +1300)]
Merge pull request #15805 from eileenmcnaughton/cont_urls

[REF] extract setDeprecatedDefaults

5 years agoMerge pull request #15802 from eileenmcnaughton/complete_order_to_calling
Seamus Lee [Mon, 11 Nov 2019 03:27:41 +0000 (14:27 +1100)]
Merge pull request #15802 from eileenmcnaughton/complete_order_to_calling

Test fixes - addresses more invalid setup data

5 years agoMerge pull request #15799 from eileenmcnaughton/valid
Seamus Lee [Mon, 11 Nov 2019 03:26:26 +0000 (14:26 +1100)]
Merge pull request #15799 from eileenmcnaughton/valid

FinancialTrxnTest - Fix unit test to  be 'legit'

5 years agoUpdate url handling of select fields
eileen [Mon, 11 Nov 2019 03:11:20 +0000 (16:11 +1300)]
Update url handling of select fields

5 years agoMerge pull request #15808 from civicrm/5.20
Eileen McNaughton [Mon, 11 Nov 2019 03:23:31 +0000 (16:23 +1300)]
Merge pull request #15808 from civicrm/5.20

5.20

5 years agoMerge pull request #15804 from eileenmcnaughton/fns
Seamus Lee [Mon, 11 Nov 2019 03:19:01 +0000 (14:19 +1100)]
Merge pull request #15804 from eileenmcnaughton/fns

dev/core#1381 fix fatal on case search (unreleased regression

5 years agoMerge pull request #15795 from seamuslee001/dev_core_183_mailing_test
Seamus Lee [Mon, 11 Nov 2019 03:15:01 +0000 (14:15 +1100)]
Merge pull request #15795 from seamuslee001/dev_core_183_mailing_test

dev/core#183 Convert creating of temp table in mailing test to use st…

5 years agoAdd setSearchMetadata to each of the classes that extend CRM_Core_Form_Search
eileen [Mon, 11 Nov 2019 02:34:53 +0000 (15:34 +1300)]
Add setSearchMetadata to each of the classes that extend CRM_Core_Form_Search

This doesn't do something in itself but makes it simpler to handled ensuring url_params work & stdises them

5 years ago[REF] extract setDeprecatedDefaults
eileen [Mon, 11 Nov 2019 02:13:03 +0000 (15:13 +1300)]
[REF] extract setDeprecatedDefaults

5 years agodev/core#1381 fix fatal on case search (unreleased regression
eileen [Mon, 11 Nov 2019 02:03:50 +0000 (15:03 +1300)]
dev/core#1381 fix fatal on case search (unreleased regression

5 years agodev/core#183 Convert creating of temp table in mailing test to use standardised CRM_U...
Seamus Lee [Sun, 10 Nov 2019 19:51:04 +0000 (06:51 +1100)]
dev/core#183 Convert creating of temp table in mailing test to use standardised CRM_Utils_SQL_TempTable interface

5 years ago[REF] very minor tidy up
eileen [Thu, 7 Nov 2019 03:02:55 +0000 (16:02 +1300)]
[REF] very minor tidy up

This just brings the 3 lines that built this 'array within an array' together & makes them a little more
readable

5 years agoFix data to be valid for one of the a.net tests
eileen [Sun, 10 Nov 2019 23:46:09 +0000 (12:46 +1300)]
Fix data to be valid for one of the a.net tests

The tests were munging the line items in set up - this fixes it - but only for one so far

5 years agoMerge pull request #15801 from eileenmcnaughton/format
Eileen McNaughton [Mon, 11 Nov 2019 00:47:47 +0000 (13:47 +1300)]
Merge pull request #15801 from eileenmcnaughton/format

[NFC] reformat CiviUnitTestCase.php

5 years agoFix unit test to be 'legit'
eileen [Sun, 10 Nov 2019 21:23:13 +0000 (10:23 +1300)]
Fix unit test to  be 'legit'

This unit test is one of a bunch that came up as not creating valid payments. The issue is
in the test set up methodology (the 'partial_payment_to_pay' key doesn't work).

On tidying up the test proved to be mostly cruft from an earlier iteration

5 years agoMerge pull request #15798 from seamuslee001/dev_core_183_imports_2
Seamus Lee [Sun, 10 Nov 2019 23:10:04 +0000 (10:10 +1100)]
Merge pull request #15798 from seamuslee001/dev_core_183_imports_2

dev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable …

5 years ago[NFC] reformat CiviUnitTestCase.php
eileen [Sun, 10 Nov 2019 22:57:37 +0000 (11:57 +1300)]
[NFC] reformat CiviUnitTestCase.php

5 years agodev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable fuctionality...
Seamus Lee [Sun, 10 Nov 2019 20:15:15 +0000 (07:15 +1100)]
dev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable fuctionality and remove Incomplete Jobs handling as it is not called

5 years agoMerge pull request #15790 from civicrm/5.20
Seamus Lee [Sat, 9 Nov 2019 07:04:00 +0000 (18:04 +1100)]
Merge pull request #15790 from civicrm/5.20

5.20

5 years agoMerge pull request #15787 from eileenmcnaughton/recur_ug
Seamus Lee [Sat, 9 Nov 2019 05:30:13 +0000 (16:30 +1100)]
Merge pull request #15787 from eileenmcnaughton/recur_ug

Remove unhelpful alert from contribution search

5 years agoMerge pull request #15665 from MikeyMJCO/patch-1
Tim Otten [Sat, 9 Nov 2019 04:37:40 +0000 (20:37 -0800)]
Merge pull request #15665 from MikeyMJCO/patch-1

Create a GitLab general issue template

5 years agoMerge pull request #15789 from seamuslee001/5_19_1_version_notes
Seamus Lee [Sat, 9 Nov 2019 02:57:37 +0000 (13:57 +1100)]
Merge pull request #15789 from seamuslee001/5_19_1_version_notes

5.19.1 Version Release Notes

5 years agoMerge pull request #15783 from eileenmcnaughton/sort_id
Seamus Lee [Sat, 9 Nov 2019 02:44:17 +0000 (13:44 +1100)]
Merge pull request #15783 from eileenmcnaughton/sort_id

[REF] replace copy & paste with shared getSortID function.

5 years agoUpdate 5.19.1.md
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md

5 years agoAdd in release notes for 5.19.1 drop
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop

5 years agoMerge pull request #15786 from eileenmcnaughton/cont_type
Seamus Lee [Sat, 9 Nov 2019 01:41:50 +0000 (12:41 +1100)]
Merge pull request #15786 from eileenmcnaughton/cont_type

Remove obsolete warning

5 years agoRemove unhelpful alert from contribution search
eileen [Sat, 9 Nov 2019 01:12:20 +0000 (14:12 +1300)]
Remove unhelpful alert from contribution search

5 years ago[REF] replace copy & paste with shared getSortID function.
eileen [Fri, 8 Nov 2019 22:59:41 +0000 (11:59 +1300)]
[REF] replace copy & paste with shared getSortID function.

I've replaced this repetitive code chunk across the forms that inherit from CRM_Core_Form_Search

5 years agoMerge pull request #15784 from civicrm/5.20
Eileen McNaughton [Sat, 9 Nov 2019 00:48:25 +0000 (13:48 +1300)]
Merge pull request #15784 from civicrm/5.20

5.20

5 years agoRemove obsolete warning
eileen [Sat, 9 Nov 2019 00:46:37 +0000 (13:46 +1300)]
Remove obsolete warning

The time has come to let this one go.....

5 years agoMerge pull request #15781 from eileenmcnaughton/cont_search
Seamus Lee [Sat, 9 Nov 2019 00:37:51 +0000 (11:37 +1100)]
Merge pull request #15781 from eileenmcnaughton/cont_search

dev/core#1374 Fix search formValue handling on contribution search

5 years agoMerge pull request #15782 from seamuslee001/dev_mailing_56_2
Seamus Lee [Fri, 8 Nov 2019 23:58:17 +0000 (10:58 +1100)]
Merge pull request #15782 from seamuslee001/dev_mailing_56_2

Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix i…

5 years agodev/core#1374 Fix search formValue handling on contribution search
eileen [Fri, 8 Nov 2019 21:42:00 +0000 (10:42 +1300)]
dev/core#1374 Fix search formValue handling on contribution search

This fixes 2 issues
1) Search params being lost when editing a related entity per
https://lab.civicrm.org/dev/core/issues/1374
2) force=1&sort_name=p not working in contribution search url

In digging I concluded the problem is we have 3 underlying arrays which we keep jumbling together

1) formValues - the actual submitted values, augmented by any  url passed params
2) the default values - values to load by default on the form
3) our working query params - a copy of formValues that we have prepared for the query

We need to stop mangling them. I added subtle code comments

5 years agoMerge pull request #15777 from eileenmcnaughton/format
Seamus Lee [Fri, 8 Nov 2019 23:47:26 +0000 (10:47 +1100)]
Merge pull request #15777 from eileenmcnaughton/format

[NFC] Reformat Contact_Form_Search_Advanced

5 years agoAdd in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by...
Seamus Lee [Fri, 8 Nov 2019 22:40:22 +0000 (09:40 +1100)]
Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by mailing_name has been namespaced also in 5.20

5 years agoMerge pull request #15779 from seamuslee001/dev_mailing_56
Seamus Lee [Fri, 8 Nov 2019 22:35:25 +0000 (09:35 +1100)]
Merge pull request #15779 from seamuslee001/dev_mailing_56

dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…

5 years agoMerge pull request #15773 from civicrm/5.20
Eileen McNaughton [Fri, 8 Nov 2019 22:12:58 +0000 (11:12 +1300)]
Merge pull request #15773 from civicrm/5.20

5.20

5 years ago[NFC] Reformat Contact_Form_Search_Advanced
eileen [Fri, 8 Nov 2019 21:03:45 +0000 (10:03 +1300)]
[NFC] Reformat Contact_Form_Search_Advanced

Fix array style

5 years agoMerge pull request #15775 from seamuslee001/convert_fatal_to_error_system_cache
Seamus Lee [Fri, 8 Nov 2019 21:57:56 +0000 (08:57 +1100)]
Merge pull request #15775 from seamuslee001/convert_fatal_to_error_system_cache

Converts using deprecated fatal function for exception in CRM/Utils/Sys…

5 years agoMerge pull request #15776 from eileenmcnaughton/url_params
Seamus Lee [Fri, 8 Nov 2019 21:45:39 +0000 (08:45 +1100)]
Merge pull request #15776 from eileenmcnaughton/url_params

[NFC] comment fixes - exceptions & don't declare NULL

5 years agodev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields...
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports

5 years agoMerge pull request #15774 from seamuslee001/eileen_ts_15770
Seamus Lee [Fri, 8 Nov 2019 21:07:52 +0000 (08:07 +1100)]
Merge pull request #15774 from seamuslee001/eileen_ts_15770

Add in translation function around newly converted statusBounce messages

5 years agoConverts using deprated fatal function for exception in CRM/Utils/System and in CRM...
Seamus Lee [Fri, 8 Nov 2019 20:31:57 +0000 (07:31 +1100)]
Converts using deprated fatal function for exception in CRM/Utils/System and in CRM/Utils/Cache and changes default for retrieve function in the Request class to throw exceptions

Update doc blocks

5 years ago[NFC] comment fixes - exceptions & don't declare NULL
eileen [Fri, 8 Nov 2019 20:50:01 +0000 (09:50 +1300)]
[NFC] comment fixes - exceptions & don't declare NULL

5 years agoAdd in translation function around newly converted statusBounce messages
Seamus Lee [Fri, 8 Nov 2019 20:18:55 +0000 (07:18 +1100)]
Add in translation function around newly converted statusBounce messages

5 years agoMerge pull request #15770 from eileenmcnaughton/except
Seamus Lee [Fri, 8 Nov 2019 20:14:23 +0000 (07:14 +1100)]
Merge pull request #15770 from eileenmcnaughton/except

Swap some fatals on form & page classes for statusBounces

5 years agoMerge pull request #15772 from agh1/5.20.0-releasenotes-initial
Seamus Lee [Fri, 8 Nov 2019 20:09:25 +0000 (07:09 +1100)]
Merge pull request #15772 from agh1/5.20.0-releasenotes-initial

5.20.0 release notes initial run

5 years ago5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 8 Nov 2019 17:26:55 +0000 (12:26 -0500)]
5.20.0 release notes: added boilerplate

5 years ago5.20.0 release notes: raw from script
Andrew Hunt [Fri, 8 Nov 2019 17:21:30 +0000 (12:21 -0500)]
5.20.0 release notes: raw from script

5 years agoMerge pull request #15757 from yashodha/participant_edit
Yashodha Chaku [Fri, 8 Nov 2019 08:29:51 +0000 (13:59 +0530)]
Merge pull request #15757 from yashodha/participant_edit

(dev/core#1065) Contribution in Edit mode needs to be shown consistently

5 years agoSwap some fatals on form & page classes for statusBounces
eileen [Fri, 8 Nov 2019 07:50:45 +0000 (20:50 +1300)]
Swap some fatals on form & page classes for statusBounces

5 years agoMerge pull request #15769 from seamuslee001/mathieu_shared_address_improvement
Seamus Lee [Fri, 8 Nov 2019 06:18:52 +0000 (17:18 +1100)]
Merge pull request #15769 from seamuslee001/mathieu_shared_address_improvement

Improve link title in shared address as per Mathieu

5 years agoImprove link title in shared address as per Mathieu
Seamus Lee [Fri, 8 Nov 2019 05:09:12 +0000 (16:09 +1100)]
Improve link title in shared address as per Mathieu

5 years agoMerge pull request #15666 from revati90/shared_address
Seamus Lee [Fri, 8 Nov 2019 05:07:02 +0000 (16:07 +1100)]
Merge pull request #15666 from revati90/shared_address

modified shared address note under contact dashboard

5 years agoMerge pull request #15768 from civicrm/5.20
Eileen McNaughton [Fri, 8 Nov 2019 02:20:25 +0000 (15:20 +1300)]
Merge pull request #15768 from civicrm/5.20

5.20 to master

5 years agoMerge pull request #15765 from seamuslee001/5.20
Eileen McNaughton [Fri, 8 Nov 2019 02:19:21 +0000 (15:19 +1300)]
Merge pull request #15765 from seamuslee001/5.20

dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…

5 years agoMerge pull request #15764 from civicrm/5.20
Seamus Lee [Thu, 7 Nov 2019 23:36:13 +0000 (10:36 +1100)]
Merge pull request #15764 from civicrm/5.20

5.20

5 years agoMerge pull request #15761 from eileenmcnaughton/cache_stuffed
Seamus Lee [Thu, 7 Nov 2019 23:35:53 +0000 (10:35 +1100)]
Merge pull request #15761 from eileenmcnaughton/cache_stuffed

Fix cachekey string

5 years agodev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services

5 years agoMerge pull request #15248 from MegaphoneJon/reporting-19
Seamus Lee [Thu, 7 Nov 2019 21:03:24 +0000 (08:03 +1100)]
Merge pull request #15248 from MegaphoneJon/reporting-19

reporting#19 - Performance improvements on report display/export

5 years agoMerge pull request #15762 from seamuslee001/dev_core_1371
Seamus Lee [Thu, 7 Nov 2019 20:47:49 +0000 (07:47 +1100)]
Merge pull request #15762 from seamuslee001/dev_core_1371

dev/core#1371 Fix e-notice caused by trying to pass in known  to the …

5 years agodev/core#1371 Fix e-notice caused by trying to pass in known to the extension downlo...
Seamus Lee [Thu, 7 Nov 2019 19:25:55 +0000 (06:25 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known  to the extension downloader when checking requirements

5 years agoMerge pull request #15758 from yashodha/contributors
Seamus Lee [Thu, 7 Nov 2019 19:19:48 +0000 (06:19 +1100)]
Merge pull request #15758 from yashodha/contributors

add contributor name

5 years agoMerge pull request #15595 from eileenmcnaughton/dedupe3
Seamus Lee [Thu, 7 Nov 2019 19:19:06 +0000 (06:19 +1100)]
Merge pull request #15595 from eileenmcnaughton/dedupe3

dev/core#1339 Dedupe screen check to carry across any data where the other contact has none by default.

5 years agoFix cachekey string
eileen [Thu, 7 Nov 2019 19:18:38 +0000 (08:18 +1300)]
Fix cachekey string

I hit a bug (in a unit test) where a user without permissions to access custom data would do a
check_permissions api call followed by a check_permissions = 0 call. In the second call
custom fields were not returned
as they were already excluded from the cached key.

5 years agoMerge pull request #1 from totten/MikeyMJCO-patch-1
Mikey O'Toole [Thu, 7 Nov 2019 09:58:02 +0000 (09:58 +0000)]
Merge pull request #1 from totten/MikeyMJCO-patch-1

Proposed updates to Gitlab issue template

5 years agoIssue template - Add "improvement.md"
Tim Otten [Thu, 7 Nov 2019 07:23:03 +0000 (23:23 -0800)]
Issue template - Add "improvement.md"

This is basically the same as the bug-report template, except:

* "Reproduction steps" become "Example use-case"
* "Environment" is removed - because it's not usually a factor. (And if it is,
  it's generally explicit part of the requirements.)

5 years agoIssue template - More consistent punctuation
Tim Otten [Thu, 7 Nov 2019 07:20:26 +0000 (23:20 -0800)]
Issue template - More consistent punctuation

* End comment-placeholder with period, like in other comment-placeholders
* Remove colons from titles - don't think we do that anywhere else

5 years agoIssue template - Small tweak
Tim Otten [Thu, 7 Nov 2019 07:15:27 +0000 (23:15 -0800)]
Issue template - Small tweak