Coleman Watts [Tue, 9 Apr 2019 01:08:59 +0000 (21:08 -0400)]
colorTest
Tim Otten [Tue, 9 Apr 2019 01:05:16 +0000 (18:05 -0700)]
Merge pull request #13996 from colemanw/menuColor
Configurable menubar color
Tim Otten [Mon, 8 Apr 2019 23:20:36 +0000 (16:20 -0700)]
Pass menubar preference as a param. Simplify cache mechanics. (#8)
Ex: If an admin uses an API call (CLI/REST) to change the menubar color,
then they don't need to follow-up with a cache-clear. The new setting just
goes live.
Ex: If a customization (via `civicrm.settings.php` or via extension) decides
on the color scheme programmatically (e.g. per-domain or per-role or
per-user-preference), then they don't need to clear cache. Multiple color
schemes can coexist.
Seamus Lee [Mon, 8 Apr 2019 23:19:39 +0000 (09:19 +1000)]
Merge pull request #14003 from seamuslee001/sl_fix_4_7_31_upgrade
Fix 4.7.31 Upgrade in multilingual mode
Seamus Lee [Mon, 8 Apr 2019 21:56:01 +0000 (07:56 +1000)]
Fix 4.7.31 Upgrade in multilingual mode
Coleman Watts [Mon, 8 Apr 2019 01:05:14 +0000 (21:05 -0400)]
Configurable menubar color
Seamus Lee [Mon, 8 Apr 2019 04:12:36 +0000 (14:12 +1000)]
Merge pull request #13998 from demeritcowboy/fix-formRule
PHP warnings on Case Dashboard and Find Cases
Coleman Watts [Sun, 7 Apr 2019 15:13:47 +0000 (11:13 -0400)]
Use asset-builder to render menubar css
colemanw [Mon, 8 Apr 2019 03:25:52 +0000 (23:25 -0400)]
Merge pull request #13999 from eileenmcnaughton/recur_fn
Add unit test for api ContributionRecur.cancel, add support for cancel_reason
eileen [Mon, 8 Apr 2019 02:32:51 +0000 (14:32 +1200)]
Add unit test for api ContributionRecur.cancel, add support for cancel_reason
DemeritCowboy [Mon, 8 Apr 2019 02:31:36 +0000 (22:31 -0400)]
fix formRule signature
Seamus Lee [Sun, 7 Apr 2019 23:38:19 +0000 (09:38 +1000)]
Merge pull request #13992 from seamuslee001/member_node_import_logging_price
(NFC) Update CRM/Member CRM/Note CRM/Logging CRM/Import and CRM/Price…
Seamus Lee [Sun, 7 Apr 2019 23:34:15 +0000 (09:34 +1000)]
Merge pull request #13991 from eileenmcnaughton/noisy_guzzle
dev/core#855 Fix guzzle noisiness
Seamus Lee [Sun, 7 Apr 2019 23:04:18 +0000 (09:04 +1000)]
Merge pull request #13990 from seamuslee001/admin_activity_batch_new_coder
(NFC) Update CRM/Activity CRM/Admin and CRM/Batch folders to be the f…
Seamus Lee [Sun, 7 Apr 2019 21:45:09 +0000 (07:45 +1000)]
(NFC) Update CRM/Member CRM/Note CRM/Logging CRM/Import and CRM/Price folders to be a future coder standard
eileen [Sun, 7 Apr 2019 21:33:02 +0000 (09:33 +1200)]
Fix guzzle noisiness
There is no reason to echo the failure here
Seamus Lee [Sun, 7 Apr 2019 21:24:06 +0000 (07:24 +1000)]
(NFC) Update CRM/Activity CRM/Admin and CRM/Batch folders to be the future coder standard
Eileen McNaughton [Sun, 7 Apr 2019 20:48:03 +0000 (08:48 +1200)]
Merge pull request #13987 from seamuslee001/new_coder_pcp_pledge_profile_queue_report
(NFC) Update coding style in PCP, Pledge, Profile, Queue, Report folders
Eileen McNaughton [Sun, 7 Apr 2019 20:47:21 +0000 (08:47 +1200)]
Merge pull request #13986 from seamuslee001/coder_upgrade_uf_tag_sms
(NFC) Update CRM/SMS/ CRM/UF/ CRM/Upgrade/ CRM/Tag/ to be up to speed…
Eileen McNaughton [Sun, 7 Apr 2019 20:46:44 +0000 (08:46 +1200)]
Merge pull request #13985 from seamuslee001/new_coder_crm_utils
(NFC) Bring CRM/Utils folder up to future coder standards
Eileen McNaughton [Sun, 7 Apr 2019 20:32:46 +0000 (08:32 +1200)]
Merge pull request #13988 from seamuslee001/coder_upgrade_dao_files
(NFC) Set _log and _tableName variables to be public
Seamus Lee [Sun, 7 Apr 2019 03:44:57 +0000 (13:44 +1000)]
(NFC) Update coding style in PCP, Pledge, Profile, Queue, Report folders
Seamus Lee [Sun, 7 Apr 2019 01:22:19 +0000 (11:22 +1000)]
(NFC) Bring CRM/Utils folder up to future coder standards
Seamus Lee [Sun, 7 Apr 2019 03:02:06 +0000 (13:02 +1000)]
Merge pull request #13983 from seamuslee001/new_coder_tests
Update Unit test styling to cover the future coder version
Tim Otten [Sat, 6 Apr 2019 23:07:30 +0000 (16:07 -0700)]
(NFC) tests/ - Cleanup phpcbf oddities
Seamus Lee [Sun, 7 Apr 2019 01:54:08 +0000 (11:54 +1000)]
(NFC) Set _log and _table_name variables to be public
Seamus Lee [Sun, 7 Apr 2019 01:31:17 +0000 (11:31 +1000)]
(NFC) Update CRM/SMS/ CRM/UF/ CRM/Upgrade/ CRM/Tag/ to be up to speed with the new coder standard
Seamus Lee [Sat, 6 Apr 2019 22:14:21 +0000 (08:14 +1000)]
Update Unit test styling to cover the future coder version
Seamus Lee [Sun, 7 Apr 2019 00:46:02 +0000 (10:46 +1000)]
Merge pull request #13984 from seamuslee001/nfc_comment_fix_ang
(NFC) Fix location of comment to match future coder version
Seamus Lee [Sat, 6 Apr 2019 22:30:20 +0000 (08:30 +1000)]
Fix location of comment to match future coder version
Eileen McNaughton [Sat, 6 Apr 2019 22:51:58 +0000 (10:51 +1200)]
Merge pull request #13980 from seamuslee001/new_coder_style_check_api
(NFC) Bring up API folder to style of future coder checker
Tim Otten [Sat, 6 Apr 2019 18:17:25 +0000 (11:17 -0700)]
Merge pull request #13982 from colemanw/then
Encourage developers to use .then instead of .done
colemanw [Sat, 6 Apr 2019 12:12:21 +0000 (08:12 -0400)]
Merge pull request #13981 from seamuslee001/new_coder_civi
(NFC) Upgrade Civi Folder to the new coder version
Seamus Lee [Sat, 6 Apr 2019 04:50:26 +0000 (15:50 +1100)]
(NFC) Bring up API folder to style of future coder checker
Coleman Watts [Sat, 6 Apr 2019 11:55:14 +0000 (07:55 -0400)]
Encourage developers to use .then instead of .done
jQuery promises have both methods which (if only passing one argument) are
interchangeable. But native js promises do not have a .done method, so let's
start getting our code more future-proof.
Seamus Lee [Sat, 6 Apr 2019 05:12:54 +0000 (16:12 +1100)]
(NFC) Upgrade Civi Folder to the new coder version
Seamus Lee [Sat, 6 Apr 2019 03:52:28 +0000 (14:52 +1100)]
Merge pull request #13979 from totten/master-phpcbf-2
(NFC) Update various files to pass future civicrm/coder ruleset
Tim Otten [Sat, 6 Apr 2019 02:09:43 +0000 (19:09 -0700)]
Merge pull request #13978 from totten/master-phpcbf
(NFC) Update various files to pass current phpcs
Tim Otten [Fri, 5 Apr 2019 21:27:21 +0000 (14:27 -0700)]
(NFC) Apply upcoming civicrm/coder policies (batch 2)
Method:
* Checkout latest merged branch of civicrm/coder (`8.x-2.x-civi`)
* Run this command to autoclean a batch of 100 files
`PG=2 SIZE=100 ; find Civi/ CRM/ api/ bin/ extern/ tests/ -name '*.php' | grep -v /examples/ | grep -v /DAO/ | sort | head -n $(( $PG * $SIZE )) | tail -n $SIZE | xargs phpcbf-civi`
* Go through the diff. For anything that looks wonky, open in an editor and find a better solution.
Note: The automated checker makes good points about awkward indentation, but the automated cleanup often makes it
worse. So that's why I have to open it up.
Tim Otten [Fri, 5 Apr 2019 21:09:59 +0000 (14:09 -0700)]
Merge pull request #13973 from eileenmcnaughton/array_format6
[NFC] Reformat tricksy file CRM_Mailing_BAO_Mailing
Tim Otten [Fri, 5 Apr 2019 21:04:17 +0000 (14:04 -0700)]
(NFC) Apply upcoming civicrm/coder policies (batch 1)
Method:
* Checkout latest merged branch of civicrm/coder (`8.x-2.x-civi`)
* Run this command to autoclean a batch of 100 files
`PG=1 SIZE=100 ; find Civi/ CRM/ api/ bin/ extern/ tests/ -name '*.php' | grep -v /examples/ | grep -v /DAO/ | sort | head -n $(( $PG * $SIZE )) | tail -n $SIZE | xargs phpcbf-civi`
* Go through the diff. For anything that looks wonky, open in an editor and find a better solution
Note: The automated checker makes good points about awkward indentation, but the automated cleanup often makes it
worse. So that's why I have to open it up.
Tim Otten [Fri, 5 Apr 2019 20:46:10 +0000 (13:46 -0700)]
(NFC) Various updates for future version of civicrm/coder
Tim Otten [Fri, 5 Apr 2019 20:24:53 +0000 (13:24 -0700)]
(NFC) Update to pass new phpcs
Tim Otten [Fri, 5 Apr 2019 20:16:23 +0000 (13:16 -0700)]
(NFC) tests/ - Update to pass new phpcs
Tim Otten [Fri, 5 Apr 2019 20:13:25 +0000 (13:13 -0700)]
(NFC) api/v3 - Update to pass new phpcs
Tim Otten [Fri, 5 Apr 2019 20:11:11 +0000 (13:11 -0700)]
(NFC) CRM/ - Update to pass new phpcs
Tim Otten [Fri, 5 Apr 2019 20:04:21 +0000 (13:04 -0700)]
(NFC) Civi/ - Update to pass new phpcs
eileen [Fri, 5 Apr 2019 06:50:42 +0000 (19:50 +1300)]
[NFC] Reformat tricksy file CRM_Mailing_BAO_Mailing
colemanw [Fri, 5 Apr 2019 17:00:15 +0000 (13:00 -0400)]
Merge pull request #13974 from eileenmcnaughton/array_format7
[NFC] Reformat tricksy file CRM/Contribute/Import/Form/MapField
eileen [Fri, 5 Apr 2019 06:59:19 +0000 (19:59 +1300)]
[NFC] Reformat tricksy file CRM/Contribute/Import/Form/MapField
colemanw [Fri, 5 Apr 2019 12:41:50 +0000 (08:41 -0400)]
Merge pull request #13969 from eileenmcnaughton/array_format2
[NFC] short array syntax Autoformat - just the tricksy bits of CRM/Activity
colemanw [Fri, 5 Apr 2019 12:40:44 +0000 (08:40 -0400)]
Merge pull request #13970 from eileenmcnaughton/array_format_3
[NFC] array format tricksie file CRM/Admin/Form/MessageTemplates
colemanw [Fri, 5 Apr 2019 12:40:11 +0000 (08:40 -0400)]
Merge pull request #13971 from eileenmcnaughton/array_format_4
[NFC] array format tricksie file CRM_Utils_Rest
colemanw [Fri, 5 Apr 2019 12:38:38 +0000 (08:38 -0400)]
Merge pull request #13972 from eileenmcnaughton/array_format_5
[NFC] array formatting tricksy tricksie file (another CRM/UF/Form/Group.php)
colemanw [Fri, 5 Apr 2019 12:36:44 +0000 (08:36 -0400)]
Merge pull request #13968 from eileenmcnaughton/array_format
[NFC] short array syntax Autoformat - just CRM/ACL dir
Eileen McNaughton [Fri, 5 Apr 2019 11:23:09 +0000 (00:23 +1300)]
Merge pull request #13915 from colemanw/shortCRM
[NFC] Short array syntax - auto-format CRM directory
Coleman Watts [Fri, 29 Mar 2019 18:33:40 +0000 (14:33 -0400)]
Short array syntax - auto-format CRM directory
eileen [Fri, 5 Apr 2019 06:41:22 +0000 (19:41 +1300)]
[NFC] array formatting tricksy tricksie file (another)
eileen [Fri, 5 Apr 2019 06:28:11 +0000 (19:28 +1300)]
[NFC] array formatting tricksy tricksie file
eileen [Fri, 5 Apr 2019 05:46:09 +0000 (18:46 +1300)]
[NFC] array format tricksie file
eileen [Fri, 5 Apr 2019 04:48:30 +0000 (17:48 +1300)]
Array syntax reformat on activity files
eileen [Fri, 5 Apr 2019 04:21:19 +0000 (17:21 +1300)]
Autoformat - just CRM/ACL dir
Eileen McNaughton [Fri, 5 Apr 2019 04:19:08 +0000 (17:19 +1300)]
Merge pull request #13967 from eileenmcnaughton/activity_token
[REF] extract token functions
Eileen McNaughton [Fri, 5 Apr 2019 04:18:07 +0000 (17:18 +1300)]
Merge pull request #13964 from eileenmcnaughton/test
Improve data when known time-dependent-failing test fails
Eileen McNaughton [Fri, 5 Apr 2019 04:17:05 +0000 (17:17 +1300)]
Merge pull request #13965 from eileenmcnaughton/member_test
Remove reference to non-iso date format from membership form tests
eileen [Fri, 5 Apr 2019 03:13:51 +0000 (16:13 +1300)]
[REF] extract token functions
This is an reviewer's commit from https://github.com/civicrm/civicrm-core/pull/12012/files
We are about to merge array formatting changes that will make lots of PRs go stale.
I couldn't get this reviewed & merged before the change but I thought if I could do it
through a sub-commit it would be better than just making it go stale.
This is a simple extraction & I will add merge on pass as it is a reviewer's commit
eileen [Fri, 5 Apr 2019 02:51:37 +0000 (15:51 +1300)]
Remove reference to non-iso date format from membership form tests
The date format wrangling is not handled by datepicker on the js layer so the php
layer no longer needs to test for this
colemanw [Fri, 5 Apr 2019 02:27:03 +0000 (22:27 -0400)]
Merge pull request #13961 from eileenmcnaughton/validate
Allow extensions to enable validate.tpl
Eileen McNaughton [Fri, 5 Apr 2019 02:15:00 +0000 (15:15 +1300)]
Merge pull request #13962 from eileenmcnaughton/test_fix_recur
Flush ContributionRecur static cache when flushing processors
eileen [Fri, 5 Apr 2019 01:38:50 +0000 (14:38 +1300)]
Improve data when known time-dependent-failing test fails
eileen [Fri, 5 Apr 2019 00:40:11 +0000 (13:40 +1300)]
Flush ContributionRecur static cache when flushing processors
When creating a processor in a unit test it may not be available to use when creating
a recurring in the same test without flushing the static cache here
Matthew Wire [Thu, 4 Apr 2019 23:23:07 +0000 (00:23 +0100)]
Merge pull request #13935 from eileenmcnaughton/recur_cancel_load
dev/core#704 Fix loss of links for recurrings with no payment_processor_id
eileen [Thu, 4 Apr 2019 23:10:45 +0000 (12:10 +1300)]
Allow payment processors to enable validate.tpl
From https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/106
I found that I couldn't enable our validation from the payment processor currently.
It's a bit immature in that our front end presentation is poor,but this allows us to
start improving that
Eileen McNaughton [Thu, 4 Apr 2019 22:55:10 +0000 (11:55 +1300)]
Merge pull request #13699 from mattwire/contributionrecur_report_by_payment_processor_id
Add payment_processor column/filter to recurring contribution report
Eileen McNaughton [Thu, 4 Apr 2019 22:43:59 +0000 (11:43 +1300)]
Merge pull request #13960 from eileenmcnaughton/master
Grammar fixes
Eileen McNaughton [Thu, 4 Apr 2019 22:43:40 +0000 (11:43 +1300)]
Merge pull request #13957 from mattwire/extract_assignpaymentfields
Extract assignPaymentFields
Eileen McNaughton [Thu, 4 Apr 2019 22:38:08 +0000 (11:38 +1300)]
Merge pull request #13899 from eileenmcnaughton/line_item
Move code to assign tax information into shared parent
eileen [Wed, 27 Mar 2019 06:23:28 +0000 (19:23 +1300)]
Move code to assign tax information into shared parent
eileen [Thu, 4 Apr 2019 21:28:12 +0000 (10:28 +1300)]
Grammar fixes
Eileen McNaughton [Thu, 4 Apr 2019 21:22:33 +0000 (10:22 +1300)]
Merge pull request #13944 from agileware/CIVICRM-1140
Added a DB check to prevent deleting exisiting CiviCRM data from database.
Eileen McNaughton [Thu, 4 Apr 2019 21:19:52 +0000 (10:19 +1300)]
Merge pull request #13950 from seamuslee001/convert_receive_renewal_date_membership
Convert receive_date and renewal_date on membership forms to use date…
Eileen McNaughton [Thu, 4 Apr 2019 20:43:13 +0000 (09:43 +1300)]
Merge pull request #13955 from colemanw/Promise
Promise Polyfill for older browsers
Eileen McNaughton [Thu, 4 Apr 2019 19:29:29 +0000 (08:29 +1300)]
Merge pull request #13906 from agh1/whygroupcontribamt
dev/core#655 Don't sum on the contribution total_amount in contribution detail report
Eileen McNaughton [Thu, 4 Apr 2019 19:24:20 +0000 (08:24 +1300)]
Merge pull request #13762 from mattwire/event_register_thankyou_region
Add billingblock region to event registration thankyou to match contribution thankyou
Coleman Watts [Thu, 4 Apr 2019 01:52:15 +0000 (21:52 -0400)]
Promise Polyfill for older browsers
Matthew Wire [Thu, 4 Apr 2019 12:34:13 +0000 (13:34 +0100)]
Merge pull request #13953 from eileenmcnaughton/pay_api
Add minimal PaymentProcessor.pay api
Matthew Wire [Thu, 4 Apr 2019 10:34:38 +0000 (11:34 +0100)]
Merge pull request #13946 from agileware/CIVICRM-1163
Replaced get_headers functions call with Guzzle HTTP request.
Matthew Wire (MJW Consulting) [Thu, 4 Apr 2019 10:05:21 +0000 (11:05 +0100)]
Extract assignPaymentFields
Alok Patel [Thu, 4 Apr 2019 08:28:09 +0000 (13:58 +0530)]
Updated the timeout to 500ms.
Seamus Lee [Thu, 4 Apr 2019 06:16:58 +0000 (17:16 +1100)]
Fix tests and ensure that receive_date is always set
Eileen McNaughton [Thu, 4 Apr 2019 03:15:30 +0000 (16:15 +1300)]
Merge pull request #13952 from eileenmcnaughton/refund
dev/financial#38 : Support refund payment using payment processor
Eileen McNaughton [Thu, 4 Apr 2019 03:15:10 +0000 (16:15 +1300)]
Merge pull request #13954 from eileenmcnaughton/payment_processor_title
dev/financial#2 add PaymentProcessor.title field
Seamus Lee [Thu, 4 Apr 2019 00:07:29 +0000 (11:07 +1100)]
Convert recieve_date and renewal_date on membership forms to use datepicker rather than jcalendar
Alok Patel [Thu, 4 Apr 2019 03:02:09 +0000 (08:32 +0530)]
CIVICRM-1163: Replaced get_headers functions call with Guzzle HTTP request.
eileen [Thu, 4 Apr 2019 01:06:29 +0000 (14:06 +1300)]
Add basic Pay api
eileen [Thu, 4 Apr 2019 01:39:17 +0000 (14:39 +1300)]
dev/financial#2 add PaymentProcessor.title field
There was a long discussion a while back about adding a label or title field to the
civicrm_payment_processor table. It kinda died but since 5.13 adds another field
(contribution_recur.cancel_reason) which is kinda rare I thought we should probably
add this field in the same release as we can better keep most releases to no
schema changes that way.
At this stage the field is not in use - but I figure getting it added will make the
next steps of exposing it easier & there is general agreement we need
something of this nature.
(the cancel reason field will also take further commits to expose in the UI)
Monish Deb [Fri, 8 Mar 2019 12:48:33 +0000 (18:18 +0530)]
dev/financial#38 : Support refund payment using payment processor
Seamus Lee [Thu, 4 Apr 2019 00:51:53 +0000 (11:51 +1100)]
Merge pull request #13940 from eileenmcnaughton/recur_form
Rationalise url variables onto shared parent for recurring contribution forms
Eileen McNaughton [Thu, 4 Apr 2019 00:38:12 +0000 (13:38 +1300)]
Merge pull request #13435 from agileware/GREENS-199
Optimise the loading of the CiviCRM Deduplication Exception page
Eileen McNaughton [Thu, 4 Apr 2019 00:16:03 +0000 (13:16 +1300)]
Merge pull request #13934 from seamuslee001/unfork_zeta_components
Unfork Zetacomponents mail and use patch to apply differences