aboutsummaryrefslogtreecommitdiff
path: root/src/App.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-07-05 06:53:29 +0000
committerShpuld Shpludson <shp@cock.li>2020-07-05 06:53:29 +0000
commitaf4a26b5882807d834c8fcfdf5d10121f63d18d5 (patch)
tree6b56d027f3231c0a7c5a18cee1ebd6d010cd7e66 /src/App.js
parentacc3b083aa46aa9c165578380b16ef86e6fb596b (diff)
parent9cac5d94dd78ea331254307871e876da7e266a6f (diff)
Merge branch 'feat/allow-use-without-cookies' into 'develop'
Fix #815: Allow use without cookies, Add a global notice popup system Closes #815 See merge request pleroma/pleroma-fe!1166
Diffstat (limited to 'src/App.js')
-rw-r--r--src/App.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/App.js b/src/App.js
index 040138c9..92c4e2f5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,6 +13,7 @@ import MobilePostStatusButton from './components/mobile_post_status_button/mobil
import MobileNav from './components/mobile_nav/mobile_nav.vue'
import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
+import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
import { windowWidth } from './services/window_utils/window_utils'
export default {
@@ -32,7 +33,8 @@ export default {
MobileNav,
SettingsModal,
UserReportingModal,
- PostStatusModal
+ PostStatusModal,
+ GlobalNoticeList
},
data: () => ({
mobileActivePanel: 'timeline',