civicrm-core.git
11 months agoMerge pull request #28776 from eileenmcnaughton/submit
Yashodha Chaku [Fri, 29 Dec 2023 17:22:46 +0000 (22:52 +0530)]
Merge pull request #28776 from eileenmcnaughton/submit

Remove api annotation from getSubmittableFields()

11 months agoMerge pull request #28809 from civicrm/5.69
Eileen McNaughton [Fri, 29 Dec 2023 03:44:16 +0000 (16:44 +1300)]
Merge pull request #28809 from civicrm/5.69

5.69 to master

11 months agoMerge pull request #28807 from alifrumin/5.69rn
Eileen McNaughton [Fri, 29 Dec 2023 03:43:50 +0000 (16:43 +1300)]
Merge pull request #28807 from alifrumin/5.69rn

[NFC] 5.69 Release Notes first pass

11 months agoMerge pull request #28804 from eileenmcnaughton/regen
demeritcowboy [Fri, 29 Dec 2023 00:28:13 +0000 (19:28 -0500)]
Merge pull request #28804 from eileenmcnaughton/regen

Update regen for event message template

11 months ago[NFC] 5.69 release notes first pass
Alice Frumin [Tue, 12 Dec 2023 19:33:06 +0000 (14:33 -0500)]
[NFC] 5.69 release notes first pass

11 months agoMerge pull request #28803 from eileenmcnaughton/notice
demeritcowboy [Thu, 28 Dec 2023 18:49:24 +0000 (13:49 -0500)]
Merge pull request #28803 from eileenmcnaughton/notice

E-notice fix in membership workflow examples

11 months agoMerge pull request #28798 from eileenmcnaughton/date_test
demeritcowboy [Thu, 28 Dec 2023 18:48:23 +0000 (13:48 -0500)]
Merge pull request #28798 from eileenmcnaughton/date_test

NFC Superficial cleanup in test class

11 months agoMerge pull request #28805 from eileenmcnaughton/code_notes
demeritcowboy [Thu, 28 Dec 2023 18:46:29 +0000 (13:46 -0500)]
Merge pull request #28805 from eileenmcnaughton/code_notes

[NFC] Add todos to the invoice code

11 months agoAdd todos to the invoice code
Eileen McNaughton [Wed, 13 Dec 2023 05:17:40 +0000 (18:17 +1300)]
Add todos to the invoice code

This helps clarify that most of this code is slated for removal
in order to make the forms non-form-dependent

11 months agoUpdate regen for event message template
Eileen McNaughton [Thu, 28 Dec 2023 05:15:42 +0000 (18:15 +1300)]
Update regen for event message template

11 months agoMerge pull request #28801 from eileenmcnaughton/fork/mapping-edit-button-fix
Eileen McNaughton [Thu, 28 Dec 2023 03:43:33 +0000 (16:43 +1300)]
Merge pull request #28801 from eileenmcnaughton/fork/mapping-edit-button-fix

Fix edit button for 'Import/Export Mapping'

11 months agoE-notice fix in membership workflow examples
eileen [Thu, 28 Dec 2023 03:13:32 +0000 (16:13 +1300)]
E-notice fix in membership workflow examples

11 months agoFix edit button for 'Import/Export Mapping'
19ATF72 [Wed, 6 Dec 2023 00:05:16 +0000 (16:05 -0800)]
Fix edit button for 'Import/Export Mapping'

11 months agoNFC Superficial cleanup in test class
eileen [Thu, 28 Dec 2023 00:02:57 +0000 (13:02 +1300)]
NFC Superficial cleanup in test class

11 months agoMerge pull request #28797 from eileenmcnaughton/nfc
demeritcowboy [Wed, 27 Dec 2023 23:11:19 +0000 (18:11 -0500)]
Merge pull request #28797 from eileenmcnaughton/nfc

[NFC] Superficial cleanup

11 months ago[NFC] Superficial cleanup
eileen [Wed, 27 Dec 2023 21:13:35 +0000 (10:13 +1300)]
[NFC] Superficial cleanup

11 months agoMerge pull request #28788 from eileenmcnaughton/assign
Yashodha Chaku [Wed, 27 Dec 2023 08:36:25 +0000 (14:06 +0530)]
Merge pull request #28788 from eileenmcnaughton/assign

