From: CiviCRM Date: Fri, 8 Dec 2023 13:38:24 +0000 (+0000) Subject: Set version to 5.70.alpha1 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2a9e8974aeea7c7a24bc3c1c26cef18cbd52b9d8;p=civicrm-core.git Set version to 5.70.alpha1 --- diff --git a/CRM/Upgrade/Incremental/php/FiveSeventy.php b/CRM/Upgrade/Incremental/php/FiveSeventy.php new file mode 100644 index 0000000000..f2e25a46b9 --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveSeventy.php @@ -0,0 +1,34 @@ +addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.70.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.70.alpha1.mysql.tpl new file mode 100644 index 0000000000..8df58cfd9e --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.70.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.70.alpha1 during upgrade *} diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 847dfa1c1d..0f3ddc844c 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 beta - 5.69 + 5.70 FormBuilder provides a UI to administer and edit forms. It is an optional admin tool and not required for the forms to function. diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index 4777780da2..4ff3576787 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -13,9 +13,9 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 - 5.69 + 5.70 stable diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index a6cd2e2837..126e940cbb 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha - 5.69 + 5.70 org.civicrm.afform diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index b960a8d5fe..04f53fb5c3 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -12,13 +12,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden alpha - 5.69 + 5.70 org.civicrm.afform diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 5b843afc16..88c4fed2c1 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable mgmt:required - 5.69 + 5.70 AuthX enables remote applications to connect to CiviCRM. Use it to enable and disable different forms of authentication (such as username-password, API key, and/or JWT). diff --git a/ext/civi_campaign/info.xml b/ext/civi_campaign/info.xml index f3943f412a..b996c932a2 100644 --- a/ext/civi_campaign/info.xml +++ b/ext/civi_campaign/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_case/info.xml b/ext/civi_case/info.xml index ddb52f1127..a9eaee53a5 100644 --- a/ext/civi_case/info.xml +++ b/ext/civi_case/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_contribute/info.xml b/ext/civi_contribute/info.xml index e755a95370..5c1d4f6dd4 100644 --- a/ext/civi_contribute/info.xml +++ b/ext/civi_contribute/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_event/info.xml b/ext/civi_event/info.xml index 88316c7f70..725f572641 100644 --- a/ext/civi_event/info.xml +++ b/ext/civi_event/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_mail/info.xml b/ext/civi_mail/info.xml index 59f8f5154d..91f76c9208 100644 --- a/ext/civi_mail/info.xml +++ b/ext/civi_mail/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_member/info.xml b/ext/civi_member/info.xml index 485a971d64..bc0948ebe0 100644 --- a/ext/civi_member/info.xml +++ b/ext/civi_member/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_pledge/info.xml b/ext/civi_pledge/info.xml index d126225dd4..2289de8f29 100644 --- a/ext/civi_pledge/info.xml +++ b/ext/civi_pledge/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_report/info.xml b/ext/civi_report/info.xml index 83d498081b..a55e4a1039 100644 --- a/ext/civi_report/info.xml +++ b/ext/civi_report/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable component - 5.69 + 5.70 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civicrm_admin_ui/info.xml b/ext/civicrm_admin_ui/info.xml index 1b3d7ac7fd..3516bef304 100644 --- a/ext/civicrm_admin_ui/info.xml +++ b/ext/civicrm_admin_ui/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 beta - 5.69 + 5.70 org.civicrm.search_kit diff --git a/ext/civicrm_search_ui/info.xml b/ext/civicrm_search_ui/info.xml index 2938a91c77..49e6c07ac7 100644 --- a/ext/civicrm_search_ui/info.xml +++ b/ext/civicrm_search_ui/info.xml @@ -15,14 +15,14 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha org.civicrm.search_kit org.civicrm.afform - 5.69 + 5.70 Replacement SearchKit/FormBuilder pages for core Search pages. diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml index 0da0aa36ab..e93e5f745c 100644 --- a/ext/civigrant/info.xml +++ b/ext/civigrant/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 CiviGrant was originally a core component before migrating to an extension diff --git a/ext/civiimport/info.xml b/ext/civiimport/info.xml index 877a5175c3..8742980e3e 100644 --- a/ext/civiimport/info.xml +++ b/ext/civiimport/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha - 5.69 + 5.70 This extension contains import functionality which was previously in CiviCRM Core. If you use the import functionality it is recommended to enable this extension. diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index 08572df952..411999c7e7 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -15,10 +15,10 @@ https://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 This is the version of CKEditor that originally shipped with CiviCRM core diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index fd62d0c223..5ca2baf312 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 This code has been moved from core to a separate extension in 5.32. Note that if you disable it failed or cancelled contributions will not cause related memberships and participant records to be updated diff --git a/ext/elavon/info.xml b/ext/elavon/info.xml index 496d9d1f71..3cf47fc58e 100644 --- a/ext/elavon/info.xml +++ b/ext/elavon/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index f33f89b3ff..00cf2ceba0 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden stable - 5.69 + 5.70 diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index a0e4122601..371a25d4cd 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden stable - 5.69 + 5.70 This is an extension to contain the eWAY Single Currency Payment Processor diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index 5385055653..45fa9c104a 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 mgmt:hidden diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 0d04b5c48a..637a58a83c 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable FlexMailer is an email delivery engine which replaces the internal guts @@ -23,7 +23,7 @@ to provide richer email features. - 5.69 + 5.70 mgmt:required diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index 5ac1cedb9c..e7fd0fcef3 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden stable - 5.69 + 5.70 diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index 757f6ae3e2..a04120d186 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 This is our old search system which has limited support. All new effort is on SearchKit diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index 52fc32baa0..961a056a5a 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha - 5.69 + 5.70 org.civicrm.afform diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index f34daffdff..e8394517f2 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 org.civicrm.afform diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index 62699ea4e2..1e401a9357 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable - 5.69 + 5.70 This extension is extraction of the original Core Payflow Pro Payment Processor diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index c69917fe43..ee2906b546 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden stable - 5.69 + 5.70 diff --git a/ext/scheduled_communications/info.xml b/ext/scheduled_communications/info.xml index 9b98928d10..1b402bbf83 100644 --- a/ext/scheduled_communications/info.xml +++ b/ext/scheduled_communications/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 beta - 5.69 + 5.70 Click on the chat link above to discuss development, report problems or ask questions. diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 8f54dc9849..7ed3525956 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 stable mgmt:required - 5.69 + 5.70 Click on the chat link above to discuss development, report problems or ask questions. diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 97549f3270..0365ea44f0 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 mgmt:hidden stable - 5.69 + 5.70 setting-php@1.0.0 diff --git a/ext/standaloneusers/info.xml b/ext/standaloneusers/info.xml index b73b8c8324..b93d7df33c 100644 --- a/ext/standaloneusers/info.xml +++ b/ext/standaloneusers/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha - 5.69 + 5.70 org.civicrm.search_kit diff --git a/ext/user_dashboard/info.xml b/ext/user_dashboard/info.xml index 9e396abf71..09a909285c 100644 --- a/ext/user_dashboard/info.xml +++ b/ext/user_dashboard/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-12-08 - 5.69.beta1 + 5.70.alpha1 alpha - 5.69 + 5.70 This extension is still experimental diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 488a903ae2..3cf68b4e25 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.69.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.70.alpha1',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 c5acc94a73..019f30466c 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.69.beta1'; +UPDATE civicrm_domain SET version = '5.70.alpha1'; diff --git a/xml/version.xml b/xml/version.xml index 8bc2ce706d..cd536f880b 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.69.beta1 + 5.70.alpha1