From 0978074c74e479a34b972cfdc01bfd2f6597a254 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 30 Jun 2021 19:31:48 +0530
Subject: [PATCH] add convert app to example nginx and update changelog

---
 CHANGELOG.md            | 20 ++++++++++++++++++++
 docs/example.nginx.conf |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b41b1d9b0..18fd928a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 * server
   * `installMethod: 'unspecified'` in the default config to distinguish docker installs
   * `instancePurpose` on admin panel
+  * add support for archiving pin lists (instead of deleting them)
+  * blocks
+    * archive blocks instead of deleting them outright
+    * implement as storage API
+    * validate blocks in worker
+  * don't include adminEmail in telemetry unless we have consentToContact
+  * don't include instancePurpose in telemetry if it is "noanswer"
 * display warnings when remote resources are blocked
   * in code preview
 * restrict style tags to a scope when rendering them in markdown preview by compiling their content as scoped less
@@ -15,6 +22,19 @@
 * form templates
 * guard against a type error in `getAccessKeys`
 * guard against invalid or malicious input when constructing media-tags for embedding in markdown
+* Japanese translation
+* conversions
+  * convert app
+  * some basic office formats
+  * rich text => markdown
+    * handle some pecularities with headings and ids
+  * forms => .csv
+  * trello import with some loss
+* fix rendering issue for legacy markdown media tag syntax
+  * guard against domExceptions
+  * catch errors thrown by the diff applier
+* don't bother returning the hash of a pin list to the client, since they don't use it
+
 
 # 4.7.0
 
diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf
index 85f42dd81..29317ee27 100644
--- a/docs/example.nginx.conf
+++ b/docs/example.nginx.conf
@@ -214,7 +214,7 @@ server {
     # The nodejs server has some built-in forwarding rules to prevent
     # URLs like /pad from resulting in a 404. This simply adds a trailing slash
     # to a variety of applications.
-    location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report)$ {
+    location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert)$ {
         rewrite ^(.*)$ $1/ redirect;
     }