Fix codeGen assign to do what it says on the box

11 months agoMerge pull request #28738 from mlutfy/maxSpin
colemanw [Wed, 27 Dec 2023 00:42:33 +0000 (19:42 -0500)]
Merge pull request #28738 from mlutfy/maxSpin

menubar spin: stop after 10 seconds

11 months agoMerge pull request #28794 from demeritcowboy/del
colemanw [Wed, 27 Dec 2023 00:40:57 +0000 (19:40 -0500)]
Merge pull request #28794 from demeritcowboy/del

update deleted files list

11 months agodeleted files list
demeritcowboy [Tue, 26 Dec 2023 16:06:53 +0000 (11:06 -0500)]
deleted files list

11 months agoMerge pull request #28793 from civicrm/5.69
demeritcowboy [Tue, 26 Dec 2023 16:52:27 +0000 (11:52 -0500)]
Merge pull request #28793 from civicrm/5.69

5.69

11 months agoMerge pull request #28781 from vingle/5.69-ux-regressions
demeritcowboy [Tue, 26 Dec 2023 16:03:41 +0000 (11:03 -0500)]
Merge pull request #28781 from vingle/5.69-ux-regressions

Fixes two small accordion UX regressions

11 months agoMerge pull request #28673 from bb/migrate-snappy-to-composer
demeritcowboy [Tue, 26 Dec 2023 15:58:57 +0000 (10:58 -0500)]
Merge pull request #28673 from bb/migrate-snappy-to-composer

Migrate Snappy to composer

11 months agoMerge pull request #28792 from civicrm/5.69
Eileen McNaughton [Tue, 26 Dec 2023 00:09:45 +0000 (13:09 +1300)]
Merge pull request #28792 from civicrm/5.69

5.69 to master

11 months agoMerge pull request #28791 from eileenmcnaughton/569
Eileen McNaughton [Tue, 26 Dec 2023 00:08:42 +0000 (13:08 +1300)]
Merge pull request #28791 from eileenmcnaughton/569

Fix typo in smarty compatibility class

11 months agoMerge pull request #28782 from mlutfy/extList
colemanw [Mon, 25 Dec 2023 00:30:57 +0000 (19:30 -0500)]
Merge pull request #28782 from mlutfy/extList

Manage Extensions: hide the type/module column

11 months agoManage Extensions: hide the type/module column
Mathieu Lu [Fri, 22 Dec 2023 19:45:47 +0000 (14:45 -0500)]
Manage Extensions: hide the type/module column

11 months agoFix typo in smarty compatibility class
Eileen McNaughton [Sun, 24 Dec 2023 04:21:14 +0000 (17:21 +1300)]
Fix typo in smarty compatibility class

11 months agoMerge pull request #28790 from eileenmcnaughton/str_contains
demeritcowboy [Sun, 24 Dec 2023 03:18:55 +0000 (22:18 -0500)]
Merge pull request #28790 from eileenmcnaughton/str_contains

Remove str_contains from civicrm.settings template

11 months agoMerge pull request #28787 from eileenmcnaughton/get_template_vars
colemanw [Sun, 24 Dec 2023 00:41:05 +0000 (19:41 -0500)]
Merge pull request #28787 from eileenmcnaughton/get_template_vars

Standardise `getTemplateVars()`

11 months agoRemove str_contains from civicrm.settings template
Eileen McNaughton [Sat, 23 Dec 2023 23:44:27 +0000 (12:44 +1300)]
Remove str_contains from civicrm.settings template

11 months agoFix codeGen assign to do what it says on the box
Eileen McNaughton [Sat, 23 Dec 2023 21:07:22 +0000 (10:07 +1300)]
Fix codeGen assign to do what it says on the box

11 months agoStandardise getTemplateVars()
Eileen McNaughton [Sat, 23 Dec 2023 20:55:43 +0000 (09:55 +1300)]
Standardise getTemplateVars()

11 months agoMerge pull request #28785 from MegaphoneJon/delete-grant-false-error
Eileen McNaughton [Sat, 23 Dec 2023 00:58:55 +0000 (13:58 +1300)]
Merge pull request #28785 from MegaphoneJon/delete-grant-false-error

remove incorrect message that grant could not be deleted

