Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/frontend_refactor

2020-01-28 11:29:26 -05:00
parent c00c202d39 1a6afcdd2b
commit 0a3c6cea89
225 changed files with 5598 additions and 2652 deletions
--- a/app/javascript/gabsocial/reducers/settings.js
+++ b/app/javascript/gabsocial/reducers/settings.js
@@ -24,6 +24,12 @@ const initialState = ImmutableMap({
    }),
  }),

+  group: ImmutableMap({
+    shows: ImmutableMap({
+      reply: true,
+    }),
+  }),
+
  notifications: ImmutableMap({
    alerts: ImmutableMap({
      follow: true,
@@ -57,6 +63,10 @@ const initialState = ImmutableMap({
  }),

  community: ImmutableMap({
+    other: ImmutableMap({
+      allFediverse: false,
+      onlyMedia: false,
+    }),
    regex: ImmutableMap({
      body: '',
    }),