civicrm-core.git
4 years agoMerge pull request #15864 from mfb/string-type-declaration
Eileen McNaughton [Wed, 20 Nov 2019 00:13:41 +0000 (13:13 +1300)]
Merge pull request #15864 from mfb/string-type-declaration

Add string type declarations to global API functions.

4 years agodev/core#183 Convert the generating of temporary tables within the random segment...
Seamus Lee [Sun, 17 Nov 2019 19:54:46 +0000 (06:54 +1100)]
dev/core#183 Convert the generating of temporary tables within the random segment custom search to using standard CRM_Utils_SQL_TemporaryTable method

4 years ago[NFC] Update composer lockfile to remove warning
Seamus Lee [Tue, 19 Nov 2019 21:16:18 +0000 (08:16 +1100)]
[NFC] Update composer lockfile to remove warning

4 years agoVarious tests assume civicrm_api() $entity param is nullable.
mark burdett [Tue, 19 Nov 2019 04:13:03 +0000 (20:13 -0800)]
Various tests assume civicrm_api() $entity param is nullable.

4 years agoAdd string type declarations to global API functions.
mark burdett [Fri, 15 Nov 2019 22:37:45 +0000 (14:37 -0800)]
Add string type declarations to global API functions.

4 years agoRemove unused variables in completeOrder()
Matthew Wire (MJW Consulting) [Wed, 13 Nov 2019 05:57:07 +0000 (18:57 +1300)]
Remove unused variables in completeOrder()

4 years agoMerge pull request #15880 from mlutfy/fixUserDashboardEvent
Matthew Wire [Tue, 19 Nov 2019 02:24:27 +0000 (15:24 +1300)]
Merge pull request #15880 from mlutfy/fixUserDashboardEvent

Remove nbsp from UserDashboard Event section

4 years agoMerge pull request #15817 from colemanw/Fix
Seamus Lee [Tue, 19 Nov 2019 01:42:33 +0000 (12:42 +1100)]
Merge pull request #15817 from colemanw/Fix

Fix api explorer formatting IS NULL clauses

4 years agoMerge pull request #15881 from civicrm/5.20
Eileen McNaughton [Mon, 18 Nov 2019 21:52:07 +0000 (10:52 +1300)]
Merge pull request #15881 from civicrm/5.20

5.20

4 years agoMerge pull request #15879 from alifrumin/rn5.20
Seamus Lee [Mon, 18 Nov 2019 21:26:04 +0000 (08:26 +1100)]
Merge pull request #15879 from alifrumin/rn5.20

First pass at sorting and annotating 5.20 release notes

4 years agoRemove nbsp from UserDashboard Event section
Mathieu Lutfy [Mon, 18 Nov 2019 20:59:06 +0000 (15:59 -0500)]
Remove nbsp from UserDashboard Event section

4 years agoMerge pull request #15878 from civicrm/5.20
Eileen McNaughton [Mon, 18 Nov 2019 20:53:05 +0000 (09:53 +1300)]
Merge pull request #15878 from civicrm/5.20

5.20

4 years agorelease notes 5.20 - first pass at editing, sorting and annotating
Alice Frumin [Fri, 8 Nov 2019 21:28:06 +0000 (16:28 -0500)]
release notes 5.20 - first pass at editing, sorting and annotating

4 years agoMerge pull request #15846 from greenpeace-cee/fix-cancel-date
Eileen McNaughton [Mon, 18 Nov 2019 20:25:44 +0000 (09:25 +1300)]
Merge pull request #15846 from greenpeace-cee/fix-cancel-date

Fix contribution cancel_date not being loaded

4 years agocrmMailingAB - Only display "Headers and Footers" if there are headers and footers
Tim Otten [Wed, 18 Sep 2019 17:55:56 +0000 (13:55 -0400)]
crmMailingAB - Only display "Headers and Footers" if there are headers and footers

4 years agocrmMailing - Only display "Headers and Footers" if there are headers and footers
Tim Otten [Wed, 18 Sep 2019 17:55:24 +0000 (13:55 -0400)]
crmMailing - Only display "Headers and Footers" if there are headers and footers