11 months agoremove incorrect message that grant could not be deleted
Jon Goldberg [Fri, 22 Dec 2023 23:15:52 +0000 (18:15 -0500)]
remove incorrect message that grant could not be deleted

11 months agoMerge pull request #28780 from eileenmcnaughton/mut
colemanw [Fri, 22 Dec 2023 21:54:45 +0000 (16:54 -0500)]
Merge pull request #28780 from eileenmcnaughton/mut

Compiance with php8 & Marvel9

11 months agoCompiance with php8 & Marvel9
Eileen McNaughton [Fri, 22 Dec 2023 10:33:27 +0000 (23:33 +1300)]
Compiance with php8 & Marvel9

11 months agoMerge pull request #28771 from eileenmcnaughton/blt_cms
colemanw [Fri, 22 Dec 2023 16:11:01 +0000 (11:11 -0500)]
Merge pull request #28771 from eileenmcnaughton/blt_cms

Remove checks to bltID in cms classes

11 months agoMerge pull request #28770 from eileenmcnaughton/blt
colemanw [Fri, 22 Dec 2023 16:06:18 +0000 (11:06 -0500)]
Merge pull request #28770 from eileenmcnaughton/blt

Stop referring to `_bltID` in AbstractEditPayment

11 months agoAdds support for fieldset
Nicol [Fri, 22 Dec 2023 13:07:48 +0000 (14:07 +0100)]
Adds support for fieldset

In this commit: https://github.com/civicrm/civicrm-core/commit/1602ec3e104de40e7bd785496f0cde323fe870ed the `display: none` was narrowed to only target divs with the class '.collapsed'. This excluded a few examples of fieldsets being used (as identified in ThemeTest, Accordion 4 - https://lab.civicrm.org/extensions/themetest/-/blob/main/ang/themetest/snippets/accordion4.html)

11 months agoKeeps search criteria fieldset closed when results found
Nicol [Fri, 22 Dec 2023 12:58:07 +0000 (13:58 +0100)]
Keeps search criteria fieldset closed when results found

Fixes search regression introduced in #28421 and identified in #28661.

11 months agoMerge pull request #28760 from eileenmcnaughton/case_dec
demeritcowboy [Fri, 22 Dec 2023 03:24:56 +0000 (22:24 -0500)]
Merge pull request #28760 from eileenmcnaughton/case_dec

Declare caseId, caseIds as public properties

11 months agoMerge pull request #28773 from eileenmcnaughton/cart_82
colemanw [Fri, 22 Dec 2023 02:53:08 +0000 (21:53 -0500)]
Merge pull request #28773 from eileenmcnaughton/cart_82

[PHP8.2] Fix test fails on event cart

11 months agoRemove api annotation from getSubmittableFields()
Eileen McNaughton [Fri, 22 Dec 2023 01:57:44 +0000 (14:57 +1300)]
Remove api annotation from getSubmittableFields()

This should either be public or api-supported. Perhaps it should be public/api but
at least for now I will resolve by removing the annotation

11 months ago[PHP8.2] Fix test fails on event cart
Eileen McNaughton [Thu, 21 Dec 2023 23:38:15 +0000 (12:38 +1300)]
[PHP8.2] Fix test fails on event cart

11 months agoStop referring to _bltID in AbstractEditPayment
Eileen McNaughton [Thu, 21 Dec 2023 23:20:17 +0000 (12:20 +1300)]
Stop referring to _bltID in AbstractEditPayment

11 months agoMerge pull request #28758 from braders/php8-smsCommonTest
Eileen McNaughton [Thu, 21 Dec 2023 23:28:12 +0000 (12:28 +1300)]
Merge pull request #28758 from braders/php8-smsCommonTest

[REF][PHP8.2] Use correct form object to ensure properties exist

11 months agoRemove checks to bltID in cms classes
Eileen McNaughton [Thu, 21 Dec 2023 23:27:49 +0000 (12:27 +1300)]
Remove checks to bltID in cms classes

11 months agoMerge pull request #28768 from eileenmcnaughton/dep_test
Eileen McNaughton [Thu, 21 Dec 2023 22:40:53 +0000 (11:40 +1300)]
Merge pull request #28768 from eileenmcnaughton/dep_test

Remove deprecated test-only function

