colemanw [Tue, 19 Apr 2022 14:46:16 +0000 (10:46 -0400)]
Merge pull request #23237 from eileenmcnaughton/data_source
[REF] [Import] Stop overloading dataSource form
Yashodha Chaku [Tue, 19 Apr 2022 12:37:14 +0000 (18:07 +0530)]
Merge pull request #23242 from eileenmcnaughton/imp_var
[REF] [Import] Remove meaningless code
Matthew Wire [Tue, 19 Apr 2022 11:09:11 +0000 (12:09 +0100)]
Merge pull request #23156 from eileenmcnaughton/pppro
Paypal pro, a.net ipn - do not update start date, status
Seamus Lee [Tue, 19 Apr 2022 10:23:14 +0000 (20:23 +1000)]
Merge pull request #22959 from colemanw/managedRefactor
ManagedEntities - Allow targeted reconciliation. Add hook parameter. Simplify logic.
Matthew Wire [Tue, 19 Apr 2022 09:43:54 +0000 (10:43 +0100)]
Merge pull request #23210 from eileenmcnaughton/cancel
Always use cancelSubscription form for cancelling recurring contributions
Tim Otten [Tue, 19 Apr 2022 07:06:43 +0000 (00:06 -0700)]
ManagedEntitiesTest - Add coverage for filtering by module
demeritcowboy [Tue, 19 Apr 2022 03:49:16 +0000 (23:49 -0400)]
Merge pull request #23244 from eileenmcnaughton/wow
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 02:05:19 +0000 (14:05 +1200)]
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 01:39:34 +0000 (13:39 +1200)]
Merge pull request #23241 from eileenmcnaughton/import_abstract
[REF] [Import] remove pointless fini functions.
colemanw [Tue, 19 Apr 2022 00:48:49 +0000 (20:48 -0400)]
Merge pull request #23240 from eileenmcnaughton/import_codes
[REF] [Import] Remove warning count - never returned
Eileen McNaughton [Mon, 18 Apr 2022 23:21:38 +0000 (11:21 +1200)]
[REF] [Import] remove pointless fini functions.
These never do anything - there are there only through copy & paste + a the abstract class requiring them.
In fact all the abstract functions are dumb - the are only called internally
within the classes so I have gotten rid of the abstractness so they
can be removed at will. import makes sense - but the signature doesn't...
Eileen McNaughton [Tue, 19 Apr 2022 00:03:30 +0000 (12:03 +1200)]
Remove meaningless code
Eileen McNaughton [Mon, 18 Apr 2022 23:54:17 +0000 (11:54 +1200)]
Merge pull request #23239 from colemanw/afformLineup
Afform - Improve dragging into dropzones
Tim Otten [Sat, 16 Apr 2022 02:04:06 +0000 (19:04 -0700)]
hook_managed - Accept option module filter
colemanw [Mon, 18 Apr 2022 22:27:30 +0000 (18:27 -0400)]
Merge pull request #23236 from eileenmcnaughton/mapField
[Ref] [Import] Remove another good intention....mapField
Coleman Watts [Thu, 17 Mar 2022 02:00:54 +0000 (22:00 -0400)]
REF - Refactor ManagedEntities with the ability to reconcile a single module
Reconciling a single module (e.g. Afform) is more efficient.
Further refactoring of ManagedEntities for code simplification and efficiency.
Instead of fetching Managed records 3 times (for enabled, disabled and missing modules),
now they are fetched only once and sorted into the correct category.
Eileen McNaughton [Mon, 18 Apr 2022 22:01:19 +0000 (10:01 +1200)]
[REF] [Import] Remove warning count - never returned
Coleman Watts [Mon, 18 Apr 2022 19:42:16 +0000 (15:42 -0400)]
Afform - Improve dragging into dropzones
Eileen McNaughton [Mon, 18 Apr 2022 01:54:32 +0000 (13:54 +1200)]
Stop overloading dataSource form
Eileen McNaughton [Sun, 17 Apr 2022 22:49:57 +0000 (10:49 +1200)]
[REF] [Import] [Test] switch test to use full form flow
Eileen McNaughton [Thu, 14 Apr 2022 02:11:23 +0000 (14:11 +1200)]
Remove non-functional code
Instantiating the importJob with a table name and no createTable
does nothing but set the name so that getTableName() gets it
- import_table_name is always set so these lines do nothing
Eileen McNaughton [Thu, 14 Apr 2022 01:37:53 +0000 (13:37 +1200)]
[REF] Minor clean up
Eileen McNaughton [Sun, 17 Apr 2022 22:55:22 +0000 (10:55 +1200)]
[Import] Simplify and limit dataSource retrieval
Eileen McNaughton [Mon, 18 Apr 2022 00:08:04 +0000 (12:08 +1200)]
Remove another good intention....
colemanw [Sun, 17 Apr 2022 23:05:36 +0000 (19:05 -0400)]
Merge pull request #23217 from eileenmcnaughton/import_act
Standardise activity datasource text
colemanw [Sun, 17 Apr 2022 23:03:11 +0000 (19:03 -0400)]
Merge pull request #23218 from eileenmcnaughton/import_part
Standardise participant import text
colemanw [Sun, 17 Apr 2022 23:02:19 +0000 (19:02 -0400)]
Merge pull request #23227 from eileenmcnaughton/inbetween_4
[REF] [Import] Remove last in-between parser class
colemanw [Sun, 17 Apr 2022 23:01:21 +0000 (19:01 -0400)]
Merge pull request #23221 from eileenmcnaughton/mapField
[Ref] [Import] Remove another 'in-between' class
colemanw [Sun, 17 Apr 2022 23:00:31 +0000 (19:00 -0400)]
Merge pull request #23223 from eileenmcnaughton/in_between2
[REF] [Import] [Contact] Remove in-between class
Eileen McNaughton [Sun, 17 Apr 2022 21:45:04 +0000 (09:45 +1200)]
Merge pull request #23232 from braders/nodefaults-tab-links
Apply nodefaults to contact tabs for escape-on-output
Eileen McNaughton [Sun, 17 Apr 2022 21:29:22 +0000 (09:29 +1200)]
Merge pull request #23231 from civicrm/5.49
5.49
Bradley Taylor [Sat, 16 Apr 2022 08:48:28 +0000 (09:48 +0100)]
Apply nodefaults to contact tabs for escape-on-output
Eileen McNaughton [Sat, 16 Apr 2022 03:30:53 +0000 (15:30 +1200)]
Merge pull request #23229 from pradpnayak/limitcontacts
Limit issue fix
Seamus Lee [Sat, 16 Apr 2022 02:41:55 +0000 (12:41 +1000)]
Merge pull request #23226 from MegaphoneJon/individual-employers
restore using non-organizations as employers
Eileen McNaughton [Fri, 15 Apr 2022 22:54:31 +0000 (10:54 +1200)]
Merge pull request #23220 from totten/master-defn
(REF) CryptoRegistry - Fix type declaration
Seamus Lee [Fri, 15 Apr 2022 22:45:54 +0000 (08:45 +1000)]
Merge pull request #23184 from totten/master-bd-drush
(NFC) Skip CliRunnerTest on php80+drush+Backdrop
Pradeep Nayak [Fri, 15 Apr 2022 22:45:00 +0000 (23:45 +0100)]
Limit issue fix
Seamus Lee [Fri, 15 Apr 2022 22:43:59 +0000 (08:43 +1000)]
Merge pull request #23080 from eileenmcnaughton/isset
Always assign pay_later_receipt
Tim Otten [Fri, 15 Apr 2022 22:41:09 +0000 (15:41 -0700)]
Merge pull request #23199 from eileenmcnaughton/imp
dev/core#1307 Add civicrm_user_job table
Eileen McNaughton [Fri, 15 Apr 2022 22:04:17 +0000 (10:04 +1200)]
Merge pull request #22664 from braders/membershipview-default-values
Set default values on MembershipView to stop PHP notices
Jon Goldberg [Fri, 15 Apr 2022 14:24:11 +0000 (10:24 -0400)]
allow non-organization employers
Eileen McNaughton [Fri, 15 Apr 2022 21:54:16 +0000 (09:54 +1200)]
Remove last in-between parser class
Unlike the others this does have non-core refs in civihr & csvimport -
I suspect these are copy & paste rather than functional but will patch
Eileen McNaughton [Fri, 15 Apr 2022 21:45:53 +0000 (09:45 +1200)]
Merge pull request #23207 from braders/row-action-nodefaults
Apply nodefaults to row actions
Eileen McNaughton [Fri, 15 Apr 2022 21:25:12 +0000 (09:25 +1200)]
Merge pull request #23208 from braders/access-wp-nodefaults
Add nodefaults to access.tpl
Eileen McNaughton [Fri, 15 Apr 2022 21:24:40 +0000 (09:24 +1200)]
Merge pull request #23225 from braders/edit-group-nodefaults
Add nodefaults to group edit form
Bradley Taylor [Fri, 15 Apr 2022 08:59:19 +0000 (09:59 +0100)]
Add nodefaults to group edit form
Eileen McNaughton [Fri, 15 Apr 2022 04:04:13 +0000 (16:04 +1200)]
Remove another 'in-between' class
As with Contribution & Membership there is a pointless in-between class that
is only inherited by one class...
Eileen McNaughton [Fri, 15 Apr 2022 04:17:13 +0000 (16:17 +1200)]
Remove in-between class
A universe search finds no other references
Tim Otten [Fri, 15 Apr 2022 03:53:43 +0000 (20:53 -0700)]
(REF) CryptoRegistry - Tighten type declaration
Eileen McNaughton [Fri, 15 Apr 2022 03:30:02 +0000 (15:30 +1200)]
Standardise participant import text
Eileen McNaughton [Fri, 15 Apr 2022 03:16:39 +0000 (15:16 +1200)]
Standardise activity datasource text
colemanw [Fri, 15 Apr 2022 02:48:00 +0000 (22:48 -0400)]
Merge pull request #23186 from eileenmcnaughton/import_more
Standardize DataSource file for Contribution & Membership
Eileen McNaughton [Thu, 14 Apr 2022 04:04:39 +0000 (16:04 +1200)]
dev/core#1307 Add civicrm_import_job table
Eileen McNaughton [Fri, 15 Apr 2022 01:40:46 +0000 (13:40 +1200)]
Merge pull request #23209 from civicrm/5.49
5.49
Eileen McNaughton [Fri, 15 Apr 2022 01:25:26 +0000 (13:25 +1200)]
Merge pull request #23212 from colemanw/noMoreDrupal6
Remove code only needed by Drupal6
Eileen McNaughton [Thu, 14 Apr 2022 23:08:06 +0000 (11:08 +1200)]
Always use cancelSubscription form for cancelling recurring contributions
This is https://github.com/civicrm/civicrm-core/pull/18196 without the bit I was uncomfortable with
Coleman Watts [Thu, 14 Apr 2022 23:33:03 +0000 (19:33 -0400)]
Remove code only needed by Drupal6
Followup from https://github.com/civicrm/civicrm-core/pull/22960
Eileen McNaughton [Thu, 14 Apr 2022 23:20:21 +0000 (11:20 +1200)]
Merge pull request #23206 from braders/feature/pledge-payment-nodefaults
Don't overescape links in pledge tab
Tim Otten [Thu, 14 Apr 2022 23:13:07 +0000 (16:13 -0700)]
Merge pull request #23160 from eileenmcnaughton/ev
(REF) Fix test to use full flow
Eileen McNaughton [Thu, 14 Apr 2022 22:46:47 +0000 (10:46 +1200)]
Merge pull request #23205 from braders/tablink-nodefaults
Don't overescape tab links
demeritcowboy [Thu, 14 Apr 2022 22:35:41 +0000 (18:35 -0400)]
Merge pull request #23198 from eileenmcnaughton/549
Move 5.49 update to beta
Bradley Taylor [Thu, 14 Apr 2022 22:03:16 +0000 (23:03 +0100)]
Add nodefaults to access.tpl
Eileen McNaughton [Thu, 14 Apr 2022 21:50:25 +0000 (09:50 +1200)]
Merge pull request #23204 from totten/master-ext-msg
(dev/core#3171) "Manage Extensions" - Tweak messaging for "Install" screen
Bradley Taylor [Thu, 14 Apr 2022 21:36:17 +0000 (22:36 +0100)]
Apply nodefaults to row actions
Bradley Taylor [Thu, 14 Apr 2022 21:03:01 +0000 (22:03 +0100)]
Don't overescape links in pledge tab
Bradley Taylor [Thu, 14 Apr 2022 20:50:57 +0000 (21:50 +0100)]
Don't overescape tab links
Tim Otten [Thu, 14 Apr 2022 19:56:49 +0000 (12:56 -0700)]
"Manage Extensions" - Fix title display
1. Extensions sometimes display the `key` rather than the `<name>`.
This happens because it only reads titles from the remote/download feed.
2. When the key is used, put some styling on it.
3. Escape from Los Smartalous
Tim Otten [Thu, 14 Apr 2022 19:55:31 +0000 (12:55 -0700)]
dev/core#3171 - Tune-down the pre-"Install" message
Eileen McNaughton [Wed, 13 Apr 2022 03:22:45 +0000 (15:22 +1200)]
Standardize DataSource file for Contribution & Membership
demeritcowboy [Thu, 14 Apr 2022 12:33:32 +0000 (08:33 -0400)]
Merge pull request #23194 from eileenmcnaughton/ds2
Remove unused parameter from private function
demeritcowboy [Thu, 14 Apr 2022 12:30:48 +0000 (08:30 -0400)]
Merge pull request #23200 from eileenmcnaughton/unused
Remove unused function
Monish Deb [Thu, 14 Apr 2022 08:20:50 +0000 (13:50 +0530)]
Merge pull request #23157 from eileenmcnaughton/anet
Minor readability improvement
Eileen McNaughton [Thu, 14 Apr 2022 06:42:43 +0000 (18:42 +1200)]
Merge pull request #23203 from civicrm/5.49
5.49 to master
Eileen McNaughton [Thu, 14 Apr 2022 06:41:46 +0000 (18:41 +1200)]
Merge pull request #23177 from JMAConsulting/booleanFields_1
(REF) Schema - Correct boolean fields in various tables
Seamus Lee [Thu, 14 Apr 2022 06:22:02 +0000 (16:22 +1000)]
Merge pull request #23201 from civicrm/5.49
5.49
Eileen McNaughton [Thu, 14 Apr 2022 05:12:50 +0000 (17:12 +1200)]
Merge pull request #23197 from seamuslee001/5.49
[REF] Regenerate civicrm_generated data
Eileen McNaughton [Thu, 14 Apr 2022 05:10:14 +0000 (17:10 +1200)]
Remove unused function
Monish Deb [Sat, 9 Apr 2022 02:05:54 +0000 (07:35 +0530)]
revert Menu.is_public requiredness
Monish Deb [Thu, 14 Apr 2022 04:20:53 +0000 (09:50 +0530)]
Merge pull request #23158 from eileenmcnaughton/fail
[REF] Extract getContributionRecurID
Monish Deb [Thu, 14 Apr 2022 04:10:13 +0000 (09:40 +0530)]
Merge pull request #22571 from eileenmcnaughton/trxn
Improve financial trxn spec to require required fields
Eileen McNaughton [Thu, 14 Apr 2022 04:03:44 +0000 (16:03 +1200)]
Merge pull request #23196 from civicrm/5.49
5.49 to master
Eileen McNaughton [Thu, 14 Apr 2022 03:46:02 +0000 (15:46 +1200)]
Move 5.49 update to beta
Seamus Lee [Thu, 14 Apr 2022 03:31:33 +0000 (13:31 +1000)]
[REF] Regenerate civicrm_generated data
Seamus Lee [Thu, 14 Apr 2022 03:24:39 +0000 (13:24 +1000)]
Merge pull request #23192 from eileenmcnaughton/549
Fix FiveFortyNine is_public to default to 0
Eileen McNaughton [Thu, 14 Apr 2022 02:30:23 +0000 (14:30 +1200)]
Merge pull request #23189 from alifrumin/rn5.49
[NFC] First Pass at Release notes for 5.49
Eileen McNaughton [Thu, 14 Apr 2022 01:41:44 +0000 (13:41 +1200)]
Remove unused parameter from private function
Eileen McNaughton [Thu, 14 Apr 2022 01:24:22 +0000 (13:24 +1200)]
Merge pull request #23191 from twomice/3164_report_show_filter_criteria_zero
dev/core#3164 : Report Filter Statistics don't show filters with vaue of "0"
Eileen McNaughton [Wed, 19 Jan 2022 04:20:39 +0000 (17:20 +1300)]
Improve financial trxn spec to require required fields
It turns out the apiv4 conformance test only passes because it
is bypassing the BAO create method - which requires more parameters
Not this will fail :-( because it messes with the test expectations
- I don't know how to create complex valid test data for it though....
I guess we could create a contribution & pass it as entity_id
Alice Frumin [Wed, 13 Apr 2022 01:16:15 +0000 (21:16 -0400)]
[NFC] 5.49 release notes first pass
Eileen McNaughton [Wed, 13 Apr 2022 23:50:53 +0000 (11:50 +1200)]
Fix FiveFortyNine is_public to default to 0
Allen Shaw [Wed, 13 Apr 2022 23:24:21 +0000 (18:24 -0500)]
dev/core#3164 : Report Filter Statistics don't show filters with value of "0"
Eileen McNaughton [Wed, 13 Apr 2022 21:10:09 +0000 (09:10 +1200)]
Merge pull request #23139 from kurund/group-subscription-confirmation-email
send group subscription welcome email only if template is enabled
demeritcowboy [Wed, 13 Apr 2022 18:09:31 +0000 (14:09 -0400)]
Merge pull request #23188 from colemanw/jsFix
Cleanup crmMailing/Templates.js
Coleman Watts [Wed, 13 Apr 2022 16:01:59 +0000 (12:01 -0400)]
Cleanup crmMailing/Templates.js
colemanw [Wed, 13 Apr 2022 02:27:42 +0000 (22:27 -0400)]
Merge pull request #23180 from eileenmcnaughton/csv
dev/core#3172 Update phpleague/csv from 9.2 to 9.6 (supports php 8)
Tim Otten [Wed, 13 Apr 2022 00:21:03 +0000 (17:21 -0700)]
Backdrop - Stop running CliRunnerTest on php80+drush
There seems to be a problem in using `drush ev` with our current versions of Drush / Backdrop / PHP 8.0
```
[bknix-edge:~/bknix/build/bcmaster/web/modules/civicrm] drush ev 'echo 123;'
PDOException: SQLSTATE[HY093]: Invalid parameter number: number of bound variables does not match number of tokens: SELECT name FROM {system} WHERE type='module' AND status=1; Array
(
[:type] => module
[:status] => 1
)
in drush_db_select() (line 131 of phar:///Users/totten/bknix/extern/drush8.phar/includes/dbtng.inc).
Drush command terminated abnormally due to an unrecoverable error.
```
The problem is not specific to the functionality `civicrm-core.git` -- it
affects anything going through `drush-backdrop` and seems to be blocked on
upstream fixes. But it's been generating a bunch of red-dot noise for the
past few months, and there's no point in that.
Note that `CliRunnerTest` still provides coverage for several adjacent combinations, so I'm not
too concerned about substantive change affecting civicrm-core. Those adjacent combinations are:
* PHP80 + D7 + Drush (differ only by CMS)
* PHP80 + Backdrop + Cv (differ only by CLI-runner)
* PHP7x + Bacdkrop + Drush (differ only by PHP-version)
colemanw [Wed, 13 Apr 2022 00:24:37 +0000 (20:24 -0400)]
Merge pull request #23172 from eileenmcnaughton/import_most
Further simplify variable retrieval
Eileen McNaughton [Tue, 12 Apr 2022 23:50:31 +0000 (11:50 +1200)]
Merge pull request #23181 from civicrm/5.49
5.49 to master
Eileen McNaughton [Tue, 12 Apr 2022 23:50:08 +0000 (11:50 +1200)]
Merge pull request #23179 from totten/5.49-grant-entities
(dev/core#3161) CiviGrant - Cleanup managed entities (5.49-rc)
Eileen McNaughton [Tue, 12 Apr 2022 23:35:45 +0000 (11:35 +1200)]
dev/core#3172 Update phpleague/csv from 9.2 to 9.6 (supports php 8)