Merge pull request #19344 from seamuslee001/5.33

5.33.1 Release notes and version bump

CRM/Upgrade/Incremental/sql/5.33.1.mysql.tpl

@@ -0,0 +1 @@
+{* file to handle db changes in 5.33.1 during upgrade *}

release-notes.md

@@ -15,6 +15,15 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 5.33.1
+
+Released January 7, 2021
+
+- **[Synopsis](release-notes/5.33.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.33.1.md#bugs)**
+- **[Credits](release-notes/5.33.1.md#credits)**
+- **[Feedback](release-notes/5.33.1.md#feedback)**
+
 ## CiviCRM 5.33.0
 
 Released January 6, 2021

release-notes/5.33.1.md

@@ -0,0 +1,38 @@
+# CiviCRM 5.33.1
+
+Released January 7, 2021
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |          |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema?                                     | no       |
+| Alter the API?                                                  | no       |
+| Require attention to configuration options?                     | no       |
+| Fix problems installing or upgrading to a previous version?     | **yes**  |
+| Introduce features?                                             | no       |
+| **Fix bugs?**                                                   | **yes**  |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Fix fatal error on loading contribution page due to mismatched ts tags ([#19341](https://github.com/civicrm/civicrm-core/pull/19341))**
+
+* **_Upgrader_: Fix hook_permission error ([#19345](https://github.com/civicrm/civicrm-core/pull/19345))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+iXiam - Vangelis Pantazis; Coop SymbioTIC - Mathieu Lutfy; MJCO - Mikey O'Toole;
+JMA Consulting - Seamus Lee; CiviCRM - Tim Otten; DignityUSA - Logan Bear
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.

sql/civicrm_generated.mysql

@@ -399,7 +399,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.33.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.33.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 

sql/test_data_second_domain.mysql

@@ -963,4 +963,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.33.0';
+UPDATE civicrm_domain SET version = '5.33.1';

xml/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.33.0</version_no>
+  <version_no>5.33.1</version_no>
 </version>