11 months ago[REF][PHP8.2] Use correct form object to ensure properties exist
Bradley Taylor [Thu, 21 Dec 2023 19:53:45 +0000 (19:53 +0000)]
[REF][PHP8.2] Use correct form object to ensure properties exist

11 months agoMerge pull request #28764 from eileenmcnaughton/cart_form
Eileen McNaughton [Thu, 21 Dec 2023 22:33:49 +0000 (11:33 +1300)]
Merge pull request #28764 from eileenmcnaughton/cart_form

Use local variables for the billing location type ID in event cart code

11 months agoMerge pull request #28759 from braders/cancel-url
Eileen McNaughton [Thu, 21 Dec 2023 22:25:21 +0000 (11:25 +1300)]
Merge pull request #28759 from braders/cancel-url

[REF] Tidy up use of _cancelURL property

11 months agoMerge pull request #28767 from eileenmcnaughton/abstract
Eileen McNaughton [Thu, 21 Dec 2023 22:16:06 +0000 (11:16 +1300)]
Merge pull request #28767 from eileenmcnaughton/abstract

Remove bltID as a parameter from getPaymentProcessorReadyAddressParams

11 months agoMerge pull request #28456 from braders/php82-option
Eileen McNaughton [Thu, 21 Dec 2023 22:15:43 +0000 (11:15 +1300)]
Merge pull request #28456 from braders/php82-option

[REF][PHP8.2] Resolve dynamic property usage in CRM_Price_Form_Option

11 months agoMerge pull request #28739 from MegaphoneJon/contact-fields-to-remove
Eileen McNaughton [Thu, 21 Dec 2023 22:07:12 +0000 (11:07 +1300)]
Merge pull request #28739 from MegaphoneJon/contact-fields-to-remove

Unit test for fix to illegal offset error when grouping by contact in SK

11 months agoMerge pull request #28765 from eileenmcnaughton/map
Eileen McNaughton [Thu, 21 Dec 2023 22:06:45 +0000 (11:06 +1300)]
Merge pull request #28765 from eileenmcnaughton/map

Fix a few more places that pass bltID to mapParams

11 months agoMerge pull request #28761 from eileenmcnaughton/cart
Eileen McNaughton [Thu, 21 Dec 2023 21:59:36 +0000 (10:59 +1300)]
Merge pull request #28761 from eileenmcnaughton/cart

Stop setting `_bltID` on the `UpdateBilling` form

11 months agoMerge pull request #28763 from eileenmcnaughton/payment_form
Eileen McNaughton [Thu, 21 Dec 2023 21:57:55 +0000 (10:57 +1300)]
Merge pull request #28763 from eileenmcnaughton/payment_form

Use lookup not form property for BillingID in payment form class

11 months agoMerge pull request #28755 from braders/local-var-taggroup
Eileen McNaughton [Thu, 21 Dec 2023 21:15:40 +0000 (10:15 +1300)]
Merge pull request #28755 from braders/local-var-taggroup

[REF][PHP8.2] Local variable for tagGroup

11 months agoRemove deprecated test-only function
Eileen McNaughton [Thu, 21 Dec 2023 21:13:20 +0000 (10:13 +1300)]
Remove deprecated test-only function

11 months agoRemove bltID as a parameter from getPaymentProcessorReadyAddressParams
Eileen McNaughton [Thu, 21 Dec 2023 20:58:05 +0000 (09:58 +1300)]
Remove bltID as a parameter from getPaymentProcessorReadyAddressParams

11 months agoFix a few more places that pass bltID to mapParams
Eileen McNaughton [Thu, 21 Dec 2023 20:53:36 +0000 (09:53 +1300)]
Fix a few more places that pass bltID to mapParams

11 months agoStop using bltID in event cart class
Eileen McNaughton [Thu, 21 Dec 2023 20:44:58 +0000 (09:44 +1300)]
Stop using bltID in event cart class

11 months agoUse lookup not form property for BillingID in payment form class
Eileen McNaughton [Thu, 21 Dec 2023 20:42:26 +0000 (09:42 +1300)]
Use lookup not form property for BillingID in payment form class

11 months agoMerge pull request #28740 from colemanw/searchKitDisplayPresentation
colemanw [Thu, 21 Dec 2023 20:27:00 +0000 (15:27 -0500)]
Merge pull request #28740 from colemanw/searchKitDisplayPresentation

