More email styling

Merge branch 'main' into email-diff
feat: Add documentId filter to events.list (#2287 )
2026-06-14 03:45:00 +03:00 · 2021-07-08 22:38:42 -04:00 · 2021-07-08 21:20:18 -04:00 · 2021-07-08 10:12:06 -07:00 · 2021-07-07 22:26:56 -04:00 · 2021-07-07 18:45:40 -07:00
47 changed files with 1195 additions and 768 deletions
@@ -26,20 +26,29 @@ const MenuItem = ({
  hide,
  ...rest
 }: Props) => {
-  // We bind to mousedown instead of onClick here as otherwise menu items do not
-  // work in Firefox which triggers the hideOnClickOutside handler first via
-  // mousedown.
-  const handleMouseDown = React.useCallback(
+  const handleClick = React.useCallback(
    (ev) => {
      if (onClick) {
        ev.preventDefault();
        ev.stopPropagation();
        onClick(ev);
      }
+
+      if (hide) {
+        hide();
+      }
    },
-    [onClick]
+    [onClick, hide]
  );

+  // Preventing default mousedown otherwise menu items do not work in Firefox,
+  // which triggers the hideOnClickOutside handler first via mousedown – hiding
+  // and un-rendering the menu contents.
+  const handleMouseDown = React.useCallback((ev) => {
+    ev.preventDefault();
+    ev.stopPropagation();
+  }, []);
+
  return (
    <BaseMenuItem
      onClick={disabled ? undefined : onClick}
@@ -52,8 +61,8 @@ const MenuItem = ({
          {...props}
          $toggleable={selected !== undefined}
          as={onClick ? "button" : as}
+          onClick={handleClick}
          onMouseDown={handleMouseDown}
-          onClick={hide}
        >
          {selected !== undefined && (
            <>
@@ -9,15 +9,52 @@ import {
  MenuItem as BaseMenuItem,
 } from "reakit/Menu";
 import styled from "styled-components";
-import Header from "./Header";
 import MenuItem, { MenuAnchor } from "./MenuItem";
 import Separator from "./Separator";
 import ContextMenu from ".";
-import { type MenuItem as TMenuItem } from "types";
+
+type TMenuItem =
+  | {|
+      title: React.Node,
+      to: string,
+      visible?: boolean,
+      selected?: boolean,
+      disabled?: boolean,
+    |}
+  | {|
+      title: React.Node,
+      onClick: (event: SyntheticEvent<>) => void | Promise<void>,
+      visible?: boolean,
+      selected?: boolean,
+      disabled?: boolean,
+    |}
+  | {|
+      title: React.Node,
+      href: string,
+      visible?: boolean,
+      selected?: boolean,
+      disabled?: boolean,
+    |}
+  | {|
+      title: React.Node,
+      visible?: boolean,
+      disabled?: boolean,
+      style?: Object,
+      hover?: boolean,
+      items: TMenuItem[],
+    |}
+  | {|
+      type: "separator",
+      visible?: boolean,
+    |}
+  | {|
+      type: "heading",
+      visible?: boolean,
+      title: React.Node,
+    |};

 type Props = {|
  items: TMenuItem[],
-  hide?: Function,
 |};

 const Disclosure = styled(ExpandedIcon)`
@@ -46,7 +83,7 @@ const Submenu = React.forwardRef(({ templateItems, title, ...rest }, ref) => {
  );
 });

-function Template({ items, ...menu }: Props): React.Node {
+export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {
  let filtered = items.filter((item) => item.visible !== false);

  // this block literally just trims unneccessary separators
@@ -64,7 +101,11 @@ function Template({ items, ...menu }: Props): React.Node {
    return [...acc, item];
  }, []);

-  return filtered.map((item, index) => {
+  return filtered;
+}
+
+function Template({ items, ...menu }: Props): React.Node {
+  return filterTemplateItems(items).map((item, index) => {
    if (item.to) {
      return (
        <MenuItem
@@ -126,10 +167,6 @@ function Template({ items, ...menu }: Props): React.Node {
      return <Separator key={index} />;
    }

-    if (item.type === "heading") {
-      return <Header key={index}>{item.title}</Header>;
-    }
-
    return null;
  });
 }
@@ -9,7 +9,7 @@ type Props = {|
  ...InputProps,
  placeholder?: string,
  value?: string,
-  onChange?: (event: SyntheticInputEvent<>) => mixed,
+  onChange: (event: SyntheticInputEvent<>) => mixed,
  onKeyDown?: (event: SyntheticKeyboardEvent<HTMLInputElement>) => mixed,
 |};

@@ -26,7 +26,6 @@ import DocumentHistory from "components/DocumentHistory";
 import Flex from "components/Flex";
 import Guide from "components/Guide";
 import { LoadingIndicatorBar } from "components/LoadingIndicator";
-import QuickMenu from "components/QuickMenu";
 import Sidebar from "components/Sidebar";
 import SettingsSidebar from "components/Sidebar/Settings";
 import SkipNavContent from "components/SkipNavContent";
@@ -79,7 +78,7 @@ class Layout extends React.Component<Props> {
    this.keyboardShortcutsOpen = false;
  };

-  @keydown(["t", "/"])
+  @keydown(["t", "/", `${meta}+k`])
  goToSearch(ev: SyntheticEvent<>) {
    ev.preventDefault();
    ev.stopPropagation();
@@ -169,7 +168,6 @@ class Layout extends React.Component<Props> {
        >
          <KeyboardShortcuts />
        </Guide>
-        <QuickMenu />
      </Container>
    );
  }
@@ -61,8 +61,7 @@ const Modal = ({
          <Dialog
            {...dialog}
            aria-label={title}
-            preventBodyScroll
-            hideOnEsc
+            preventBodyScrollhideOnEsc
            hide={onRequestClose}
          >
            {(props) => (
@@ -1,119 +0,0 @@
-// @flow
-import { observer } from "mobx-react";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { Dialog, DialogBackdrop, useDialogState } from "reakit/Dialog";
-import styled from "styled-components";
-import Template from "components/ContextMenu/Template";
-import Scrollable from "components/Scrollable";
-import useStores from "hooks/useStores";
-
-function QuickMenu() {
-  const { quickMenu } = useStores();
-  console.log("render");
-  const dialog = useDialogState({ modal: true, animated: 250 });
-  const { t } = useTranslation();
-
-  const handleSearchChange = React.useCallback(
-    (event) => {
-      quickMenu.setSearchTerm(event.target.value);
-    },
-    [quickMenu]
-  );
-
-  React.useEffect(() => {
-    if (!dialog.visible) {
-      quickMenu.setSearchTerm("");
-    }
-  }, [quickMenu, dialog.visible]);
-
-  React.useEffect(() => {
-    const handleKeyDown = (event) => {
-      if (event.key === "k" && event.metaKey) {
-        dialog.visible ? dialog.hide() : dialog.show();
-      }
-    };
-
-    window.addEventListener("keydown", handleKeyDown);
-
-    return () => window.removeEventListener("keydown", handleKeyDown);
-  });
-
-  return (
-    <DialogBackdrop {...dialog}>
-      {(props) => (
-        <Backdrop {...props}>
-          <Dialog
-            {...dialog}
-            aria-label={t("Quick menu")}
-            preventBodyScroll
-            hideOnEsc
-          >
-            {(props) => (
-              <Content {...props}>
-                <InputWrapper>
-                  <input
-                    type="search"
-                    onChange={handleSearchChange}
-                    placeholder={`${t("Search actions")}…`}
-                    value={quickMenu.searchTerm}
-                  />
-                </InputWrapper>
-                <Results>
-                  <Scrollable topShadow>
-                    {quickMenu.resolvedMenuItems.map((context) => (
-                      <Template
-                        key={context.id}
-                        {...dialog}
-                        items={[
-                          {
-                            type: "heading",
-                            title: context.title,
-                            visible: true,
-                          },
-                          ...context.items.filter(
-                            // $FlowFixMe
-                            (item) => item.type !== "separator"
-                          ),
-                        ]}
-                      />
-                    ))}
-                  </Scrollable>
-                </Results>
-              </Content>
-            )}
-          </Dialog>
-        </Backdrop>
-      )}
-    </DialogBackdrop>
-  );
-}
-
-const InputWrapper = styled.div`
-  padding: 16px;
-`;
-
-const Results = styled.div`
-  height: calc(100% - 64px);
-`;
-
-const Content = styled.div`
-  background: ${(props) => props.theme.background};
-  width: 40vw;
-  max-height: 50vh;
-  border-radius: 8px;
-  overflow: hidden;
-  margin: 20vh auto;
-  box-shadow: ${(props) => props.theme.menuShadow};
-`;
-
-const Backdrop = styled.div`
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: ${(props) => props.theme.depths.modalOverlay};
-`;
-
-export default observer(QuickMenu);
@@ -1,4 +1,5 @@
 // @flow
+import { transparentize } from "polished";
 import * as React from "react";
 import { withRouter, type RouterHistory, type Match } from "react-router-dom";
 import styled, { withTheme } from "styled-components";
@@ -145,7 +146,8 @@ const Link = styled(NavLink)`

  &:focus {
    color: ${(props) => props.theme.text};
-    background: ${(props) => props.theme.black05};
+    background: ${(props) =>
+      transparentize("0.25", props.theme.sidebarItemBackground)};
  }

  ${breakpoint("tablet")`
@@ -1,9 +1,11 @@
 // @flow
 import { observer } from "mobx-react";
-// import { SunIcon, MoonIcon } from "outline-icons";
+import { SunIcon, MoonIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
 import { useMenuState, MenuButton } from "reakit/Menu";
+import styled from "styled-components";
 import {
  developers,
  changelog,
@@ -13,7 +15,9 @@ import {
 } from "shared/utils/routeHelpers";
 import KeyboardShortcuts from "scenes/KeyboardShortcuts";
 import ContextMenu from "components/ContextMenu";
-import Template from "components/ContextMenu/Template";
+import MenuItem, { MenuAnchor } from "components/ContextMenu/MenuItem";
+import Separator from "components/ContextMenu/Separator";
+import Flex from "components/Flex";
 import Guide from "components/Guide";
 import usePrevious from "hooks/usePrevious";
 import useStores from "hooks/useStores";
@@ -22,12 +26,56 @@ type Props = {|
  children: (props: any) => React.Node,
 |};

+const AppearanceMenu = React.forwardRef((props, ref) => {
+  const { ui } = useStores();
+  const { t } = useTranslation();
+  const menu = useMenuState();
+
+  return (
+    <>
+      <MenuButton ref={ref} {...menu} {...props} onClick={menu.show}>
+        {(props) => (
+          <MenuAnchor {...props}>
+            <ChangeTheme justify="space-between">
+              {t("Appearance")}
+              {ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />}
+            </ChangeTheme>
+          </MenuAnchor>
+        )}
+      </MenuButton>
+      <ContextMenu {...menu} aria-label={t("Appearance")}>
+        <MenuItem
+          {...menu}
+          onClick={() => ui.setTheme("system")}
+          selected={ui.theme === "system"}
+        >
+          {t("System")}
+        </MenuItem>
+        <MenuItem
+          {...menu}
+          onClick={() => ui.setTheme("light")}
+          selected={ui.theme === "light"}
+        >
+          {t("Light")}
+        </MenuItem>
+        <MenuItem
+          {...menu}
+          onClick={() => ui.setTheme("dark")}
+          selected={ui.theme === "dark"}
+        >
+          {t("Dark")}
+        </MenuItem>
+      </ContextMenu>
+    </>
+  );
+});
+
 function AccountMenu(props: Props) {
  const menu = useMenuState({
    placement: "bottom-start",
    modal: true,
  });
-  const { auth, ui, quickMenu } = useStores();
+  const { auth, ui } = useStores();
  const previousTheme = usePrevious(ui.theme);
  const { t } = useTranslation();
  const [keyboardShortcutsOpen, setKeyboardShortcutsOpen] = React.useState(
@@ -40,81 +88,6 @@ function AccountMenu(props: Props) {
    }
  }, [menu, ui.theme, previousTheme]);

-  const items = [
-    {
-      title: t("Settings"),
-      to: settings(),
-      visible: true,
-    },
-    {
-      title: t("Keyboard shortcuts"),
-      onClick: () => setKeyboardShortcutsOpen(true),
-      visible: true,
-    },
-    {
-      title: t("API documentation"),
-      href: developers(),
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: t("Changelog"),
-      href: changelog(),
-    },
-    {
-      title: t("Send us feedback"),
-      href: mailToUrl(),
-    },
-    {
-      title: t("Report a bug"),
-      href: githubIssuesUrl(),
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: t("Appearance"),
-      // icon: ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />,
-      items: [
-        {
-          title: t("System"),
-          selected: ui.theme === "system",
-          onClick: () => ui.setTheme("system"),
-        },
-        {
-          title: t("Light"),
-          selected: ui.theme === "light",
-          onClick: () => ui.setTheme("light"),
-        },
-        {
-          title: t("Dark"),
-          selected: ui.theme === "dark",
-          onClick: () => ui.setTheme("dark"),
-        },
-      ],
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: t("Log out"),
-      onClick: auth.logout,
-    },
-
-    // <MenuItem {...menu} as={AppearanceMenu} />
-  ];
-
-  React.useEffect(() => {
-    quickMenu.addContext({
-      id: "account",
-      items,
-      title: t("Account"),
-    });
-
-    return () => quickMenu.removeContext("account");
-  }, [quickMenu, items, t]);
-
  return (
    <>
      <Guide
@@ -126,10 +99,38 @@ function AccountMenu(props: Props) {
      </Guide>
      <MenuButton {...menu}>{props.children}</MenuButton>
      <ContextMenu {...menu} aria-label={t("Account")}>
-        <Template {...menu} items={items} />
+        <MenuItem {...menu} as={Link} to={settings()}>
+          {t("Settings")}
+        </MenuItem>
+        <MenuItem {...menu} onClick={() => setKeyboardShortcutsOpen(true)}>
+          {t("Keyboard shortcuts")}
+        </MenuItem>
+        <MenuItem {...menu} href={developers()} target="_blank">
+          {t("API documentation")}
+        </MenuItem>
+        <Separator {...menu} />
+        <MenuItem {...menu} href={changelog()} target="_blank">
+          {t("Changelog")}
+        </MenuItem>
+        <MenuItem {...menu} href={mailToUrl()} target="_blank">
+          {t("Send us feedback")}
+        </MenuItem>
+        <MenuItem {...menu} href={githubIssuesUrl()} target="_blank">
+          {t("Report a bug")}
+        </MenuItem>
+        <Separator {...menu} />
+        <MenuItem {...menu} as={AppearanceMenu} />
+        <Separator {...menu} />
+        <MenuItem {...menu} onClick={auth.logout}>
+          {t("Log out")}
+        </MenuItem>
      </ContextMenu>
    </>
  );
 }

+const ChangeTheme = styled(Flex)`
+  width: 100%;
+`;
+
 export default observer(AccountMenu);
@@ -12,7 +12,7 @@ import CollectionExport from "scenes/CollectionExport";
 import CollectionPermissions from "scenes/CollectionPermissions";
 import ContextMenu from "components/ContextMenu";
 import OverflowMenuButton from "components/ContextMenu/OverflowMenuButton";
-import Template from "components/ContextMenu/Template";
+import Template, { filterTemplateItems } from "components/ContextMenu/Template";
 import Modal from "components/Modal";
 import useStores from "hooks/useStores";
 import getDataTransferFiles from "utils/getDataTransferFiles";
@@ -37,7 +37,7 @@ function CollectionMenu({
 }: Props) {
  const menu = useMenuState({ modal, placement });
  const [renderModals, setRenderModals] = React.useState(false);
-  const { ui, documents, policies, quickMenu } = useStores();
+  const { ui, documents, policies } = useStores();
  const { t } = useTranslation();
  const history = useHistory();

@@ -110,59 +110,52 @@ function CollectionMenu({
  );

  const can = policies.abilities(collection.id);
+  const items = React.useMemo(
+    () =>
+      filterTemplateItems([
+        {
+          title: t("New document"),
+          visible: can.update,
+          onClick: handleNewDocument,
+        },
+        {
+          title: t("Import document"),
+          visible: can.update,
+          onClick: handleImportDocument,
+        },
+        {
+          type: "separator",
+        },
+        {
+          title: `${t("Edit")}…`,
+          visible: can.update,
+          onClick: () => setShowCollectionEdit(true),
+        },
+        {
+          title: `${t("Permissions")}…`,
+          visible: can.update,
+          onClick: () => setShowCollectionPermissions(true),
+        },
+        {
+          title: `${t("Export")}…`,
+          visible: !!(collection && can.export),
+          onClick: () => setShowCollectionExport(true),
+        },
+        {
+          type: "separator",
+        },
+        {
+          title: `${t("Delete")}…`,
+          visible: !!(collection && can.delete),
+          onClick: () => setShowCollectionDelete(true),
+        },
+      ]),
+    [can, collection, handleNewDocument, handleImportDocument, t]
+  );

-  const items = [
-    {
-      title: t("New document"),
-      visible: can.update,
-      onClick: handleNewDocument,
-    },
-    {
-      title: t("Import document"),
-      visible: can.update,
-      onClick: handleImportDocument,
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: `${t("Edit")}…`,
-      visible: can.update,
-      onClick: () => setShowCollectionEdit(true),
-    },
-    {
-      title: `${t("Permissions")}…`,
-      visible: can.update,
-      onClick: () => setShowCollectionPermissions(true),
-    },
-    {
-      title: `${t("Export")}…`,
-      visible: !!(collection && can.export),
-      onClick: () => setShowCollectionExport(true),
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: `${t("Delete")}…`,
-      visible: !!(collection && can.delete),
-      onClick: () => setShowCollectionDelete(true),
-    },
-  ];
-
-  React.useEffect(() => {
-    const id = `collection-${collection.id}`;
-
-    if (ui.activeCollectionId === collection.id) {
-      quickMenu.addContext({
-        id,
-        items,
-        title: t("Collection"),
-      });
-    }
-
-    return () => quickMenu.removeContext(id);
-  }, [quickMenu, items, collection.id, ui.activeCollectionId, t]);
+  if (!items.length) {
+    return null;
+  }

  return (
    <>
@@ -51,7 +51,7 @@ function DocumentMenu({
  onOpen,
  onClose,
 }: Props) {
-  const { policies, collections, ui, documents, quickMenu } = useStores();
+  const { policies, collections, ui, documents } = useStores();
  const menu = useMenuState({
    modal,
    unstable_preventOverflow: true,
@@ -191,161 +191,6 @@ function DocumentMenu({
    [history, ui, collection, documents, document.id]
  );

-  const items = [
-    {
-      title: t("Restore"),
-      visible: (!!collection && can.restore) || can.unarchive,
-      onClick: handleRestore,
-    },
-    {
-      title: t("Restore"),
-      visible: !collection && !!can.restore,
-      style: {
-        left: -170,
-        position: "relative",
-        top: -40,
-      },
-      hover: true,
-      items: [
-        {
-          type: "heading",
-          title: t("Choose a collection"),
-        },
-        ...collections.orderedData.map((collection) => {
-          const can = policies.abilities(collection.id);
-
-          return {
-            title: (
-              <Flex align="center">
-                <CollectionIcon collection={collection} />
-                <CollectionName>{collection.name}</CollectionName>
-              </Flex>
-            ),
-            onClick: (ev) => handleRestore(ev, { collectionId: collection.id }),
-            disabled: !can.update,
-          };
-        }),
-      ],
-    },
-    {
-      title: t("Unpin"),
-      onClick: document.unpin,
-      visible: !!(showPin && document.pinned && can.unpin),
-    },
-    {
-      title: t("Pin to collection"),
-      onClick: document.pin,
-      visible: !!(showPin && !document.pinned && can.pin),
-    },
-    {
-      title: t("Unstar"),
-      onClick: handleUnstar,
-      visible: document.isStarred && !!can.unstar,
-    },
-    {
-      title: t("Star"),
-      onClick: handleStar,
-      visible: !document.isStarred && !!can.star,
-    },
-    {
-      title: t("Enable embeds"),
-      onClick: document.enableEmbeds,
-      visible: !!showToggleEmbeds && document.embedsDisabled,
-    },
-    {
-      title: t("Disable embeds"),
-      onClick: document.disableEmbeds,
-      visible: !!showToggleEmbeds && !document.embedsDisabled,
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: t("New nested document"),
-      to: newDocumentUrl(document.collectionId, {
-        parentDocumentId: document.id,
-      }),
-      visible: !!can.createChildDocument,
-    },
-    {
-      title: t("Import document"),
-      visible: can.createChildDocument,
-      onClick: handleImportDocument,
-    },
-    {
-      title: `${t("Create template")}…`,
-      onClick: () => setShowTemplateModal(true),
-      visible: !!can.update && !document.isTemplate,
-    },
-    {
-      title: t("Edit"),
-      to: editDocumentUrl(document),
-      visible: !!can.update,
-    },
-    {
-      title: t("Duplicate"),
-      onClick: handleDuplicate,
-      visible: !!can.update,
-    },
-    {
-      title: t("Unpublish"),
-      onClick: handleUnpublish,
-      visible: !!can.unpublish,
-    },
-    {
-      title: t("Archive"),
-      onClick: handleArchive,
-      visible: !!can.archive,
-    },
-    {
-      title: `${t("Delete")}…`,
-      onClick: () => setShowDeleteModal(true),
-      visible: !!can.delete,
-    },
-    {
-      title: `${t("Permanently delete")}…`,
-      onClick: () => setShowPermanentDeleteModal(true),
-      visible: can.permanentDelete,
-    },
-    {
-      title: `${t("Move")}…`,
-      onClick: () => setShowMoveModal(true),
-      visible: !!can.move,
-    },
-    {
-      type: "separator",
-    },
-    {
-      title: t("History"),
-      to: isRevision ? documentUrl(document) : documentHistoryUrl(document),
-      visible: canViewHistory,
-    },
-    {
-      title: t("Download"),
-      onClick: document.download,
-      visible: !!can.download,
-    },
-    {
-      title: t("Print"),
-      onClick: handlePrint,
-      visible: !!showPrint,
-    },
-  ];
-
-  React.useEffect(() => {
-    const id = `document-${document.id}`;
-
-    if (ui.activeDocumentId === document.id) {
-      quickMenu.addContext({
-        id,
-        items,
-        title: t("Document"),
-      });
-    }
-
-    return () => quickMenu.removeContext(id);
-  }, [quickMenu, items, document.id, ui.activeDocumentId, t]);
-
  return (
    <>
      <VisuallyHidden>
@@ -373,7 +218,152 @@ function DocumentMenu({
        onOpen={handleOpen}
        onClose={onClose}
      >
-        <Template {...menu} items={items} />
+        <Template
+          {...menu}
+          items={[
+            {
+              title: t("Restore"),
+              visible: (!!collection && can.restore) || can.unarchive,
+              onClick: handleRestore,
+            },
+            {
+              title: t("Restore"),
+              visible: !collection && !!can.restore,
+              style: {
+                left: -170,
+                position: "relative",
+                top: -40,
+              },
+              hover: true,
+              items: [
+                {
+                  type: "heading",
+                  title: t("Choose a collection"),
+                },
+                ...collections.orderedData.map((collection) => {
+                  const can = policies.abilities(collection.id);
+
+                  return {
+                    title: (
+                      <Flex align="center">
+                        <CollectionIcon collection={collection} />
+                        <CollectionName>{collection.name}</CollectionName>
+                      </Flex>
+                    ),
+                    onClick: (ev) =>
+                      handleRestore(ev, { collectionId: collection.id }),
+                    disabled: !can.update,
+                  };
+                }),
+              ],
+            },
+            {
+              title: t("Unpin"),
+              onClick: document.unpin,
+              visible: !!(showPin && document.pinned && can.unpin),
+            },
+            {
+              title: t("Pin to collection"),
+              onClick: document.pin,
+              visible: !!(showPin && !document.pinned && can.pin),
+            },
+            {
+              title: t("Unstar"),
+              onClick: handleUnstar,
+              visible: document.isStarred && !!can.unstar,
+            },
+            {
+              title: t("Star"),
+              onClick: handleStar,
+              visible: !document.isStarred && !!can.star,
+            },
+            {
+              title: t("Enable embeds"),
+              onClick: document.enableEmbeds,
+              visible: !!showToggleEmbeds && document.embedsDisabled,
+            },
+            {
+              title: t("Disable embeds"),
+              onClick: document.disableEmbeds,
+              visible: !!showToggleEmbeds && !document.embedsDisabled,
+            },
+            {
+              type: "separator",
+            },
+            {
+              title: t("New nested document"),
+              to: newDocumentUrl(document.collectionId, {
+                parentDocumentId: document.id,
+              }),
+              visible: !!can.createChildDocument,
+            },
+            {
+              title: t("Import document"),
+              visible: can.createChildDocument,
+              onClick: handleImportDocument,
+            },
+            {
+              title: `${t("Create template")}…`,
+              onClick: () => setShowTemplateModal(true),
+              visible: !!can.update && !document.isTemplate,
+            },
+            {
+              title: t("Edit"),
+              to: editDocumentUrl(document),
+              visible: !!can.update,
+            },
+            {
+              title: t("Duplicate"),
+              onClick: handleDuplicate,
+              visible: !!can.update,
+            },
+            {
+              title: t("Unpublish"),
+              onClick: handleUnpublish,
+              visible: !!can.unpublish,
+            },
+            {
+              title: t("Archive"),
+              onClick: handleArchive,
+              visible: !!can.archive,
+            },
+            {
+              title: `${t("Delete")}…`,
+              onClick: () => setShowDeleteModal(true),
+              visible: !!can.delete,
+            },
+            {
+              title: `${t("Permanently delete")}…`,
+              onClick: () => setShowPermanentDeleteModal(true),
+              visible: can.permanentDelete,
+            },
+            {
+              title: `${t("Move")}…`,
+              onClick: () => setShowMoveModal(true),
+              visible: !!can.move,
+            },
+            {
+              type: "separator",
+            },
+            {
+              title: t("History"),
+              to: isRevision
+                ? documentUrl(document)
+                : documentHistoryUrl(document),
+              visible: canViewHistory,
+            },
+            {
+              title: t("Download"),
+              onClick: document.download,
+              visible: !!can.download,
+            },
+            {
+              title: t("Print"),
+              onClick: handlePrint,
+              visible: !!showPrint,
+            },
+          ]}
+        />
      </ContextMenu>
      {renderModals && (
        <>
@@ -149,25 +149,27 @@ function CollectionScene() {
            />
          </Action>
          {can.update && (
-            <Action>
-              <Tooltip
-                tooltip={t("New document")}
-                shortcut="n"
-                delay={500}
-                placement="bottom"
-              >
-                <Button
-                  as={Link}
-                  to={collection ? newDocumentUrl(collection.id) : ""}
-                  disabled={!collection}
-                  icon={<PlusIcon />}
+            <>
+              <Action>
+                <Tooltip
+                  tooltip={t("New document")}
+                  shortcut="n"
+                  delay={500}
+                  placement="bottom"
                >
-                  {t("New doc")}
-                </Button>
-              </Tooltip>
-            </Action>
+                  <Button
+                    as={Link}
+                    to={collection ? newDocumentUrl(collection.id) : ""}
+                    disabled={!collection}
+                    icon={<PlusIcon />}
+                  >
+                    {t("New doc")}
+                  </Button>
+                </Tooltip>
+              </Action>
+              <Separator />
+            </>
          )}
-          <Separator />
          <Action>
            <CollectionMenu
              collection={collection}
@@ -33,7 +33,7 @@ type Props = {|
@observer
 class DocumentEditor extends React.Component<Props> {
  @observable activeLinkEvent: ?MouseEvent;
-  @observable ref = React.createRef<HTMLDivElement | HTMLInputElement>();
+  ref = React.createRef<HTMLDivElement | HTMLInputElement>();

  focusAtStart = () => {
    if (this.props.innerRef.current) {
@@ -110,8 +110,6 @@ class DocumentEditor extends React.Component<Props> {
    const normalizedTitle =
      !title && readOnly ? document.titleWithDefault : title;

-    console.log(this.ref.current);
-
    return (
      <Flex auto column>
        {readOnly ? (
@@ -50,10 +50,13 @@ class Drafts extends React.Component<Props> {
  }) => {
    this.props.history.replace({
      pathname: this.props.location.pathname,
-      search: queryString.stringify({
-        ...queryString.parse(this.props.location.search),
-        ...search,
-      }),
+      search: queryString.stringify(
+        {
+          ...queryString.parse(this.props.location.search),
+          ...search,
+        },
+        { skipEmptyString: true }
+      ),
    });
  };

@@ -140,10 +140,13 @@ class Search extends React.Component<Props> {
  }) => {
    this.props.history.replace({
      pathname: this.props.location.pathname,
-      search: queryString.stringify({
-        ...queryString.parse(this.props.location.search),
-        ...search,
-      }),
+      search: queryString.stringify(
+        {
+          ...queryString.parse(this.props.location.search),
+          ...search,
+        },
+        { skipEmptyString: true }
+      ),
    });
  };

@@ -1,81 +0,0 @@
-// @flow
-import { observable, computed, action } from "mobx";
-import * as React from "react";
-import { type MenuItem } from "types";
-
-type QuickMenuContext = {|
-  id: string,
-  title: string,
-  items: MenuItem[],
-  priority?: number,
-|};
-
-class QuickMenuStore {
-  @observable searchTerm: string = "";
-  @observable contextItems: Map<string, QuickMenuContext> = new Map();
-
-  @computed
-  get resolvedMenuItems(): QuickMenuContext[] {
-    let filtered = [];
-
-    this.contextItems.forEach((context) => {
-      const items = context.items.filter(
-        (item) =>
-          !this.searchTerm ||
-          (typeof item.title === "string" &&
-            item.title.toLowerCase().includes(this.searchTerm.toLowerCase()))
-      );
-
-      items.forEach((item, index) => {
-        if (item.items && item.title) {
-          items.splice(
-            index,
-            1,
-            item.items.map((child: MenuItem) => {
-              if (!child.title) {
-                return child;
-              }
-
-              return {
-                ...child,
-                title: (
-                  <>
-                    {item.title} > {child.title}
-                  </>
-                ),
-              };
-            })
-          );
-        }
-      });
-
-      if (items.length) {
-        filtered.push({
-          ...context,
-          items,
-        });
-      }
-    });
-
-    console.log({ filtered });
-    return filtered;
-  }
-
-  @action
-  setSearchTerm(searchTerm: string): void {
-    console.log({ searchTerm });
-    this.searchTerm = searchTerm;
-  }
-
-  @action
-  addContext(context: QuickMenuContext): void {
-    this.contextItems.set(context.id, context);
-  }
-
-  @action
-  removeContext(id: string): void {
-    this.contextItems.delete(id);
-  }
-}
-
-export default QuickMenuStore;
@@ -11,7 +11,6 @@ import IntegrationsStore from "./IntegrationsStore";
 import MembershipsStore from "./MembershipsStore";
 import NotificationSettingsStore from "./NotificationSettingsStore";
 import PoliciesStore from "./PoliciesStore";
-import QuickMenuStore from "./QuickMenuStore";
 import RevisionsStore from "./RevisionsStore";
 import SharesStore from "./SharesStore";
 import UiStore from "./UiStore";
@@ -31,7 +30,6 @@ export default class RootStore {
  notificationSettings: NotificationSettingsStore;
  presence: DocumentPresenceStore;
  policies: PoliciesStore;
-  quickMenu: QuickMenuStore;
  revisions: RevisionsStore;
  shares: SharesStore;
  ui: UiStore;
@@ -51,7 +49,6 @@ export default class RootStore {
    this.notificationSettings = new NotificationSettingsStore(this);
    this.presence = new DocumentPresenceStore();
    this.policies = new PoliciesStore(this);
-    this.quickMenu = new QuickMenuStore();
    this.revisions = new RevisionsStore(this);
    this.shares = new SharesStore(this);
    this.ui = new UiStore();
@@ -18,9 +18,6 @@ class UiStore {

  // systemTheme represents the system UI theme (Settings -> General in macOS)
  @observable systemTheme: "light" | "dark";
-
-  // highlighted items in the sidebar, unfortunately this cannot be accurately
-  // inferred from the route at all times so manually controlled in stoer
  @observable activeDocumentId: ?string;
  @observable activeCollectionId: ?string;
  @observable progressBarVisible: boolean = false;
@@ -58,43 +58,3 @@ export type SearchResult = {
  context: string,
  document: Document,
 };
-
-export type MenuItem =
-  | {|
-      title: React.Node,
-      to: string,
-      visible?: boolean,
-      selected?: boolean,
-      disabled?: boolean,
-    |}
-  | {|
-      title: React.Node,
-      onClick: (event: SyntheticEvent<>) => void | Promise<void>,
-      visible?: boolean,
-      selected?: boolean,
-      disabled?: boolean,
-    |}
-  | {|
-      title: React.Node,
-      href: string,
-      visible?: boolean,
-      selected?: boolean,
-      disabled?: boolean,
-    |}
-  | {|
-      title: React.Node,
-      visible?: boolean,
-      disabled?: boolean,
-      style?: Object,
-      hover?: boolean,
-      items: MenuItem[],
-    |}
-  | {|
-      type: "separator",
-      visible?: boolean,
-    |}
-  | {|
-      type: "heading",
-      visible?: boolean,
-      title: React.Node,
-    |};
@@ -13,6 +13,7 @@
    "dev": "nodemon --exec \"yarn build:server && yarn build:i18n && node --inspect=0.0.0.0 build/server/index.js\" -e js --ignore build/ --ignore app/",
    "lint": "eslint app server shared",
    "deploy": "git push heroku master",
+    "postinstall": "yarn yarn-deduplicate yarn.lock",
    "heroku-postbuild": "yarn build && yarn db:migrate",
    "sequelize:migrate": "sequelize db:migrate",
    "db:create-migration": "sequelize migration:create",
@@ -109,6 +110,7 @@
    "mobx": "^4.15.4",
    "mobx-react": "^6.3.1",
    "natural-sort": "^1.0.0",
+    "node-htmldiff": "^0.9.3",
    "nodemailer": "^6.4.16",
    "outline-icons": "^1.27.0",
    "oy-vey": "^0.10.0",
@@ -118,7 +120,7 @@
    "pg": "^8.5.1",
    "pg-hstore": "^2.3.3",
    "polished": "3.6.5",
-    "query-string": "^4.3.4",
+    "query-string": "^7.0.1",
    "quoted-printable": "^1.0.1",
    "randomstring": "1.1.5",
    "raw-loader": "^0.5.1",
@@ -151,7 +153,7 @@
    "slate-md-serializer": "5.5.4",
    "slug": "^4.0.4",
    "smooth-scroll-into-view-if-needed": "^1.1.29",
-    "socket.io": "^2.3.0",
+    "socket.io": "^2.4.0",
    "socket.io-redis": "^5.4.0",
    "socketio-auth": "^0.1.1",
    "string-replace-to-array": "^1.0.3",
@@ -200,12 +202,13 @@
    "webpack-cli": "^3.3.12",
    "webpack-manifest-plugin": "^3.0.0",
    "webpack-pwa-manifest": "^4.3.0",
-    "workbox-webpack-plugin": "^6.1.0"
+    "workbox-webpack-plugin": "^6.1.0",
+    "yarn-deduplicate": "^3.1.0"
  },
  "resolutions": {
    "prosemirror-view": "1.18.1",
    "dot-prop": "^5.2.0",
    "js-yaml": "^3.13.1"
  },
-  "version": "0.56.0"
-}
+  "version": "0.57.0"
+}
@@ -16,6 +16,7 @@ router.post("events.list", auth(), pagination(), async (ctx) => {
  let {
    sort = "createdAt",
    actorId,
+    documentId,
    collectionId,
    direction,
    name,
@@ -31,10 +32,12 @@ router.post("events.list", auth(), pagination(), async (ctx) => {

  if (actorId) {
    ctx.assertUuid(actorId, "actorId must be a UUID");
-    where = {
-      ...where,
-      actorId,
-    };
+    where = { ...where, actorId };
+  }
+
+  if (documentId) {
+    ctx.assertUuid(documentId, "documentId must be a UUID");
+    where = { ...where, documentId };
  }

  if (collectionId) {
@@ -1,7 +1,7 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import TestServer from "fetch-test-server";
 import app from "../app";
-import { buildEvent } from "../test/factories";
+import { buildEvent, buildUser } from "../test/factories";
 import { flushdb, seed } from "../test/support";

 const server = new TestServer(app.callback());
@@ -101,6 +101,54 @@ describe("#events.list", () => {
    expect(body.data[0].id).toEqual(auditEvent.id);
  });

+  it("should allow filtering by documentId", async () => {
+    const { user, admin, document, collection } = await seed();
+
+    const event = await buildEvent({
+      name: "documents.publish",
+      collectionId: collection.id,
+      documentId: document.id,
+      teamId: user.teamId,
+      actorId: user.id,
+    });
+
+    const res = await server.post("/api/events.list", {
+      body: {
+        token: admin.getJwtToken(),
+        documentId: document.id,
+      },
+    });
+    const body = await res.json();
+
+    expect(res.status).toEqual(200);
+    expect(body.data.length).toEqual(1);
+    expect(body.data[0].id).toEqual(event.id);
+  });
+
+  it("should not return events for documentId without authorization", async () => {
+    const { user, document, collection } = await seed();
+    const actor = await buildUser();
+
+    await buildEvent({
+      name: "documents.publish",
+      collectionId: collection.id,
+      documentId: document.id,
+      teamId: user.teamId,
+      actorId: user.id,
+    });
+
+    const res = await server.post("/api/events.list", {
+      body: {
+        token: actor.getJwtToken(),
+        documentId: document.id,
+      },
+    });
+    const body = await res.json();
+
+    expect(res.status).toEqual(200);
+    expect(body.data.length).toEqual(0);
+  });
+
  it("should allow filtering by event name", async () => {
    const { user, admin, document, collection } = await seed();

@@ -53,8 +53,19 @@ router.post("email", errorHandling(), async (ctx) => {
      });
    }

-    const user =
-      users.find((user) => team && user.teamId === team.id) || users[0];
+    // If there are multiple users with this email address then give precedence
+    // to the one that is active on this subdomain/domain (if any)
+    let user = users.find((user) => team && user.teamId === team.id);
+
+    // A user was found for the email address, but they don't belong to the team
+    // that this subdomain belongs to, we load their team and allow the logic to
+    // continue
+    if (!user) {
+      user = users[0];
+      team = await Team.scope("withAuthenticationProviders").findByPk(
+        user.teamId
+      );
+    }

    if (!team) {
      team = await Team.scope("withAuthenticationProviders").findByPk(
@@ -42,6 +42,27 @@ describe("email", () => {
    expect(mailer.signin).not.toHaveBeenCalled();
  });

+  it("should respond with redirect location when user is SSO enabled on another subdomain", async () => {
+    process.env.URL = "http://localoutline.com";
+    process.env.SUBDOMAINS_ENABLED = "true";
+
+    const user = await buildUser();
+
+    await buildTeam({
+      subdomain: "example",
+    });
+
+    const res = await server.post("/auth/email", {
+      body: { email: user.email },
+      headers: { host: "example.localoutline.com" },
+    });
+    const body = await res.json();
+
+    expect(res.status).toEqual(200);
+    expect(body.redirect).toMatch("slack");
+    expect(mailer.signin).not.toHaveBeenCalled();
+  });
+
  it("should respond with success when user is not SSO enabled", async () => {
    const user = await buildGuestUser();

@@ -41,11 +41,13 @@ export const CollectionNotificationEmail = ({
      <Body>
        <Heading>{collection.name}</Heading>
        <p>
-          {actor.name} {eventName} the collection "{collection.name}".
+          {actor.name} {eventName} the collection “{collection.name}”.
        </p>
        <EmptySpace height={10} />
        <p>
-          <Button href={`${process.env.URL}${collection.url}`}>
+          <Button
+            href={`${process.env.URL}${collection.url}?ref=notification-email`}
+          >
            Open Collection
          </Button>
        </p>
@@ -1,8 +1,10 @@
 // @flow
 import * as React from "react";
+import theme from "../../shared/styles/theme";
 import { User, Document, Team, Collection } from "../models";
 import Body from "./components/Body";
 import Button from "./components/Button";
+import Diff from "./components/Diff";
 import EmailTemplate from "./components/EmailLayout";
 import EmptySpace from "./components/EmptySpace";
 import Footer from "./components/Footer";
@@ -15,6 +17,7 @@ export type Props = {
  document: Document,
  collection: Collection,
  eventName: string,
+  summary: string,
  unsubscribeUrl: string,
 };

@@ -38,26 +41,34 @@ export const DocumentNotificationEmail = ({
  document,
  collection,
  eventName = "published",
+  summary,
  unsubscribeUrl,
 }: Props) => {
+  const link = `${team.url}${document.url}?ref=notification-email`;
+
  return (
    <EmailTemplate>
      <Header />

      <Body>
        <Heading>
-          "{document.title}" {eventName}
+          “{document.title}” {eventName}
        </Heading>
        <p>
          {actor.name} {eventName} the document "{document.title}", in the{" "}
          {collection.name} collection.
        </p>
-        <hr />
-        <EmptySpace height={10} />
-        <p>{document.getSummary()}</p>
-        <EmptySpace height={10} />
+        {summary && (
+          <>
+            <EmptySpace height={20} />
+            <Diff href={link}>
+              <div dangerouslySetInnerHTML={{ __html: summary }} />
+            </Diff>
+            <EmptySpace height={20} />
+          </>
+        )}
        <p>
-          <Button href={`${team.url}${document.url}`}>Open Document</Button>
+          <Button href={link}>Open Document</Button>
        </p>
      </Body>

@@ -65,3 +76,211 @@ export const DocumentNotificationEmail = ({
    </EmailTemplate>
  );
 };
+
+export const css = `
+  font-family: ${theme.fontFamily};
+  font-weight: ${theme.fontWeight};
+  font-size: 1em;
+  line-height: 1.7em;
+
+  pre {
+    white-space: pre-wrap;
+  }
+
+  img {
+    text-align: center;
+    max-width: 100%;
+    max-height: 75vh;
+    clear: both;
+  }
+
+  img.image-right-50 {
+    float: right;
+    width: 50%;
+    margin-left: 2em;
+    margin-bottom: 1em;
+    clear: initial;
+  }
+
+  img.image-left-50 {
+    float: left;
+    width: 50%;
+    margin-right: 2em;
+    margin-bottom: 1em;
+    clear: initial;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin: 1em 0 0.5em;
+    font-weight: 500;
+  }
+
+  .notice {
+    display: flex;
+    align-items: center;
+    background: ${theme.noticeInfoBackground};
+    color: ${theme.noticeInfoText};
+    border-radius: 4px;
+    padding: 8px 16px;
+    margin: 8px 0;
+  }
+
+  .notice-tip {
+    background: ${theme.noticeTipBackground};
+    color: ${theme.noticeTipText};
+  }
+
+  .notice-warning {
+    background: ${theme.noticeWarningBackground};
+    color: ${theme.noticeWarningText};
+  }
+
+  b,
+  strong {
+    font-weight: 600;
+  }
+
+  p {
+    margin: 0;
+  }
+
+  a {
+    color: ${theme.link};
+  }
+
+  ins {
+    background-color: #128a2929;
+    text-decoration: none;
+  }
+
+  del {
+    background-color: ${theme.slateLight};
+    color: ${theme.slate};
+    text-decoration: strikethrough;
+  }
+
+  hr {
+    position: relative;
+    height: 1em;
+    border: 0;
+  }
+  hr:before {
+    content: "";
+    display: block;
+    position: absolute;
+    border-top: 1px solid ${theme.horizontalRule};
+    top: 0.5em;
+    left: 0;
+    right: 0;
+  }
+
+  hr.page-break {
+    page-break-after: always;
+  }
+  hr.page-break:before {
+    border-top: 1px dashed ${theme.horizontalRule};
+  }
+
+  code {
+    border-radius: 4px;
+    border: 1px solid ${theme.codeBorder};
+    padding: 3px 4px;
+    font-family: ${theme.fontFamilyMono};
+    font-size: 85%;
+  }
+
+  mark {
+    border-radius: 1px;
+    color: ${theme.textHighlightForeground};
+    background: ${theme.textHighlight};
+    a {
+      color: ${theme.textHighlightForeground};
+    }
+  }
+
+  ul {
+    padding-left: 0;
+  }
+
+  .checkbox-list-item {
+    list-style: none;
+    padding: 4px 0;
+    margin: 0;
+  }
+
+  .checkbox {
+    font-size: 0;
+    display: block;
+    float: left;
+    white-space: nowrap;
+    width: 12px;
+    height: 12px;
+    margin-top: 2px;
+    margin-right: 8px;
+    border: 1px solid ${theme.textSecondary};
+    border-radius: 3px;
+  }
+
+  pre {
+    display: block;
+    overflow-x: auto;
+    padding: 0.75em 1em;
+    line-height: 1.4em;
+    position: relative;
+    background: ${theme.codeBackground};
+    border-radius: 4px;
+    border: 1px solid ${theme.codeBorder};
+    -webkit-font-smoothing: initial;
+    font-family: ${theme.fontFamilyMono};
+    font-size: 13px;
+    direction: ltr;
+    text-align: left;
+    white-space: pre;
+    word-spacing: normal;
+    word-break: normal;
+    -moz-tab-size: 4;
+    -o-tab-size: 4;
+    tab-size: 4;
+    -webkit-hyphens: none;
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    hyphens: none;
+    margin: 0;
+
+    code {
+      font-size: 13px;
+      background: none;
+      padding: 0;
+      border: 0;
+    }
+  }
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    border-radius: 4px;
+    margin-top: 1em;
+    box-sizing: border-box;
+    * {
+      box-sizing: border-box;
+    }
+    tr {
+      position: relative;
+      border-bottom: 1px solid ${theme.tableDivider};
+    }
+    td,
+    th {
+      position: relative;
+      vertical-align: top;
+      border: 1px solid ${theme.tableDivider};
+      position: relative;
+      padding: 4px 8px;
+      min-width: 100px;
+    }
+  }
+`;
@@ -47,7 +47,7 @@ export const InviteEmail = ({
        </p>
        <EmptySpace height={10} />
        <p>
-          <Button href={teamUrl}>Join now</Button>
+          <Button href={`${teamUrl}?ref=invite-email`}>Join now</Button>
        </p>
      </Body>

@@ -43,7 +43,9 @@ export const WelcomeEmail = ({ teamUrl }: Props) => {
        </p>
        <EmptySpace height={10} />
        <p>
-          <Button href={`${teamUrl}/home`}>View my dashboard</Button>
+          <Button href={`${teamUrl}/home?ref=welcome-email`}>
+            View my dashboard
+          </Button>
        </p>
      </Body>

@@ -0,0 +1,25 @@
+// @flow
+import * as React from "react";
+import theme from "../../../shared/styles/theme";
+
+type Props = {|
+  children: React.Node,
+  href?: string,
+|};
+
+export default ({ children, ...rest }: Props) => {
+  const style = {
+    borderRadius: "4px",
+    background: theme.secondaryBackground,
+    padding: ".5em 1em",
+    color: theme.text,
+    display: "block",
+    textDecoration: "none",
+  };
+
+  return (
+    <a width="100%" style={style} {...rest}>
+      {children}
+    </a>
+  );
+};
@@ -3,9 +3,9 @@ import { Table, TBody, TR, TD } from "oy-vey";
 import * as React from "react";
 import theme from "../../../shared/styles/theme";

-type Props = {
+type Props = {|
  children: React.Node,
-};
+|};

 export default (props: Props) => (
  <Table width="550" padding="40">
@@ -100,6 +100,8 @@ export type RevisionEvent = {
  documentId: string,
  collectionId: string,
  teamId: string,
+  actorId: string,
+  modelId: string,
 };

 export type CollectionImportEvent = {
@@ -13,6 +13,7 @@ import {
  type Props as DocumentNotificationEmailT,
  DocumentNotificationEmail,
  documentNotificationEmailText,
+  css as documentNotificationEmailCSS,
 } from "./emails/DocumentNotificationEmail";
 import { ExportEmail, exportEmailText } from "./emails/ExportEmail";
 import {
@@ -146,8 +147,9 @@ export class Mailer {
    this.sendMail({
      to: opts.to,
      title: `“${opts.document.title}” ${opts.eventName}`,
-      previewText: `${opts.actor.name} ${opts.eventName} a new document`,
+      previewText: `${opts.actor.name} ${opts.eventName} a document`,
      html: <DocumentNotificationEmail {...opts} />,
+      headCSS: documentNotificationEmailCSS,
      text: documentNotificationEmailText(opts),
    });
  };
@@ -30,6 +30,10 @@ io.adapter(
  })
 );

+io.origins((_, callback) => {
+  callback(null, true);
+});
+
 io.of("/").adapter.on("error", (err) => {
  if (err.name === "MaxRetriesPerRequestError") {
    console.error(`Redis error: ${err.message}. Shutting down now.`);
@@ -395,7 +395,11 @@ Collection.prototype.isChildDocument = function (
  let result = false;

  const loopChildren = (documents, input) => {
-    return documents.map((document) => {
+    if (result) {
+      return;
+    }
+
+    documents.forEach((document) => {
      let parents = [...input];
      if (document.id === documentId) {
        result = parents.includes(parentDocumentId);
@@ -403,7 +407,6 @@ Collection.prototype.isChildDocument = function (
        parents.push(document.id);
        loopChildren(document.children, parents);
      }
-      return document;
    });
  };

@@ -1,32 +1,60 @@
 // @flow
 import debug from "debug";
-import type { DocumentEvent, CollectionEvent, Event } from "../events";
+import type {
+  DocumentEvent,
+  RevisionEvent,
+  CollectionEvent,
+  Event,
+} from "../events";
 import mailer from "../mailer";
 import {
  View,
  Document,
  Team,
  Collection,
+  Revision,
  User,
  NotificationSetting,
+  Attachment,
 } from "../models";
 import { Op } from "../sequelize";
+import markdownDiff from "../utils/markdownDiff";
+
+import parseAttachmentIds from "../utils/parseAttachmentIds";
+import { getSignedImageUrl } from "../utils/s3";

 const log = debug("services");

+async function replaceImageAttachments(text: string) {
+  const attachmentIds = parseAttachmentIds(text);
+
+  await Promise.all(
+    attachmentIds.map(async (id) => {
+      const attachment = await Attachment.findByPk(id);
+      if (attachment) {
+        const accessUrl = await getSignedImageUrl(attachment.key, 86400 * 4);
+        text = text.replace(attachment.redirectUrl, accessUrl);
+      }
+    })
+  );
+
+  return text;
+}
+
 export default class Notifications {
  async on(event: Event) {
    switch (event.name) {
      case "documents.publish":
-      case "documents.update.debounced":
-        return this.documentUpdated(event);
+        return this.documentPublished(event);
+      case "revisions.create":
+        return this.revisionCreated(event);
      case "collections.create":
        return this.collectionCreated(event);
      default:
    }
  }

-  async documentUpdated(event: DocumentEvent) {
+  async documentPublished(event: DocumentEvent) {
    // never send notifications when batch importing documents
    if (event.data && event.data.source === "import") return;

@@ -45,10 +73,7 @@ export default class Notifications {
          [Op.ne]: document.lastModifiedById,
        },
        teamId: document.teamId,
-        event:
-          event.name === "documents.publish"
-            ? "documents.publish"
-            : "documents.update",
+        event: "documents.publish",
      },
      include: [
        {
@@ -59,25 +84,14 @@ export default class Notifications {
      ],
    });

-    const eventName =
-      event.name === "documents.publish" ? "published" : "updated";
+    const eventName = "published";

    for (const setting of notificationSettings) {
-      // For document updates we only want to send notifications if
-      // the document has been edited by the user with this notification setting
-      // This could be replaced with ability to "follow" in the future
-      if (
-        eventName === "updated" &&
-        !document.collaboratorIds.includes(setting.userId)
-      ) {
-        return;
-      }
-
      // Check the user has access to the collection this document is in. Just
      // because they were a collaborator once doesn't mean they still are.
      const collectionIds = await setting.user.collectionIds();
      if (!collectionIds.includes(document.collectionId)) {
-        return;
+        continue;
      }

      // If this user has viewed the document since the last update was made
@@ -96,7 +110,7 @@ export default class Notifications {
        log(
          `suppressing notification to ${setting.userId} because update viewed`
        );
-        return;
+        continue;
      }

      mailer.documentNotification({
@@ -105,12 +119,119 @@ export default class Notifications {
        document,
        team,
        collection,
+        summary: document.getSummary(),
        actor: document.updatedBy,
        unsubscribeUrl: setting.unsubscribeUrl,
      });
    }
  }

+  async revisionCreated(event: RevisionEvent) {
+    const revision = await Revision.findByPk(event.modelId, {
+      include: [
+        {
+          model: Document,
+          as: "document",
+          include: [
+            {
+              model: Collection,
+              as: "collection",
+            },
+          ],
+        },
+      ],
+    });
+    if (!revision) return;
+
+    const { document } = revision;
+    const { collection } = document;
+    if (!collection || !document) return;
+
+    const team = await Team.findByPk(document.teamId);
+    if (!team) return;
+
+    const notificationSettings = await NotificationSetting.findAll({
+      where: {
+        userId: {
+          [Op.ne]: revision.userId,
+        },
+        teamId: document.teamId,
+        event: "documents.update",
+      },
+      include: [
+        {
+          model: User,
+          required: true,
+          as: "user",
+        },
+      ],
+    });
+
+    const eventName = "updated";
+
+    for (const setting of notificationSettings) {
+      // For document updates we only want to send notifications if
+      // the document has been edited by the user with this notification setting
+      // This could be replaced with ability to "follow" in the future
+      if (!document.collaboratorIds.includes(setting.userId)) {
+        continue;
+      }
+
+      // Check the user has access to the collection this document is in. Just
+      // because they were a collaborator once doesn't mean they still are.
+      const collectionIds = await setting.user.collectionIds();
+      if (!collectionIds.includes(document.collectionId)) {
+        continue;
+      }
+
+      // If this user has viewed the document since the last update was made
+      // then we can avoid sending them a useless notification, yay.
+      const view = await View.findOne({
+        where: {
+          userId: setting.userId,
+          documentId: event.documentId,
+          updatedAt: {
+            [Op.gt]: document.updatedAt,
+          },
+        },
+      });
+
+      if (view) {
+        log(
+          `suppressing notification to ${setting.userId} because update viewed`
+        );
+        continue;
+      }
+
+      const previous = await Revision.findOne({
+        where: {
+          documentId: document.id,
+          createdAt: {
+            [Op.lt]: revision.createdAt,
+          },
+        },
+        order: [["createdAt", "DESC"]],
+      });
+
+      let summary = markdownDiff(previous ? previous.text : "", revision.text);
+
+      console.log(summary);
+      summary = await replaceImageAttachments(summary);
+      console.log(summary);
+
+      mailer.documentNotification({
+        to: setting.user.email,
+        eventName,
+        document,
+        team,
+        collection,
+        summary,
+        actor: revision.user,
+        unsubscribeUrl: setting.unsubscribeUrl,
+      });
+    }
+  }
+
  async collectionCreated(event: CollectionEvent) {
    const collection = await Collection.findByPk(event.collectionId, {
      include: [
@@ -1,6 +1,6 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import mailer from "../mailer";
-import { View, NotificationSetting } from "../models";
+import { View, NotificationSetting, Revision } from "../models";
 import { buildDocument, buildCollection, buildUser } from "../test/factories";
 import { flushdb } from "../test/support";
 import NotificationsService from "./notifications";
@@ -89,9 +89,10 @@ describe("documents.publish", () => {
  });
 });

-describe("documents.update.debounced", () => {
+describe("revisions.create", () => {
  test("should send a notification to other collaborator", async () => {
    const document = await buildDocument();
+    const revision = await Revision.createFromDocument(document);
    const collaborator = await buildUser({ teamId: document.teamId });
    document.collaboratorIds = [collaborator.id];
    await document.save();
@@ -103,8 +104,9 @@ describe("documents.update.debounced", () => {
    });

    await Notifications.on({
-      name: "documents.update.debounced",
+      name: "revisions.create",
      documentId: document.id,
+      modelId: revision.id,
      collectionId: document.collectionId,
      teamId: document.teamId,
      actorId: document.createdById,
@@ -115,6 +117,7 @@ describe("documents.update.debounced", () => {

  test("should not send a notification if viewed since update", async () => {
    const document = await buildDocument();
+    const revision = await Revision.createFromDocument(document);
    const collaborator = await buildUser({ teamId: document.teamId });
    document.collaboratorIds = [collaborator.id];
    await document.save();
@@ -128,9 +131,10 @@ describe("documents.update.debounced", () => {
    await View.touch(document.id, collaborator.id, true);

    await Notifications.on({
-      name: "documents.update.debounced",
+      name: "revisions.create",
      documentId: document.id,
      collectionId: document.collectionId,
+      modelId: revision.id,
      teamId: document.teamId,
      actorId: document.createdById,
    });
@@ -138,12 +142,13 @@ describe("documents.update.debounced", () => {
    expect(mailer.documentNotification).not.toHaveBeenCalled();
  });

-  test("should not send a notification to last editor", async () => {
+  test("should not send a notification to the last user that modified", async () => {
    const user = await buildUser();
    const document = await buildDocument({
      teamId: user.teamId,
      lastModifiedById: user.id,
    });
+    const revision = await Revision.createFromDocument(document);

    await NotificationSetting.create({
      userId: user.id,
@@ -152,8 +157,9 @@ describe("documents.update.debounced", () => {
    });

    await Notifications.on({
-      name: "documents.update.debounced",
+      name: "revisions.create",
      documentId: document.id,
+      modelId: revision.id,
      collectionId: document.collectionId,
      teamId: document.teamId,
      actorId: document.createdById,
@@ -1,6 +1,6 @@
 // @flow
 import type { DocumentEvent, RevisionEvent } from "../events";
-import { Revision, Document } from "../models";
+import { Revision, Document, Event } from "../models";

 export default class Revisions {
  async on(event: DocumentEvent | RevisionEvent) {
@@ -22,7 +22,15 @@ export default class Revisions {
          return;
        }

-        await Revision.createFromDocument(document);
+        const revision = await Revision.createFromDocument(document);
+        Event.add({
+          name: "revisions.create",
+          documentId: document.id,
+          collectionId: document.collectionId,
+          modelId: revision.id,
+          teamId: document.teamId,
+          actorId: revision.userId,
+        });

        break;
      }
@@ -0,0 +1,34 @@
+# Heading 1
+
+## Heading 2
+
+This is a test paragraph
+
+This is a second test paragraph. This is a second sentence.
+
+This is a another test paragraph. This is a another sentence.
+
+- list item 1
+- list item 2
+
+```
+this is a codeblock
+```
+
+:::info
+This is an info block
+:::
+
+!!This is a placeholder!!
+
+==this is a highlight==
+
+- [ ] checklist item 1
+- [ ] checklist item 2
+- [x] checklist item 3
+
+same on both sides
+
+same on both sides
+
+same on both sides
@@ -0,0 +1,37 @@
+# Heading 1
+
+## Heading 2
+
+This is a test paragraph
+
+This is a second test paragraph. This is a second sentence.
+
+This is a another test paragraph. This is a another sentence.
+
+- list item 1
+
+```
+this is a codeblock
+```
+
+This is a new paragraph.
+
+:::info
+This is an info block
+:::
+
+!!This is a placeholder!!
+
+==this is a highlight==
+
+- [x] checklist item 1
+- [x] checklist item 2
+- [ ] checklist item 3
+- [ ] checklist item 4
+- [x] checklist item 5
+
+same on both sides
+
+same on both sides
+
+same on both sides
@@ -2,9 +2,11 @@
 require("dotenv").config({ silent: true });

 // test environment variables
+process.env.URL = "http://localhost:3000";
 process.env.DATABASE_URL = process.env.DATABASE_URL_TEST;
 process.env.NODE_ENV = "test";
 process.env.GOOGLE_CLIENT_ID = "123";
+process.env.AZURE_CLIENT_ID = "";
 process.env.SLACK_KEY = "123";
 process.env.DEPLOYMENT = "";
 process.env.ALLOWED_DOMAINS = "allowed-domain.com";
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should diff a complex document 1`] = `
+"<p>This is a second test paragraph. This is a second sentence.</p>
+<p>This is a another test paragraph. This is a another sentence.</p>
+<ul>
+<li>list item 1</li>
+<li data-diff-node=\\"del\\" data-operation-index=\\"1\\"><del data-operation-index=\\"1\\">list item 2</del></li></ul>
+<pre><code>this is a codeblock
+</code></pre><p data-diff-node=\\"ins\\" data-operation-index=\\"3\\"><ins data-operation-index=\\"3\\">This is a new paragraph.</ins></p>
+<div class=\\"notice notice-info\\">
+<p>This is an info block</p>
+</div>
+<p><span class=\\"placeholder\\">This is a placeholder</span></p>
+<p><span class=\\"highlight\\">this is a highlight</span></p>
+<ul>
+<li class=\\"checkbox-list-item\\"><span class=\\"checkbox checked\\">[<del data-operation-index=\\"5\\"> ]</del><ins data-operation-index=\\"5\\">x]</ins></span>checklist item 1</li><li class=\\"checkbox-list-item\\"><span class=\\"checkbox checked\\" data-diff-node=\\"ins\\" data-operation-index=\\"7\\"><ins data-operation-index=\\"7\\">[x]</ins></span><ins data-operation-index=\\"7\\">checklist item 2</ins></li>
+<li class=\\"checkbox-list-item\\"><span class=\\"checkbox \\">[ ]</span>checklist item <del data-operation-index=\\"9\\">2</del><ins data-operation-index=\\"9\\">3</ins></li><li class=\\"checkbox-list-item\\"><span class=\\"checkbox \\" data-diff-node=\\"ins\\" data-operation-index=\\"9\\"><ins data-operation-index=\\"9\\">[ ]</ins></span><ins data-operation-index=\\"9\\">checklist item 4</ins></li>
+<li class=\\"checkbox-list-item\\"><span class=\\"checkbox checked\\">[x]</span>checklist item <del data-operation-index=\\"11\\">3</del><ins data-operation-index=\\"11\\">5</ins></li>
+</ul>"
+`;
+
+exports[`should return everything inserted when previously empty 1`] = `
+"<h1 data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">Heading 1</ins></h1><h2 data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">Heading 2</ins></h2><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">This is a test paragraph</ins></p><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">This is a second test paragraph. This is a second sentence.</ins></p><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">This is a another test paragraph. This is a another sentence.</ins></p><ul data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><li data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">list item 1</ins></li><li data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">list item 2</ins></li></ul><pre data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><code data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">this is a codeblock
+</ins></code></pre><div class=\\"notice notice-info\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">This is an info block</ins></p></div><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><span class=\\"placeholder\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">This is a placeholder</ins></span></p><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><span class=\\"highlight\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">this is a highlight</ins></span></p><ul data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><li class=\\"checkbox-list-item\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><span class=\\"checkbox \\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">[ ]</ins></span><ins data-operation-index=\\"0\\">checklist item 1</ins></li><li class=\\"checkbox-list-item\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><span class=\\"checkbox \\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">[ ]</ins></span><ins data-operation-index=\\"0\\">checklist item 2</ins></li><li class=\\"checkbox-list-item\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><span class=\\"checkbox checked\\" data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">[x]</ins></span><ins data-operation-index=\\"0\\">checklist item 3</ins></li></ul><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">same on both sides</ins></p><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">same on both sides</ins></p><p data-diff-node=\\"ins\\" data-operation-index=\\"0\\"><ins data-operation-index=\\"0\\">same on both sides</ins></p>"
+`;
@@ -0,0 +1,57 @@
+// @flow
+import { findIndex, findLastIndex } from "lodash";
+import diff from "node-htmldiff";
+import { renderToHtml } from "rich-markdown-editor";
+
+export default function markdownDiff(
+  before: string,
+  after: string,
+  fullDiff: boolean = false,
+  buffer: number = 1
+) {
+  // The basic idea here is to first render the Markdown to HTML, then diff the
+  // HTML - both sides will have valid HTML so we should have a valid diff as well
+
+  const beforeHtml = renderToHtml(before);
+  const afterHtml = renderToHtml(after);
+  const diffHtml = diff(beforeHtml, afterHtml);
+
+  if (fullDiff) {
+    return diffHtml;
+  }
+
+  if (before === after) {
+    return "";
+  }
+
+  // Split diff at paragraphs and find the first and last changed tags
+  // so we can chop around paragraphs rather than return the entire document.
+  //
+  // In an ideal world we'd use an AST here and parse that rather than be doing
+  // operations on strings. I hope this can be revisted in the future with an
+  // improved diffing library.
+  const newParagraph = /(?:^|\n)<p>/;
+  let lines = diffHtml.split(newParagraph);
+
+  const firstChangedLineIndex = findIndex(
+    lines,
+    (value) => value.includes("<ins ") || value.includes("<del ")
+  );
+  const lastChangedLineIndex = findLastIndex(
+    lines,
+    (value) => value.includes("</ins>") || value.includes("</del>")
+  );
+
+  const start = Math.max(0, firstChangedLineIndex - buffer);
+  const end = Math.min(lines.length, lastChangedLineIndex + buffer);
+  lines = lines.slice(start, end);
+
+  if (!lines.length) {
+    return "";
+  }
+
+  return [start > 0 ? "" : undefined, ...lines]
+    .filter((x) => x !== undefined)
+    .join("\n<p>")
+    .trim();
+}
@@ -0,0 +1,55 @@
+// @flow
+import fs from "fs";
+import path from "path";
+import markdownDiff from "./markdownDiff";
+
+it("should diff a complex document", async () => {
+  const before = await fs.promises.readFile(
+    path.resolve(process.cwd(), "server", "test", "fixtures", "complex.md"),
+    "utf8"
+  );
+
+  const after = await fs.promises.readFile(
+    path.resolve(
+      process.cwd(),
+      "server",
+      "test",
+      "fixtures",
+      "complexModified.md"
+    ),
+    "utf8"
+  );
+
+  const diff = markdownDiff(before, after);
+  expect(diff).toMatchSnapshot();
+});
+
+it("should return empty string when both sides are empty", () => {
+  const diff = markdownDiff("", "");
+  expect(diff).toEqual("");
+});
+
+it("should return everything inserted when previously empty", async () => {
+  const content = await fs.promises.readFile(
+    path.resolve(process.cwd(), "server", "test", "fixtures", "complex.md"),
+    "utf8"
+  );
+
+  const diff = markdownDiff("", content);
+  expect(diff).toMatchSnapshot();
+});
+
+it("should return empty for changed nodes", async () => {
+  // Note: This isn't ideal behavior, but it is current behavior. If the diffing
+  // library is improved then we could potentially render the old + new heading
+  // with ins/del tags as appropriate.
+  const diff = markdownDiff("# Heading", "## Heading");
+  expect(diff).toEqual("");
+});
+
+it("should return deleted nodes", async () => {
+  const diff = markdownDiff("![caption](/image.png)", "");
+  expect(diff).toEqual(
+    '<p><del data-operation-index="0"><img src="/image.png" alt="caption"></del></p>'
+  );
+});
@@ -163,13 +163,13 @@ export const deleteFromS3 = (key: string) => {
    .promise();
 };

-export const getSignedImageUrl = async (key: string) => {
+export const getSignedImageUrl = async (key: string, expires: number = 60) => {
  const isDocker = process.env.AWS_S3_UPLOAD_BUCKET_URL.match(/http:\/\/s3:/);

  const params = {
    Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
    Key: key,
-    Expires: 60,
+    Expires: expires,
  };

  return isDocker
@@ -109,8 +109,6 @@
  "Dismiss": "Dismiss",
  "Keyboard shortcuts": "Keyboard shortcuts",
  "Back": "Back",
-  "Quick menu": "Quick menu",
-  "Search actions": "Search actions",
  "Collections could not be loaded, please reload the app": "Collections could not be loaded, please reload the app",
  "New collection": "New collection",
  "Collections": "Collections",
@@ -141,14 +139,14 @@
  "Previous page": "Previous page",
  "Next page": "Next page",
  "Could not import file": "Could not import file",
-  "API documentation": "API documentation",
-  "Changelog": "Changelog",
-  "Send us feedback": "Send us feedback",
-  "Report a bug": "Report a bug",
  "Appearance": "Appearance",
  "System": "System",
  "Light": "Light",
  "Dark": "Dark",
+  "API documentation": "API documentation",
+  "Changelog": "Changelog",
+  "Send us feedback": "Send us feedback",
+  "Report a bug": "Report a bug",
  "Log out": "Log out",
  "Show path to document": "Show path to document",
  "Path to document": "Path to document",
@@ -172,6 +170,7 @@
  "Document archived": "Document archived",
  "Document restored": "Document restored",
  "Document unpublished": "Document unpublished",
+  "Document options": "Document options",
  "Restore": "Restore",
  "Choose a collection": "Choose a collection",
  "Unpin": "Unpin",
@@ -187,8 +186,6 @@
  "History": "History",
  "Download": "Download",
  "Print": "Print",
-  "Document": "Document",
-  "Document options": "Document options",
  "Move {{ documentName }}": "Move {{ documentName }}",
  "Delete {{ documentName }}": "Delete {{ documentName }}",
  "Permanently delete {{ documentName }}": "Permanently delete {{ documentName }}",
@@ -181,14 +181,14 @@
  "Create template": "Criar Template",
  "Duplicate": "Duplicar",
  "Unpublish": "Cancelar publicação",
-  "Permanently delete": "Permanently delete",
+  "Permanently delete": "Apagar permanentemente",
  "Move": "Mover",
  "History": "Histórico",
  "Download": "Fazer download",
  "Print": "Imprimir",
  "Move {{ documentName }}": "Mover {{ documentName }}",
  "Delete {{ documentName }}": "Excluir {{ documentName }}",
-  "Permanently delete {{ documentName }}": "Permanently delete {{ documentName }}",
+  "Permanently delete {{ documentName }}": "Apagar permanentemente {{ documentName }}",
  "Edit group": "Editar grupo",
  "Delete group": "Remover grupo",
  "Group options": "Opções do grupo",
@@ -314,8 +314,8 @@
  "I’m sure – Delete": "Tenho certeza - Excluir  ",
  "Archiving": "Arquivando",
  "Couldn’t create the document, try again?": "Não foi possível criar o documento, deseja tentar novamente?",
-  "Document permanently deleted": "Document permanently deleted",
-  "Are you sure you want to permanently delete the <em>{{ documentTitle }}</em> document? This action is immediate and cannot be undone.": "Are you sure you want to permanently delete the <em>{{ documentTitle }}</em> document? This action is immediate and cannot be undone.",
+  "Document permanently deleted": "Documento apagado permanentemente",
+  "Are you sure you want to permanently delete the <em>{{ documentTitle }}</em> document? This action is immediate and cannot be undone.": "Tem certeza de que deseja apagar permanentemente o documento <em>{{ documentTitle }}</em> Esta ação é imediata e não pode ser desfeita.",
  "Search documents": "Procurar documentos",
  "No documents found for your filters.": "Nenhum documento foi encontrado para seus filtros.",
  "You’ve not got any drafts at the moment.": "Você não tem rascunhos no momento.",
@@ -137,7 +137,7 @@ export const light = {
  placeholder: "#a2b2c3",

  sidebarBackground: colors.warmGrey,
-  sidebarItemBackground: colors.black10,
+  sidebarItemBackground: "#d7e0ea",
  sidebarText: "rgb(78, 92, 110)",
  backdrop: "rgba(0, 0, 0, 0.2)",
  shadow: "rgba(0, 0, 0, 0.2)",
@@ -2354,6 +2354,11 @@
  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 abab@^2.0.3:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
@@ -2736,11 +2741,6 @@ async-each@^1.0.1:
  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==

-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 asynckit@^0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -3087,11 +3087,6 @@ base64-arraybuffer@0.1.4:
  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=

-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
 base64-js@^1.0.2, base64-js@^1.2.0, base64-js@^1.3.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -3132,13 +3127,6 @@ before-after-hook@^2.0.0:
  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==

-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
 big-integer@^1.6.17:
  version "1.6.48"
  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
@@ -3616,11 +3604,6 @@ call-bind@^1.0.0, call-bind@^1.0.2:
    function-bind "^1.1.1"
    get-intrinsic "^1.0.2"

-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
 callsites@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -4218,12 +4201,7 @@ convert-units@^2.3.4:
    lodash.foreach "2.3.x"
    lodash.keys "2.3.x"

-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-cookie@^0.4.1:
+cookie@^0.4.1, cookie@~0.4.1:
  version "0.4.1"
  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
@@ -5076,10 +5054,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
  dependencies:
    once "^1.4.0"

-engine.io-client@~3.4.0:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
-  integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==
+engine.io-client@~3.5.0:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
+  integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
  dependencies:
    component-emitter "~1.3.0"
    component-inherit "0.0.3"
@@ -5089,8 +5067,8 @@ engine.io-client@~3.4.0:
    indexof "0.0.1"
    parseqs "0.0.6"
    parseuri "0.0.6"
-    ws "~6.1.0"
-    xmlhttprequest-ssl "~1.5.4"
+    ws "~7.4.2"
+    xmlhttprequest-ssl "~1.6.2"
    yeast "0.1.2"

 engine.io-parser@~2.2.0:
@@ -5104,17 +5082,17 @@ engine.io-parser@~2.2.0:
    blob "0.0.5"
    has-binary2 "~1.0.2"

-engine.io@~3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"
-  integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==
+engine.io@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
+  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
  dependencies:
    accepts "~1.3.4"
    base64id "2.0.0"
-    cookie "0.3.1"
+    cookie "~0.4.1"
    debug "~4.1.0"
    engine.io-parser "~2.2.0"
-    ws "^7.1.2"
+    ws "~7.4.2"

 enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
  version "4.3.0"
@@ -9459,6 +9437,11 @@ node-gyp-build@^3.8.0:
  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.9.0.tgz#53a350187dd4d5276750da21605d1cb681d09e25"
  integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==

+node-htmldiff@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/node-htmldiff/-/node-htmldiff-0.9.3.tgz#020704e381597e5e449a4708996edf23eebb7fcc"
+  integrity sha1-AgcE44FZfl5EmkcImW7fI+67f8w=
+
 node-int64@^0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -9632,16 +9615,11 @@ oauth@0.9.x:
  resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
  integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE=

-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
 object-copy@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -10078,25 +10056,11 @@ parse5@^6.0.1:
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==

-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
 parseqs@0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==

-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
 parseuri@0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
@@ -10793,18 +10757,10 @@ qs@~6.5.2:
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

-query-string@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-query-string@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.0.tgz#aaad2c8d5c6a6d0c6afada877fecbd56af79e609"
-  integrity sha512-Iy7moLybliR5ZgrK/1R3vjrXq03S13Vz4Rbm5Jg3EFq1LUmQppto0qtXz4vqZ386MSRjZgnTSZ9QC+NZOSd/XA==
+query-string@^7.0.0, query-string@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.1.tgz#45bd149cf586aaa582dffc7ec7a8ad97dd02f75d"
+  integrity sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==
  dependencies:
    decode-uri-component "^0.2.0"
    filter-obj "^1.1.0"
@@ -12173,23 +12129,20 @@ socket.io-adapter@~1.1.0:
  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==

-socket.io-client@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"
-  integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==
+socket.io-client@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
+  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
  dependencies:
    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    engine.io-client "~3.4.0"
+    component-emitter "~1.3.0"
+    debug "~3.1.0"
+    engine.io-client "~3.5.0"
    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
    socket.io-parser "~3.3.0"
    to-array "0.1.4"

@@ -12222,16 +12175,16 @@ socket.io-redis@^5.4.0:
    socket.io-adapter "~1.1.0"
    uid2 "0.0.3"

-socket.io@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb"
-  integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==
+socket.io@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.0.tgz#01030a2727bd8eb2e85ea96d69f03692ee53d47e"
+  integrity sha512-9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==
  dependencies:
    debug "~4.1.0"
-    engine.io "~3.4.0"
+    engine.io "~3.5.0"
    has-binary2 "~1.0.2"
    socket.io-adapter "~1.1.0"
-    socket.io-client "2.3.0"
+    socket.io-client "2.4.0"
    socket.io-parser "~3.4.0"

 socketio-auth@^0.1.1:
@@ -12498,11 +12451,6 @@ streamsearch@0.1.2:
  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=

-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 strict-uri-encode@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -14277,17 +14225,10 @@ write@1.0.3:
  dependencies:
    mkdirp "^0.5.1"

-ws@^7.1.2, ws@^7.2.3:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
-
-ws@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^7.2.3, ws@~7.4.2:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==

 x-xss-protection@1.3.0:
  version "1.3.0"
@@ -14355,10 +14296,10 @@ xmlchars@^2.2.0:
  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==

-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+xmlhttprequest-ssl@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
+  integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==

 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
  version "4.0.2"
@@ -14447,6 +14388,15 @@ yargs@^15.1.0, yargs@^15.4.1:
    y18n "^4.0.0"
    yargs-parser "^18.1.2"

+yarn-deduplicate@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-3.1.0.tgz#3018d93e95f855f236a215b591fe8bc4bcabba3e"
+  integrity sha512-q2VZ6ThNzQpGfNpkPrkmV7x5HT9MOhCUsTxVTzyyZB0eSXz1NTodHn+r29DlLb+peKk8iXxzdUVhQG9pI7moFw==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    commander "^6.1.0"
+    semver "^7.3.2"
+
 yeast@0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
Author	SHA1	Message	Date
Tom Moor	d4c594423f	More email styling	2021-07-08 22:38:42 -04:00
Tom Moor	2bf237d54b	Merge branch 'main' into email-diff	2021-07-08 21:20:18 -04:00
Tom Moor	9a1c8f07d1	feat: Add documentId filter to events.list (#2287 )	2021-07-08 10:12:06 -07:00
Tom Moor	241cb11493	chore: Automate running yarn-deduplicate, see comment: https://github.com/outline/outline/pull/2283\#discussion_r665301770	2021-07-07 22:26:56 -04:00
Saumya Pandey	8195791bb2	fix: Make search query string user friendly (#2283 ) * Upgrade query-string package and skip empty string * Run yarn-deduplicate command	2021-07-07 18:45:40 -07:00
Saumya Pandey	b037ae5dc1	fix: Improve isChildDocument performance (#2284 )	2021-07-07 04:53:40 -07:00
Tom Moor	aeba8ce4eb	fix: Empty context menu when user does not have permission to update collection	2021-07-06 22:02:31 -04:00
Tom Moor	3565e68725	Merge branch 'main' into email-diff	2021-07-06 20:43:51 -04:00
Tom Moor	429c5fba85	0.57.0	2021-07-06 09:12:54 -04:00
Tom Moor	9495ddba25	fix: Restore previous WSS CORS behavior	2021-07-05 23:01:25 -04:00
dependabot[bot]	486a60e97c	chore(deps): bump socket.io from 2.3.0 to 2.4.0 (#1831 ) Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/2.4.0/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/compare/2.3.0...2.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-07-05 17:11:40 -07:00
Tom Moor	c687745263	fix: E-mail signin on incorrect subdomain should allow the process to continue instead of error closes #2276	2021-07-05 19:25:21 -04:00
Translate-O-Tron	1b92993b90	fix: New Portuguese, Brazilian translations from Crowdin (#2271 )	2021-07-05 13:37:09 -07:00
Tom Moor	181a20a268	fix: More context menu fixes	2021-07-05 16:35:46 -04:00
Tom Moor	f8ffa4e25a	tweak sidebar item background	2021-07-04 18:44:09 -04:00
Tom Moor	61039e9d0d	Allow images in email diff	2021-06-25 09:41:34 -07:00
Tom Moor	6d09122d56	test: Deletion	2021-06-24 20:10:42 -07:00
Tom Moor	5fb6097153	Improved diff	2021-06-23 23:58:32 -07:00
Tom Moor	ec17874568	Remove test harness	2021-06-22 07:35:38 -07:00
Tom Moor	40c3e9e85f	test	2021-06-22 07:27:55 -07:00
Tom Moor	9f739f3788	Merge main	2021-06-22 07:26:45 -07:00
Tom Moor	f6837b4742	wip	2021-06-20 23:15:04 -07:00
Tom Moor	1560e3c9f7	refactor	2021-06-20 12:49:15 -07:00
Tom Moor	ca74908dc5	test	2021-06-20 00:20:37 -07:00
Tom Moor	de7ec1119b	Integrate into mailer, basic styling	2021-06-19 23:50:36 -07:00
Tom Moor	2093b4297f	Merge main	2021-06-19 17:05:19 -07:00
Nan Yu	3df82c500b	wip	2021-02-21 11:52:00 -08:00