pulled master, moved locale entry to new location

2017-12-10 15:22:15 -06:00
parent eec5d350fd 26c9b9fa27
commit 072ab191cc
77 changed files with 1611 additions and 175 deletions
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
@ -16,6 +16,7 @@ import {
  ReportModal,
  SettingsModal,
  EmbedModal,
+  ListEditor,
 } from 'flavours/glitch/util/async-components';

 const MODAL_COMPONENTS = {
@ -31,6 +32,7 @@ const MODAL_COMPONENTS = {
  'SETTINGS': SettingsModal,
  'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
  'EMBED': EmbedModal,
+  'LIST_EDITOR': ListEditor,
 };

 export default class ModalRoot extends React.PureComponent {