dev/user-interface#49 - Improve SearchKit admin display presentation

11 months agoMigrate Snappy to composer
Benjamin Bock [Sun, 17 Dec 2023 16:03:39 +0000 (17:03 +0100)]
Migrate Snappy to composer

11 months agoStop setting bltID on the UpdateBilling for
Eileen McNaughton [Thu, 21 Dec 2023 20:21:25 +0000 (09:21 +1300)]
Stop setting bltID on the UpdateBilling for

11 months agoMerge pull request #28273 from bb/master
demeritcowboy [Thu, 21 Dec 2023 20:17:07 +0000 (15:17 -0500)]
Merge pull request #28273 from bb/master

Add weasyprint pdf generation as alternative to wkhtmltopdf

11 months agoSearchKit - Unit test for illegal offset error when grouping by contact
Jon Goldberg [Wed, 20 Dec 2023 20:03:13 +0000 (15:03 -0500)]
SearchKit - Unit test for illegal offset error when grouping by contact

11 months agoDeclare caseId, caseIds as public properties
Eileen McNaughton [Thu, 21 Dec 2023 20:09:56 +0000 (09:09 +1300)]
Declare caseId, caseIds as public properties

11 months ago[REF] Tidy up use of _cancelURL property
Bradley Taylor [Thu, 21 Dec 2023 20:07:56 +0000 (20:07 +0000)]
[REF] Tidy up use of _cancelURL property

11 months ago[REF][PHP8.2] Resolve dynamic property usage in CRM_Price_Form_Option
Bradley Taylor [Sun, 3 Dec 2023 21:22:20 +0000 (21:22 +0000)]
[REF][PHP8.2] Resolve dynamic property usage in CRM_Price_Form_Option

11 months ago[REF][PHP8.2] Local variable for tagGroup
Bradley Taylor [Thu, 21 Dec 2023 17:29:21 +0000 (17:29 +0000)]
[REF][PHP8.2] Local variable for tagGroup

11 months agoMerge pull request #28754 from braders/feature/php8-advanced-search
Eileen McNaughton [Thu, 21 Dec 2023 19:15:33 +0000 (08:15 +1300)]
Merge pull request #28754 from braders/feature/php8-advanced-search

[REF][PHP8.2] Declare properties in advanced search form

11 months agoMerge pull request #28723 from totten/master-strict-hook
Tim Otten [Thu, 21 Dec 2023 18:54:35 +0000 (10:54 -0800)]
Merge pull request #28723 from totten/master-strict-hook

