diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d1c2d4d0..866196d56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,36 @@
-# WIP
+# 4.4.0
+
+## Goals
+
+## Update notes
+
+* no default privacy policy
+* nginx update
+ * calendar
+ * /api/broadcast
+* clarified TELEMETRY in the 4.3.1 release notes
+
+## Features
+
+* prompt premium users to cancel their subscriptions before deleting their accounts
+* check that headers for XLSX export are correctly set via the checkup app
+* remove HTML from most translations
+* localize links to the docs where a translation exists
+* implement admin-broadcast features
+* add "getting started" banner in the drive
+* calendars: BETA
+* clear document cache when visiting /logout/
+
+## Bug fixes
+
+* bad channel IDs stored in your drive or accessed via bad links (corrupted somehow)
+ * don't try to join invalid channels
+ * don't try to get their metadata
+* guard against some type errors in the support page
+* remove redundant link from OpenCollective popup
+* guard against a type error when copying a pad in nodrive mode
+* correctly navigate to anchors when clicking links to anchors in read-only rich-text pads
+
* OnlyOffice
* inform OnlyOffice of userlist changes
@@ -16,19 +48,6 @@
* **soft release of OnlyOffice presentations and docs**
* if you've been using them, tell your users to export them before they break
* we still don't recommend that you use either editor!
-* bad channel IDs stored in your drive or accessed via bad links (corrupted somehow)
- * don't try to join invalid channels
- * don't try to get their metadata
-* prompt premium users to cancel their subscriptions before deleting their accounts
-* check that headers for XLSX export are correctly set via the checkup app
-* guard against some type errors in the support page
-* remove default privacy policy
-* remove HTML from most translations
-* localize links to the docs where a translation exists
-* remove redundant link from OpenCollective popup
-* guard against a type error when copying a pad in nodrive mode
-* warn premium users that their subscription won't be cancelled automatically when they delete their account
-* implement admin-broadcast features
# 4.3.1
diff --git a/server.js b/server.js
index 36ca1a425..0b28b2de6 100644
--- a/server.js
+++ b/server.js
@@ -106,7 +106,6 @@ var setHeaders = (function () {
return function (req, res) {
// apply a bunch of cross-origin headers for XLSX export in FF and printing elsewhere
applyHeaderMap(res, {
- "Cross-Origin-Resource-Policy": 'cross-origin',
"Cross-Origin-Opener-Policy": /^\/sheet\//.test(req.url)? 'same-origin': '',
"Cross-Origin-Embedder-Policy": 'require-corp',
});
@@ -114,6 +113,10 @@ var setHeaders = (function () {
// Don't set CSP headers on /api/config because they aren't necessary and they cause problems
// when duplicated by NGINX in production environments
if (/^\/api\/(broadcast|config)/.test(req.url)) { return; }
+ applyHeaderMap(res, {
+ "Cross-Origin-Resource-Policy": 'cross-origin',
+ });
+
// targeted CSP, generic policies, maybe custom headers
const h = [
/^\/common\/onlyoffice\/.*\/index\.html.*/,
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 90b2e0e45..cfd090d9c 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -54,7 +54,7 @@ define([
var metadataMgr;
var sframeChan;
-Messages.calendar = "Calendar"; // XXX
+Messages.calendar = "BETA Calendar"; // XXX
Messages.calendar_default = "My calendar"; // XXX
Messages.calendar_new = "New calendar"; // XXX
Messages.calendar_day = "Day";
diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 2496aa260..4cfe4e00a 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -12,7 +12,7 @@ define(function() {
* You should never remove the drive from this list.
*/
config.availablePadTypes = ['drive', 'teams', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard',
- /*'doc', 'presentation',*/ 'file', /*'todo',*/ 'contacts', 'calendar'];
+ /*'doc', 'presentation',*/ 'file', /*'todo',*/ 'contacts' /*, 'calendar' */];
/* The registered only types are apps restricted to registered users.
* You should never remove apps from this list unless you know what you're doing. The apps
* listed here by default can't work without a user account.
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6ec1cf420..602c52100 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2003,6 +2003,7 @@ define([
if (p === 'todo') { return; }
if (p === 'file') { return; }
if (p === 'accounts') { return; }
+ if (p === 'calendar') { return; }
if (!common.isLoggedIn() && AppConfig.registeredOnlyTypes &&
AppConfig.registeredOnlyTypes.indexOf(p) !== -1) { return; }
return true;
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 87825e0f4..2d128b468 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2540,6 +2540,7 @@ define([
if (type === 'todo') { return; }
if (type === 'file') { return; }
if (type === 'accounts') { return; }
+ if (type === 'calendar') { return; }
if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
return;
diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 82d15d1c9..d45897457 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1179,7 +1179,7 @@
"broadcast_newCustom": "Mitteilung der Administratoren",
"admin_broadcastCancel": "Mitteilung löschen",
"admin_broadcastActive": "Aktive Mitteilung",
- "admin_broadcastHint": "Sende eine Mitteilung an alle Benutzer auf dieser Instanz. Alle existierenden und neue Benutzer werden sie als Benachrichtigung erhalten. Du kannst sie mit **Vorschau der Benachrichtigung** überprüfen. Die Vorschau ist mit einem roten Symbol gekennzeichnet und nur für dich sichtbar.",
+ "admin_broadcastHint": "Sende eine Mitteilung an alle Benutzer auf dieser Instanz. Alle existierenden und neue Benutzer werden sie als Benachrichtigung erhalten. Du kannst sie mit Vorschau der Benachrichtigung überprüfen. Die Vorschau ist mit einem roten Symbol gekennzeichnet und nur für dich sichtbar.",
"broadcast_preview": "Vorschau der Benachrichtigung",
"admin_maintenanceCancel": "Wartungsarbeiten stornieren"
}
diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 57a807711..cd3c86130 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1165,7 +1165,7 @@
"admin_broadcastCancel": "Effacer le message",
"admin_broadcastActive": "Message actif",
"admin_broadcastButton": "Envoyer",
- "admin_broadcastHint": "Envoyez un message à tous les utilisateurs de cette instance. Tous les utilisateurs existants et nouveaux le recevront sous forme de notification. Prévisualisez les messages avant de les envoyer avec **Aperçu de la notification**. Les aperçus de notifications ont une icône rouge et ne sont visibles que par vous.",
+ "admin_broadcastHint": "Envoyez un message à tous les utilisateurs de cette instance. Tous les utilisateurs existants et nouveaux le recevront sous forme de notification. Prévisualisez les messages avant de les envoyer avec Aperçu de la notification. Les aperçus de notifications ont une icône rouge et ne sont visibles que par vous.",
"admin_broadcastTitle": "Message d'annonce",
"broadcast_surveyURL": "Lien vers l'enquête",
"admin_surveyActive": "Ouvrir l'enquête",
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index bc9dd6cb3..bac8defb3 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1171,7 +1171,7 @@
"admin_surveyActive": "Open survey",
"broadcast_surveyURL": "Survey link",
"admin_broadcastTitle": "Broadcast message",
- "admin_broadcastHint": "Send a message to all users on this instance. All existing and new users will receive it as a notification. Preview messages before sending them with **Preview notification**. Preview notifications have a red icon and are visible only to you.",
+ "admin_broadcastHint": "Send a message to all users on this instance. All existing and new users will receive it as a notification. Preview messages before sending them with Preview notification. Preview notifications have a red icon and are visible only to you.",
"admin_broadcastButton": "Send",
"admin_broadcastActive": "Active message",
"admin_broadcastCancel": "Delete message",