From 0524dba18c932062c431d3f337506c7ad2ca80a1 Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Fri, 5 Jan 2024 04:00:48 +0000 Subject: [PATCH] Set version to 5.70.beta1 --- deleted-files-list.json | 5 ++++- ext/afform/admin/info.xml | 4 ++-- ext/afform/core/info.xml | 4 ++-- ext/afform/html/info.xml | 4 ++-- ext/afform/mock/info.xml | 4 ++-- ext/authx/info.xml | 4 ++-- ext/civi_campaign/info.xml | 4 ++-- ext/civi_case/info.xml | 4 ++-- ext/civi_contribute/info.xml | 4 ++-- ext/civi_event/info.xml | 4 ++-- ext/civi_mail/info.xml | 4 ++-- ext/civi_member/info.xml | 4 ++-- ext/civi_pledge/info.xml | 4 ++-- ext/civi_report/info.xml | 4 ++-- ext/civicrm_admin_ui/info.xml | 4 ++-- ext/civicrm_search_ui/info.xml | 4 ++-- ext/civigrant/info.xml | 4 ++-- ext/civiimport/info.xml | 4 ++-- ext/ckeditor4/info.xml | 4 ++-- ext/contributioncancelactions/info.xml | 4 ++-- ext/elavon/info.xml | 4 ++-- ext/eventcart/info.xml | 4 ++-- ext/ewaysingle/info.xml | 4 ++-- ext/financialacls/info.xml | 4 ++-- ext/flexmailer/info.xml | 4 ++-- ext/greenwich/info.xml | 4 ++-- ext/legacycustomsearches/info.xml | 4 ++-- ext/message_admin/info.xml | 4 ++-- ext/oauth-client/info.xml | 4 ++-- ext/payflowpro/info.xml | 4 ++-- ext/recaptcha/info.xml | 4 ++-- ext/scheduled_communications/info.xml | 4 ++-- ext/search_kit/info.xml | 4 ++-- ext/sequentialcreditnotes/info.xml | 4 ++-- ext/standaloneusers/info.xml | 4 ++-- ext/user_dashboard/info.xml | 4 ++-- js/version.json | 2 +- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 40 files changed, 78 insertions(+), 75 deletions(-) diff --git a/deleted-files-list.json b/deleted-files-list.json index 6389b18abc..38539e7abf 100644 --- a/deleted-files-list.json +++ b/deleted-files-list.json @@ -151,7 +151,8 @@ "CRM/Upgrade/4.7.11.msg_template/*", "CRM/Upgrade/4.7.14.msg_template/*", "CRM/Upgrade/4.7.19.msg_template/*", - "CRM/Upgrade/4.7.23.msg_template/*", + "CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl", + "CRM/Upgrade/4.7.23.msg_template/message_templates/*", "CRM/Upgrade/4.7.4.msg_template/*", "CRM/Upgrade/4.7.5.msg_template/*", "CRM/Upgrade/4.7.alpha1.msg_template/*", @@ -933,6 +934,7 @@ "tests/phpunit/CRM/Contact/Page/View/NoteTest.php", "tests/phpunit/CRM/Contribute/Import/Parser/data/.~lock.contributions.csv#", "tests/phpunit/CRM/Contribute/Import/Parser/data/.~lock.pledge.csv#", + "tests/phpunit/CRM/Contribute/Import/Parser/data/contributions.CSV", "tests/phpunit/CRM/Contribute/Import/Parser/data/contributions.txt", "tests/phpunit/CRM/Core/BAO/DashboardTest.php", "tests/phpunit/CRM/Event/Form/RegistrationTest.php", @@ -1011,6 +1013,7 @@ "tools/extensions/org.civicrm.search.basic/*", "tools/extensions/org.civicrm.search.multivalue.zip", "tools/extensions/org.civicrm.search.multivalue/*", + "tools/extensions/phpstorm/.phpstorm.meta.php", "tools/extensions/phpstorm/mixin/*", "tools/queries", "tools/queriesafter.txt", diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 0f3ddc844c..dd12ef4a97 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -12,8 +12,8 @@ https://chat.civicrm.org/civicrm/channels/dev-afform http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 beta 5.70 diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index 4ff3576787..8b9cdfba81 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -12,8 +12,8 @@ https://chat.civicrm.org/civicrm/channels/dev-afform http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 5.70 diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index 126e940cbb..ab21493a9a 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -12,8 +12,8 @@ https://chat.civicrm.org/civicrm/channels/dev-afform http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha 5.70 diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index 04f53fb5c3..25f5002219 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -11,8 +11,8 @@ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 88c4fed2c1..887250ee7b 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/dev/core/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable mgmt:required diff --git a/ext/civi_campaign/info.xml b/ext/civi_campaign/info.xml index b996c932a2..55da7082d1 100644 --- a/ext/civi_campaign/info.xml +++ b/ext/civi_campaign/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/campaign/what-is-civicampaign/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_case/info.xml b/ext/civi_case/info.xml index a9eaee53a5..bd17b968b0 100644 --- a/ext/civi_case/info.xml +++ b/ext/civi_case/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/case-management/what-is-civicase/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_contribute/info.xml b/ext/civi_contribute/info.xml index 5c1d4f6dd4..bfeaf87fd6 100644 --- a/ext/civi_contribute/info.xml +++ b/ext/civi_contribute/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/contributions/what-is-civicontribute/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_event/info.xml b/ext/civi_event/info.xml index 725f572641..88873030aa 100644 --- a/ext/civi_event/info.xml +++ b/ext/civi_event/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/events/what-is-civievent http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_mail/info.xml b/ext/civi_mail/info.xml index 91f76c9208..bb6b1aeea9 100644 --- a/ext/civi_mail/info.xml +++ b/ext/civi_mail/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/email/what-is-civimail/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_member/info.xml b/ext/civi_member/info.xml index bc0948ebe0..fb0ab72bfd 100644 --- a/ext/civi_member/info.xml +++ b/ext/civi_member/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/membership/what-is-civimember/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_pledge/info.xml b/ext/civi_pledge/info.xml index 2289de8f29..2f5047b61f 100644 --- a/ext/civi_pledge/info.xml +++ b/ext/civi_pledge/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/pledges/what-is-civipledge/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civi_report/info.xml b/ext/civi_report/info.xml index a55e4a1039..d52268b6d3 100644 --- a/ext/civi_report/info.xml +++ b/ext/civi_report/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/reporting/what-is-civireport/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable component diff --git a/ext/civicrm_admin_ui/info.xml b/ext/civicrm_admin_ui/info.xml index 3516bef304..eeea6817a4 100644 --- a/ext/civicrm_admin_ui/info.xml +++ b/ext/civicrm_admin_ui/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/dev/core/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 beta 5.70 diff --git a/ext/civicrm_search_ui/info.xml b/ext/civicrm_search_ui/info.xml index 49e6c07ac7..18728221a0 100644 --- a/ext/civicrm_search_ui/info.xml +++ b/ext/civicrm_search_ui/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/dev/core/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha org.civicrm.search_kit diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml index e93e5f745c..7853cc0114 100644 --- a/ext/civigrant/info.xml +++ b/ext/civigrant/info.xml @@ -12,8 +12,8 @@ https://docs.civicrm.org/user/en/latest/grants/what-is-civigrant/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/civiimport/info.xml b/ext/civiimport/info.xml index 8742980e3e..5bddbe9dce 100644 --- a/ext/civiimport/info.xml +++ b/ext/civiimport/info.xml @@ -14,8 +14,8 @@ http://civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha 5.70 diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index 411999c7e7..43f960594e 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -14,8 +14,8 @@ https://github.com/civicrm/civicrm-core/ https://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index 5ca2baf312..b7321d1234 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -14,8 +14,8 @@ http://civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/elavon/info.xml b/ext/elavon/info.xml index 3cf47fc58e..7a3b7ddb8f 100644 --- a/ext/elavon/info.xml +++ b/ext/elavon/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index 00cf2ceba0..f68bd68ad5 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -12,8 +12,8 @@ https://github.com/civicrm/civicrm-core/tree/master/ext/eventcart http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 371a25d4cd..9c2139f836 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -14,8 +14,8 @@ https://github.com/civicrm/civicrm-core/blob/master/ext/ewaysingle http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index 45fa9c104a..73d832c25f 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -14,8 +14,8 @@ http://FIXME http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 637a58a83c..73be9c8f36 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -14,8 +14,8 @@ http://civicrm.stackexchange.com/ http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable FlexMailer is an email delivery engine which replaces the internal guts diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index e7fd0fcef3..e48e60d710 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -14,8 +14,8 @@ http://civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index a04120d186..468aae818f 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -14,8 +14,8 @@ http://FIXME http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index 961a056a5a..cdb7d87b6c 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -14,8 +14,8 @@ http://civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha 5.70 diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index e8394517f2..874544d00e 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/dev/core/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index 1e401a9357..b61ef8fb11 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable 5.70 diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index ee2906b546..4e5c08894d 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -12,8 +12,8 @@ https://github.com/civicrm/civicrm-core/tree/master/ext/recaptcha http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/scheduled_communications/info.xml b/ext/scheduled_communications/info.xml index 1b402bbf83..b8852869e7 100644 --- a/ext/scheduled_communications/info.xml +++ b/ext/scheduled_communications/info.xml @@ -12,8 +12,8 @@ https://chat.civicrm.org/civicrm/channels/search-improvements http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 beta 5.70 diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 7ed3525956..1e835cf197 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/dev/report/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 stable mgmt:required diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 0365ea44f0..321c18101e 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -14,8 +14,8 @@ https://lab.civicrm.org/extensions/sequentialcreditnotes http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 mgmt:hidden diff --git a/ext/standaloneusers/info.xml b/ext/standaloneusers/info.xml index b93d7df33c..8001185a29 100644 --- a/ext/standaloneusers/info.xml +++ b/ext/standaloneusers/info.xml @@ -14,8 +14,8 @@ http://FIXME http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha 5.70 diff --git a/ext/user_dashboard/info.xml b/ext/user_dashboard/info.xml index 09a909285c..1be3f27917 100644 --- a/ext/user_dashboard/info.xml +++ b/ext/user_dashboard/info.xml @@ -14,8 +14,8 @@ http://FIXME http://www.gnu.org/licenses/agpl-3.0.html - 2023-12-08 - 5.70.alpha1 + 2024-01-05 + 5.70.beta1 alpha 5.70 diff --git a/js/version.json b/js/version.json index 83af6aecf0..d20f94d422 100644 --- a/js/version.json +++ b/js/version.json @@ -1 +1 @@ -"5.70.alpha1" +"5.70.beta1"\n \ No newline at end of file diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 24c3489f7c..d05be09219 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2953,7 +2953,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES - (1,'Default Domain Name',NULL,'5.70.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.70.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql index 019f30466c..092ba7427d 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -907,4 +907,4 @@ INSERT INTO civicrm_navigation VALUES ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 ); UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID; -UPDATE civicrm_domain SET version = '5.70.alpha1'; +UPDATE civicrm_domain SET version = '5.70.beta1'; diff --git a/xml/version.xml b/xml/version.xml index cd536f880b..0fd11e09aa 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.70.alpha1 + 5.70.beta1 -- 2.25.1