tests/events/*.php - Allow optional runtime enforcement

11 months agoMerge pull request #27685 from eileenmcnaughton/ev_tokens
colemanw [Thu, 21 Dec 2023 18:42:45 +0000 (13:42 -0500)]
Merge pull request #27685 from eileenmcnaughton/ev_tokens

Standardise some more event template tokens

11 months agoMerge pull request #28756 from braders/mailing-page-local-var
colemanw [Thu, 21 Dec 2023 18:37:50 +0000 (13:37 -0500)]
Merge pull request #28756 from braders/mailing-page-local-var

[REF][PHP8.2] Replace dynamic property with local var - mailing browse page

11 months ago[REF][PHP8.2] Replace dynamic property with local var - mailing browse
Bradley Taylor [Thu, 21 Dec 2023 17:48:07 +0000 (17:48 +0000)]
[REF][PHP8.2] Replace dynamic property with local var - mailing browse

11 months ago[REF][PHP8.2] Declare properties in advanced search form
Bradley Taylor [Thu, 21 Dec 2023 14:12:53 +0000 (14:12 +0000)]
[REF][PHP8.2] Declare properties in advanced search form

11 months agoMerge pull request #28751 from demeritcowboy/regen81
Eileen McNaughton [Thu, 21 Dec 2023 08:02:39 +0000 (21:02 +1300)]
Merge pull request #28751 from demeritcowboy/regen81

Update regen online script to use php 8.1 since this doesn't have polyfills available and now str_contains makes it fail

11 months agoMerge pull request #28752 from demeritcowboy/regen
Eileen McNaughton [Thu, 21 Dec 2023 06:51:50 +0000 (19:51 +1300)]
Merge pull request #28752 from demeritcowboy/regen

regen after 28704

11 months agoregen
demeritcowboy [Thu, 21 Dec 2023 06:07:17 +0000 (01:07 -0500)]
regen

11 months agoupdate php since this doesn't have polyfills available and now str_contains makes...
demeritcowboy [Thu, 21 Dec 2023 05:55:47 +0000 (00:55 -0500)]
update php since this doesn't have polyfills available and now str_contains makes it fail

11 months agoMerge pull request #28749 from demeritcowboy/packages-smarty3
demeritcowboy [Thu, 21 Dec 2023 05:47:14 +0000 (00:47 -0500)]
Merge pull request #28749 from demeritcowboy/packages-smarty3

Alternate to alternate packages path for smarty3

11 months agoMerge pull request #28704 from eileenmcnaughton/no_test
demeritcowboy [Thu, 21 Dec 2023 05:45:54 +0000 (00:45 -0500)]
Merge pull request #28704 from eileenmcnaughton/no_test

Remove some more text template versions

11 months agotemporary fix
demeritcowboy [Thu, 21 Dec 2023 04:46:07 +0000 (23:46 -0500)]
temporary fix

11 months agoMerge pull request #28747 from civicrm/5.69
colemanw [Thu, 21 Dec 2023 01:24:28 +0000 (20:24 -0500)]
Merge pull request #28747 from civicrm/5.69

Merge 5.69 to master

11 months agoMerge pull request #28746 from eileenmcnaughton/retreive
colemanw [Thu, 21 Dec 2023 01:09:06 +0000 (20:09 -0500)]
Merge pull request #28746 from eileenmcnaughton/retreive

Fix admin forms to not call deprecated functions

11 months agoFix admin forms to not call deprecated functions
Eileen McNaughton [Wed, 20 Dec 2023 23:42:55 +0000 (12:42 +1300)]
Fix admin forms to not call deprecated functions

11 months agoMerge pull request #28737 from colemanw/isDeletedRel
Aidan Saunders [Wed, 20 Dec 2023 23:38:01 +0000 (23:38 +0000)]
Merge pull request #28737 from colemanw/isDeletedRel

ContactSummary - Exclude deleted contacts from relationship tab

11 months agoMerge pull request #28743 from eileenmcnaughton/acl_fix
Seamus Lee [Wed, 20 Dec 2023 23:14:35 +0000 (10:14 +1100)]
Merge pull request #28743 from eileenmcnaughton/acl_fix

Fix acls in demo data

11 months agoMerge pull request #28741 from colemanw/contactTypeFix
colemanw [Wed, 20 Dec 2023 22:52:00 +0000 (17:52 -0500)]
Merge pull request #28741 from colemanw/contactTypeFix

dev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY

11 months agoFix acls
Eileen McNaughton [Wed, 20 Dec 2023 22:34:58 +0000 (11:34 +1300)]
Fix acls

11 months agoMerge pull request #28736 from demeritcowboy/check
colemanw [Wed, 20 Dec 2023 21:53:04 +0000 (16:53 -0500)]
Merge pull request #28736 from demeritcowboy/check

False positive in status check

11 months agodev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY
colemanw [Wed, 20 Dec 2023 21:36:59 +0000 (16:36 -0500)]
dev/core#4872 - Fix APIv4 error when searching contacts with GROUP BY

11 months agoSearchKit - Collapse admin display settings in details
colemanw [Wed, 20 Dec 2023 21:16:00 +0000 (16:16 -0500)]
SearchKit - Collapse admin display settings in details

11 months agoSearchKit - Improve layout of admin displays
colemanw [Wed, 20 Dec 2023 21:03:18 +0000 (16:03 -0500)]
SearchKit - Improve layout of admin displays

Collapse columns to save space.
Split addColMenu in two, allows toggling multiple columns at once.

11 months agomenubar spin: stop after 10 seconds
Mathieu Lu [Wed, 20 Dec 2023 20:04:08 +0000 (15:04 -0500)]
menubar spin: stop after 10 seconds

11 months agoContactSummary - Exclude deleted contacts from relationship tab
colemanw [Wed, 20 Dec 2023 19:14:10 +0000 (14:14 -0500)]
ContactSummary - Exclude deleted contacts from relationship tab

11 months agonot deleted
demeritcowboy [Wed, 20 Dec 2023 18:37:28 +0000 (13:37 -0500)]
not deleted