4 years agodev/core#1391 - Fix contribution cancel_date not being loaded
Patrick Figel [Thu, 14 Nov 2019 13:19:04 +0000 (14:19 +0100)]
dev/core#1391 - Fix contribution cancel_date not being loaded

This fixes an issue where the contribution cancel_date is not loaded
in the contribution search, causing cancelled contributions not to be
greyed out and the cancel date not to be shown.

4 years agoMerge pull request #15800 from eileenmcnaughton/anet_valid
Matthew Wire [Mon, 18 Nov 2019 05:10:49 +0000 (18:10 +1300)]
Merge pull request #15800 from eileenmcnaughton/anet_valid

Remove unused  parameter recur from CompleteOrder signature

4 years agoMerge pull request #15871 from eileenmcnaughton/init_fatal
Matthew Wire [Mon, 18 Nov 2019 05:09:41 +0000 (18:09 +1300)]
Merge pull request #15871 from eileenmcnaughton/init_fatal

[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class

4 years agoMerge pull request #15866 from eileenmcnaughton/test_dumb
Matthew Wire [Mon, 18 Nov 2019 05:09:04 +0000 (18:09 +1300)]
Merge pull request #15866 from eileenmcnaughton/test_dumb

[NFC] [Test-only] Remove partially paid from statuses tested for RenewContribution

4 years agoMerge pull request #15870 from eileenmcnaughton/init_set
Matthew Wire [Mon, 18 Nov 2019 05:08:18 +0000 (18:08 +1300)]
Merge pull request #15870 from eileenmcnaughton/init_set

[REF] Minor simplifcation on initSet

4 years agoMerge pull request #15854 from eileenmcnaughton/test_fix
Matthew Wire [Mon, 18 Nov 2019 05:07:05 +0000 (18:07 +1300)]
Merge pull request #15854 from eileenmcnaughton/test_fix

[NFC] Test fix - incorrect records created due to test set up using PartiallyPaid when no payment is made

4 years agoMerge pull request #15869 from eileenmcnaughton/add_pay
Matthew Wire [Mon, 18 Nov 2019 05:04:11 +0000 (18:04 +1300)]
Merge pull request #15869 from eileenmcnaughton/add_pay

[REF] remove unused lines of code

4 years agoConvert a few fatals to exceptions.
eileen [Mon, 18 Nov 2019 00:11:18 +0000 (13:11 +1300)]
Convert a few fatals to exceptions.

This is a general thing we are doing. In this case they are all ones that really should
never be hit

4 years agoMerge pull request #15826 from seamuslee001/dev_core_183_dedupe
Seamus Lee [Sun, 17 Nov 2019 23:28:40 +0000 (10:28 +1100)]
Merge pull request #15826 from seamuslee001/dev_core_183_dedupe

dev/core#183 CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php report to using CRM_Utils…

4 years agoMerge pull request #15853 from demeritcowboy/civicasetestcase-duplicate-option-values
Seamus Lee [Sun, 17 Nov 2019 21:38:00 +0000 (08:38 +1100)]
Merge pull request #15853 from demeritcowboy/civicasetestcase-duplicate-option-values

[TEST] dev/core#1394 - Avoid duplicate activity types in tests that use CiviCaseTestCase

4 years agoMerge pull request #15849 from seamuslee001/dev_core_183_dedupe_test
Seamus Lee [Sun, 17 Nov 2019 21:35:14 +0000 (08:35 +1100)]
Merge pull request #15849 from seamuslee001/dev_core_183_dedupe_test

[NFC] Add in unit test of code being altered by #15826

4 years agoMerge pull request #15874 from seamuslee001/dev_core_183_env_check
Seamus Lee [Sun, 17 Nov 2019 21:34:48 +0000 (08:34 +1100)]
Merge pull request #15874 from seamuslee001/dev_core_183_env_check

dev/core#183 Use standard temporary table name format when creating t…

4 years agoAdd in unit test of code being altered by #15826
Seamus Lee [Thu, 14 Nov 2019 19:51:36 +0000 (06:51 +1100)]
Add in unit test of code being altered by #15826

4 years agoMerge pull request #15875 from civicrm/5.20
Eileen McNaughton [Sun, 17 Nov 2019 20:23:57 +0000 (09:23 +1300)]
Merge pull request #15875 from civicrm/5.20

5.20

4 years agoMerge pull request #15872 from eileenmcnaughton/sybunt
Seamus Lee [Sun, 17 Nov 2019 19:50:59 +0000 (06:50 +1100)]
Merge pull request #15872 from eileenmcnaughton/sybunt

Fix Sybunt to select mark rows as selected

4 years agodev/core#183 Use standard temporary table name format when creating temporary utf8mb4...
Seamus Lee [Sun, 17 Nov 2019 19:45:43 +0000 (06:45 +1100)]
dev/core#183 Use standard temporary table name format when creating temporary utf8mb4 temporary table

4 years agoMerge pull request #15873 from eileenmcnaughton/cont_ag
Eileen McNaughton [Sun, 17 Nov 2019 19:29:04 +0000 (08:29 +1300)]
Merge pull request #15873 from eileenmcnaughton/cont_ag

dev/core#1377 Fix bug where search action doesn't work.

4 years agoMerge pull request #15865 from eileenmcnaughton/query
Seamus Lee [Sun, 17 Nov 2019 08:38:03 +0000 (19:38 +1100)]
Merge pull request #15865 from eileenmcnaughton/query

Fix incorrect reference on extracted function

4 years agodev/core#1377 Fix bug where search action doesn't work.
eileen [Sun, 17 Nov 2019 08:18:47 +0000 (21:18 +1300)]
dev/core#1377 Fix bug where search action doesn't work.

Fixes a regression where the search actions are not working on the contributionAggregate custom search

4 years agoMerge pull request #15867 from eileenmcnaughton/test_dumber
Seamus Lee [Sun, 17 Nov 2019 08:15:17 +0000 (19:15 +1100)]
Merge pull request #15867 from eileenmcnaughton/test_dumber

[NFC] fix test to correctly set up partially paid contribution

4 years agoFix Sybunt to select mark rows as selected
eileen [Sun, 17 Nov 2019 07:04:26 +0000 (20:04 +1300)]
Fix Sybunt to select mark rows as selected

4 years agoMerge pull request #15820 from seamuslee001/dev_core_183_custom_contribsybnt
Eileen McNaughton [Sun, 17 Nov 2019 06:17:10 +0000 (19:17 +1300)]
Merge pull request #15820 from seamuslee001/dev_core_183_custom_contribsybnt

dev/core#183 Finish converting contrib sybnt custom search to using t…

4 years agoMerge pull request #15868 from colemanw/sortable
Eileen McNaughton [Sun, 17 Nov 2019 06:12:00 +0000 (19:12 +1300)]
Merge pull request #15868 from colemanw/sortable

Upgrade ui-sortable angular library to v0.19.0

4 years ago[REF] Minor simplifcation on initSet
eileen [Sun, 17 Nov 2019 05:20:33 +0000 (18:20 +1300)]
[REF] Minor simplifcation on initSet

Instead of passing the information to calculate the priceSetID into this function it's more helpful
to calculate it first & pass it in - this determination makes more sense on the calling form

4 years ago[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class
eileen [Sun, 17 Nov 2019 05:48:40 +0000 (18:48 +1300)]
[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class

It turns out this function is only ever used from the ParticipantForm class so moving it back there simplifies
that for people looking at the code

4 years ago[REF] remove unused lines of code
eileen [Sun, 17 Nov 2019 04:32:21 +0000 (17:32 +1300)]
[REF] remove unused lines of code

On checking this out this variable is never used ( is)

4 years agoMerge pull request #15815 from artfulrobot/issue-1108-fix-unsubscribe
Seamus Lee [Sun, 17 Nov 2019 02:04:54 +0000 (13:04 +1100)]
Merge pull request #15815 from artfulrobot/issue-1108-fix-unsubscribe

dev/core#1108 Fix unsubscribe bug

4 years agoUpgrade ui-sortable angular library to v0.19.0
Coleman Watts [Sat, 16 Nov 2019 18:35:52 +0000 (13:35 -0500)]
Upgrade ui-sortable angular library to v0.19.0

4 years ago[NFC] fix test to correctly set up partially paid contribution
eileen [Sat, 16 Nov 2019 03:55:53 +0000 (16:55 +1300)]
[NFC] fix test to correctly set up partially paid contribution

4 years agoRemove partially paid from statuses tested for RenewContribution
eileen [Sat, 16 Nov 2019 03:50:00 +0000 (16:50 +1300)]
Remove partially paid from statuses tested for RenewContribution

We want to deprecate this as it doesn't work properly. In this case there is no need to test
it as it's not really valid & hopefully soon it would trigger a deprecation notice

Test that will work when we can deprecate https://github.com/civicrm/civicrm-core/pull/15855

4 years agoFix incorrect reference on extracted function
eileen [Sat, 16 Nov 2019 02:23:35 +0000 (15:23 +1300)]
Fix incorrect reference on extracted function

Per https://github.com/civicrm/civicrm-core/pull/15803#pullrequestreview-317543503

4 years agoMerge pull request #13232 from JO0st/core-574
Tim Otten [Fri, 15 Nov 2019 20:39:15 +0000 (12:39 -0800)]
Merge pull request #13232 from JO0st/core-574

(dev/core#574) Prevent memory exhaustion when generating large PDFs

4 years agoMerge pull request #15848 from colemanw/dateIcons
colemanw [Fri, 15 Nov 2019 20:13:16 +0000 (15:13 -0500)]
Merge pull request #15848 from colemanw/dateIcons

Improve datePicker placeholder/icons

4 years agoMerge pull request #15818 from colemanw/fields
Tim Otten [Fri, 15 Nov 2019 19:11:46 +0000 (11:11 -0800)]
Merge pull request #15818 from colemanw/fields

Field metadata cleanup: Contact & Activity & Custom

4 years agoImprove datePicker placeholder/icons
Coleman Watts [Thu, 14 Nov 2019 17:44:37 +0000 (12:44 -0500)]
Improve datePicker placeholder/icons

4 years agoMerge pull request #15794 from KarinG/master
Mathieu Lu [Fri, 15 Nov 2019 17:00:03 +0000 (12:00 -0500)]
Merge pull request #15794 from KarinG/master

Implement drupal_get_user_timezone()

4 years agoMerge pull request #15837 from totten/master-prtmpl
Mathieu Lu [Fri, 15 Nov 2019 16:49:23 +0000 (11:49 -0500)]
Merge pull request #15837 from totten/master-prtmpl

(NFC) PULL_REQUEST_TEMPLATE.md - Improve suggestions for under-the-hood/non-UI changes

4 years agoMerge pull request #15840 from yashodha/participant_edit
Mathieu Lu [Fri, 15 Nov 2019 16:46:30 +0000 (11:46 -0500)]
Merge pull request #15840 from yashodha/participant_edit

dev/core#1065 Change verbiage in accordance with context

4 years agoAvoid duplicate activity types
DemeritCowboy [Fri, 15 Nov 2019 03:45:00 +0000 (22:45 -0500)]
Avoid duplicate activity types

4 years agoMerge pull request #15852 from mfb/api-type-declaration
Monish Deb [Fri, 15 Nov 2019 14:44:52 +0000 (20:14 +0530)]
Merge pull request #15852 from mfb/api-type-declaration

Add $params type declaration to global API functions.

4 years agoMerge pull request #15858 from yashodha/translation
Eileen McNaughton [Fri, 15 Nov 2019 08:10:33 +0000 (21:10 +1300)]
Merge pull request #15858 from yashodha/translation

translate strings

4 years agoRemove obsolete type check tests, preserving one to ensure TypeError is thrown.
mark burdett [Fri, 15 Nov 2019 05:52:29 +0000 (21:52 -0800)]
Remove obsolete type check tests, preserving one to ensure TypeError is thrown.

4 years agoUnsubscribe bug: Fix gitlab issue 1108 (and clean up old db code)
Rich Lott / Artful Robot [Fri, 15 Nov 2019 07:39:02 +0000 (07:39 +0000)]
Unsubscribe bug: Fix gitlab issue 1108 (and clean up old db code)

4 years agoUnsubscribe bug: Add failing test for Gitlab Issue 1108
Rich Lott / Artful Robot [Fri, 15 Nov 2019 07:38:41 +0000 (07:38 +0000)]
Unsubscribe bug: Add failing test for Gitlab Issue 1108

4 years agotranslate strings
yashodha [Fri, 15 Nov 2019 05:52:35 +0000 (11:22 +0530)]
translate strings

4 years ago[NFC] Test fix - incorrect records created due to test set up using PartiallyPaid...
eileen [Fri, 15 Nov 2019 04:04:01 +0000 (17:04 +1300)]
[NFC] Test fix - incorrect records created due to test set up using PartiallyPaid when no payment is made

4 years agoMerge pull request #15828 from eileenmcnaughton/dedupe2
Eileen McNaughton [Fri, 15 Nov 2019 03:54:48 +0000 (16:54 +1300)]
Merge pull request #15828 from eileenmcnaughton/dedupe2

[REF] minor refactor - move handling of 'skipMerge' to the skipMerge function

4 years agoMerge pull request #15813 from eileenmcnaughton/fee
Matthew Wire [Fri, 15 Nov 2019 01:39:35 +0000 (14:39 +1300)]
Merge pull request #15813 from eileenmcnaughton/fee

Fix CRM/Event/BAO/AdditionalPaymentTest.php to use Order.create

4 years ago[REF] minor refactor - move handling of 'skipMerge' to the skipMerge function
eileen [Tue, 12 Nov 2019 00:27:30 +0000 (13:27 +1300)]
[REF] minor refactor - move handling of 'skipMerge' to the skipMerge function

4 years agoMerge pull request #15851 from demeritcowboy/document-customdata
Seamus Lee [Fri, 15 Nov 2019 01:01:45 +0000 (12:01 +1100)]
Merge pull request #15851 from demeritcowboy/document-customdata

[NFC] dev/core#1352 - Add comments why there's two custom blocks on new case form

4 years agoMerge pull request #15830 from eileenmcnaughton/dedupe4
Seamus Lee [Fri, 15 Nov 2019 00:42:07 +0000 (11:42 +1100)]
Merge pull request #15830 from eileenmcnaughton/dedupe4

[REF] refactor on nasty Dedupe function

4 years agoAdd $params type declaration to global API functions.
mark burdett [Fri, 15 Nov 2019 00:19:57 +0000 (16:19 -0800)]
Add $params type declaration to global API functions.

4 years agoMerge pull request #15810 from eileenmcnaughton/mem_fix
Matthew Wire [Thu, 14 Nov 2019 23:28:38 +0000 (12:28 +1300)]
Merge pull request #15810 from eileenmcnaughton/mem_fix

[REF] calculate 'amount' on ContributionPage in a shared way in one scenario

4 years agodocument why there's two custom blocks
DemeritCowboy [Thu, 14 Nov 2019 23:26:25 +0000 (18:26 -0500)]
document why there's two custom blocks

4 years agoMerge pull request #15850 from civicrm/5.20
Eileen McNaughton [Thu, 14 Nov 2019 22:01:50 +0000 (11:01 +1300)]
Merge pull request #15850 from civicrm/5.20

5.20 to master

4 years agoMerge pull request #15844 from mlutfy/fixMsgTpl
Eileen McNaughton [Thu, 14 Nov 2019 22:01:24 +0000 (11:01 +1300)]
Merge pull request #15844 from mlutfy/fixMsgTpl

marketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates

4 years agoMerge pull request #15838 from demeritcowboy/getcasereport-split
Eileen McNaughton [Thu, 14 Nov 2019 17:31:24 +0000 (06:31 +1300)]
Merge pull request #15838 from demeritcowboy/getcasereport-split

[REF] XMLProcessor/Report - Extract method to make it more testable

4 years agoMerge pull request #15825 from seamuslee001/dev_core_183_logging
Eileen McNaughton [Thu, 14 Nov 2019 17:30:53 +0000 (06:30 +1300)]
Merge pull request #15825 from seamuslee001/dev_core_183_logging

dev/core#183 Convert Logging report summary report to using CRM_Utils…

4 years agoRemove background opacity in menus; improving accessibility/readability
Rich Lott / Artful Robot [Thu, 14 Nov 2019 17:17:03 +0000 (17:17 +0000)]
Remove background opacity in menus; improving accessibility/readability

4 years agoMerge pull request #15649 from JMAConsulting/core-1346
Yashodha Chaku [Thu, 14 Nov 2019 10:54:52 +0000 (16:24 +0530)]
Merge pull request #15649 from JMAConsulting/core-1346

core#1346: Tagsets should display vertically in activity/new case forms

4 years agoMerge pull request #15843 from totten/master-simplehead
Tim Otten [Thu, 14 Nov 2019 02:54:56 +0000 (18:54 -0800)]
Merge pull request #15843 from totten/master-simplehead

(NFC) (dev/core#878) Simplify standard header. Remove year+version.

4 years agoMerge pull request #15839 from demeritcowboy/should-it-be-static
colemanw [Thu, 14 Nov 2019 02:45:59 +0000 (21:45 -0500)]
Merge pull request #15839 from demeritcowboy/should-it-be-static

CiviCase - Make static function `allActivityTypes()` static

4 years agoMerge pull request #15771 from eileenmcnaughton/partially
Eileen McNaughton [Thu, 14 Nov 2019 02:23:34 +0000 (15:23 +1300)]
Merge pull request #15771 from eileenmcnaughton/partially

dev/financial#100 Remove 'partially paid' as a contribution status option for 'record p…ayment'

4 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

4 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/*)

4 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/*)

4 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)

4 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/*)

4 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/*)

4 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/*)

4 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

4 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

4 years agomarketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates
Mathieu Lutfy [Wed, 13 Nov 2019 19:56:02 +0000 (14:56 -0500)]
marketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates

4 years agodev/core#183 Finish converting contrib sybnt custom search to using tem table class
Seamus Lee [Mon, 11 Nov 2019 20:42:14 +0000 (07:42 +1100)]
dev/core#183 Finish converting contrib sybnt custom search to using tem table class

4 years agomake static function static
DemeritCowboy [Wed, 13 Nov 2019 02:01:40 +0000 (21:01 -0500)]
make static function static

4 years ago(dev/core#1065) change verbiage in accordance with context
yashodha [Wed, 13 Nov 2019 04:23:22 +0000 (09:53 +0530)]
(dev/core#1065) change verbiage in accordance with context

4 years agopull out to make more testable
DemeritCowboy [Wed, 13 Nov 2019 01:44:06 +0000 (20:44 -0500)]
pull out to make more testable

4 years ago(NFC) PULL_REQUEST_TEMPLATE.md - Improve suggestions for under-the-hood/non-UI changes
Tim Otten [Tue, 12 Nov 2019 21:48:33 +0000 (13:48 -0800)]
(NFC) PULL_REQUEST_TEMPLATE.md - Improve suggestions for under-the-hood/non-UI changes

Overview
----------------------------------------

The "pull-request template" is presented to a developer when submitting a
proposed change; it prompts them to fill in additional information.  This
revision aims to make the prompts more useful in the common case where change
does *not* involve the user-interface.

Before
----------------------------------------

The `PULL_REQUEST_TEMPLATE.md` suggests that the "Before" and "After" should
be demonstrated with screenshots.

This is wonderful for UI-oriented changes.

However, if a change is focused under-the-hood (APIs, data-structures,
class-hierarchies, refactorings, etc) - then the prompt is kind of
meaningless/non-applicable.  A meaningless prompt understandably elicits
weak responses like "*Before: Some incorrect metadata*" or "*After: It's
less confusing*".

After
----------------------------------------

The `PULL_REQUEST_TEMPLATE.md` still recommends using concrete example in
"Before"/"After", but it's more open about what that means.

For a UI-oriented change, it means screenshots.  For an
API/technical-service change, it means code-snippets.

4 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

4 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

4 years agoAdd help_pre and help_post to api4 fieldSpec
Coleman Watts [Tue, 12 Nov 2019 19:34:00 +0000 (14:34 -0500)]
Add help_pre and help_post to api4 fieldSpec

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

4 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

4 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