Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'

Update mastofe to bundle-2019-06-26 See merge request pleroma/pleroma!1341
2019-06-26 19:15:37 +00:00 · 2019-06-26 19:15:37 +00:00 · cfb5be3ced
parent 145bcf3eb9 451931d36f
commit cfb5be3ced
336 changed files with 21 additions and 9 deletions
--- a/priv/static/packs/base_polyfills.js
+++ b/priv/static/packs/base_polyfills.js
--- a/priv/static/packs/base_polyfills.js.map
+++ b/priv/static/packs/base_polyfills.js.map
--- a/priv/static/packs/common.js
+++ b/priv/static/packs/common.js
--- a/priv/static/packs/common.js.map
+++ b/priv/static/packs/common.js.map
--- a/priv/static/packs/containers/media_container.js
+++ b/priv/static/packs/containers/media_container.js
--- a/priv/static/packs/containers/media_container.js.map
+++ b/priv/static/packs/containers/media_container.js.map
--- a/priv/static/packs/core/admin.js
+++ b/priv/static/packs/core/admin.js
--- a/priv/static/packs/core/common.js
+++ b/priv/static/packs/core/common.js
--- a/priv/static/packs/core/common.js.map
+++ b/priv/static/packs/core/common.js.map
--- a/priv/static/packs/core/embed.js
+++ b/priv/static/packs/core/embed.js
--- a/priv/static/packs/core/mailer.js
+++ b/priv/static/packs/core/mailer.js
--- a/priv/static/packs/core/modal.js
+++ b/priv/static/packs/core/modal.js
--- a/priv/static/packs/core/modal.js.map
+++ b/priv/static/packs/core/modal.js.map
--- a/priv/static/packs/core/public.js
+++ b/priv/static/packs/core/public.js
--- a/priv/static/packs/core/public.js.map
+++ b/priv/static/packs/core/public.js.map
--- a/priv/static/packs/core/settings.js
+++ b/priv/static/packs/core/settings.js
--- a/priv/static/packs/core/settings.js.map
+++ b/priv/static/packs/core/settings.js.map
--- a/priv/static/packs/emoji_picker.js
+++ b/priv/static/packs/emoji_picker.js
--- a/priv/static/packs/extra_polyfills.js
+++ b/priv/static/packs/extra_polyfills.js
--- a/priv/static/packs/features/account_gallery.js
+++ b/priv/static/packs/features/account_gallery.js
--- a/priv/static/packs/features/account_gallery.js.map
+++ b/priv/static/packs/features/account_gallery.js.map
--- a/priv/static/packs/features/account_timeline.js
+++ b/priv/static/packs/features/account_timeline.js
--- a/priv/static/packs/features/account_timeline.js.map
+++ b/priv/static/packs/features/account_timeline.js.map
--- a/priv/static/packs/features/blocks.js
+++ b/priv/static/packs/features/blocks.js
--- a/priv/static/packs/features/community_timeline.js
+++ b/priv/static/packs/features/community_timeline.js
--- a/priv/static/packs/features/compose.js
+++ b/priv/static/packs/features/compose.js
--- a/priv/static/packs/features/compose.js.map
+++ b/priv/static/packs/features/compose.js.map
--- a/priv/static/packs/features/direct_timeline.js
+++ b/priv/static/packs/features/direct_timeline.js
--- a/priv/static/packs/features/domain_blocks.js
+++ b/priv/static/packs/features/domain_blocks.js
--- a/priv/static/packs/features/favourited_statuses.js
+++ b/priv/static/packs/features/favourited_statuses.js
--- a/priv/static/packs/features/favourites.js
+++ b/priv/static/packs/features/favourites.js
--- a/priv/static/packs/features/follow_requests.js
+++ b/priv/static/packs/features/follow_requests.js
--- a/priv/static/packs/features/followers.js
+++ b/priv/static/packs/features/followers.js
--- a/priv/static/packs/features/followers.js.map
+++ b/priv/static/packs/features/followers.js.map
--- a/priv/static/packs/features/following.js
+++ b/priv/static/packs/features/following.js
--- a/priv/static/packs/features/following.js.map
+++ b/priv/static/packs/features/following.js.map
--- a/priv/static/packs/features/generic_not_found.js
+++ b/priv/static/packs/features/generic_not_found.js
--- a/priv/static/packs/features/getting_started.js
+++ b/priv/static/packs/features/getting_started.js
--- a/priv/static/packs/features/getting_started.js.map
+++ b/priv/static/packs/features/getting_started.js.map
--- a/priv/static/packs/features/glitch/async/list_adder.js
+++ b/priv/static/packs/features/glitch/async/list_adder.js
--- a/priv/static/packs/features/glitch/async/list_adder.js.map
+++ b/priv/static/packs/features/glitch/async/list_adder.js.map
--- a/priv/static/packs/features/hashtag_timeline.js
+++ b/priv/static/packs/features/hashtag_timeline.js
--- a/priv/static/packs/features/home_timeline.js
+++ b/priv/static/packs/features/home_timeline.js
--- a/priv/static/packs/features/keyboard_shortcuts.js
+++ b/priv/static/packs/features/keyboard_shortcuts.js
--- a/priv/static/packs/features/list_adder.js
+++ b/priv/static/packs/features/list_adder.js
--- a/priv/static/packs/features/list_editor.js
+++ b/priv/static/packs/features/list_editor.js
--- a/priv/static/packs/features/list_timeline.js
+++ b/priv/static/packs/features/list_timeline.js
--- a/priv/static/packs/features/lists.js
+++ b/priv/static/packs/features/lists.js
--- a/priv/static/packs/features/mutes.js
+++ b/priv/static/packs/features/mutes.js
--- a/priv/static/packs/features/notifications.js
+++ b/priv/static/packs/features/notifications.js
--- a/priv/static/packs/features/pinned_statuses.js
+++ b/priv/static/packs/features/pinned_statuses.js
--- a/priv/static/packs/features/public_timeline.js
+++ b/priv/static/packs/features/public_timeline.js
--- a/priv/static/packs/features/reblogs.js
+++ b/priv/static/packs/features/reblogs.js
--- a/priv/static/packs/features/status.js
+++ b/priv/static/packs/features/status.js
--- a/priv/static/packs/features/status.js.map
+++ b/priv/static/packs/features/status.js.map
--- a/priv/static/packs/flavours/glitch/about.js
+++ b/priv/static/packs/flavours/glitch/about.js
--- a/priv/static/packs/flavours/glitch/about.js.map
+++ b/priv/static/packs/flavours/glitch/about.js.map
--- a/priv/static/packs/flavours/glitch/admin.js
+++ b/priv/static/packs/flavours/glitch/admin.js
--- a/priv/static/packs/flavours/glitch/admin.js.map
+++ b/priv/static/packs/flavours/glitch/admin.js.map
--- a/priv/static/packs/flavours/glitch/async/account_gallery.js
+++ b/priv/static/packs/flavours/glitch/async/account_gallery.js
--- a/priv/static/packs/flavours/glitch/async/account_gallery.js.map
+++ b/priv/static/packs/flavours/glitch/async/account_gallery.js.map
--- a/priv/static/packs/flavours/glitch/async/account_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/account_timeline.js
--- a/priv/static/packs/flavours/glitch/async/account_timeline.js.map
+++ b/priv/static/packs/flavours/glitch/async/account_timeline.js.map
--- a/priv/static/packs/flavours/glitch/async/blocks.js
+++ b/priv/static/packs/flavours/glitch/async/blocks.js
--- a/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js
+++ b/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js
--- a/priv/static/packs/flavours/glitch/async/community_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/community_timeline.js
--- a/priv/static/packs/flavours/glitch/async/compose.js
+++ b/priv/static/packs/flavours/glitch/async/compose.js
--- a/priv/static/packs/flavours/glitch/async/compose.js.map
+++ b/priv/static/packs/flavours/glitch/async/compose.js.map
--- a/priv/static/packs/flavours/glitch/async/direct_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/direct_timeline.js
--- a/priv/static/packs/flavours/glitch/async/domain_blocks.js
+++ b/priv/static/packs/flavours/glitch/async/domain_blocks.js
--- a/priv/static/packs/flavours/glitch/async/drawer.js
+++ b/priv/static/packs/flavours/glitch/async/drawer.js
--- a/priv/static/packs/flavours/glitch/async/drawer.js.map
+++ b/priv/static/packs/flavours/glitch/async/drawer.js.map
--- a/priv/static/packs/flavours/glitch/async/embed_modal.js
+++ b/priv/static/packs/flavours/glitch/async/embed_modal.js
--- a/priv/static/packs/flavours/glitch/async/emoji_picker.js
+++ b/priv/static/packs/flavours/glitch/async/emoji_picker.js
--- a/priv/static/packs/flavours/glitch/async/favourited_statuses.js
+++ b/priv/static/packs/flavours/glitch/async/favourited_statuses.js
--- a/priv/static/packs/flavours/glitch/async/favourites.js
+++ b/priv/static/packs/flavours/glitch/async/favourites.js
--- a/priv/static/packs/flavours/glitch/async/favourites.js.map
+++ b/priv/static/packs/flavours/glitch/async/favourites.js.map
--- a/priv/static/packs/flavours/glitch/async/follow_requests.js
+++ b/priv/static/packs/flavours/glitch/async/follow_requests.js
--- a/priv/static/packs/flavours/glitch/async/follow_requests.js.map
+++ b/priv/static/packs/flavours/glitch/async/follow_requests.js.map
--- a/priv/static/packs/flavours/glitch/async/followers.js
+++ b/priv/static/packs/flavours/glitch/async/followers.js
--- a/priv/static/packs/flavours/glitch/async/followers.js.map
+++ b/priv/static/packs/flavours/glitch/async/followers.js.map
--- a/priv/static/packs/flavours/glitch/async/following.js
+++ b/priv/static/packs/flavours/glitch/async/following.js
--- a/priv/static/packs/flavours/glitch/async/following.js.map
+++ b/priv/static/packs/flavours/glitch/async/following.js.map
--- a/priv/static/packs/flavours/glitch/async/generic_not_found.js
+++ b/priv/static/packs/flavours/glitch/async/generic_not_found.js
--- a/priv/static/packs/flavours/glitch/async/getting_started.js
+++ b/priv/static/packs/flavours/glitch/async/getting_started.js
--- a/priv/static/packs/flavours/glitch/async/getting_started_misc.js
+++ b/priv/static/packs/flavours/glitch/async/getting_started_misc.js
--- a/priv/static/packs/flavours/glitch/async/hashtag_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/hashtag_timeline.js
--- a/priv/static/packs/flavours/glitch/async/home_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/home_timeline.js
--- a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
+++ b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
--- a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js.map
+++ b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js.map
--- a/priv/static/packs/flavours/glitch/async/list_editor.js
+++ b/priv/static/packs/flavours/glitch/async/list_editor.js
--- a/priv/static/packs/flavours/glitch/async/list_timeline.js
+++ b/priv/static/packs/flavours/glitch/async/list_timeline.js
--- a/priv/static/packs/flavours/glitch/async/lists.js
+++ b/priv/static/packs/flavours/glitch/async/lists.js
--- a/priv/static/packs/flavours/glitch/async/mute_modal.js
+++ b/priv/static/packs/flavours/glitch/async/mute_modal.js
--- a/priv/static/packs/flavours/glitch/async/mutes.js
+++ b/priv/static/packs/flavours/glitch/async/mutes.js
--- a/priv/static/packs/flavours/glitch/async/notifications.js
+++ b/priv/static/packs/flavours/glitch/async/notifications.js
--- a/priv/static/packs/flavours/glitch/async/notifications.js.map
+++ b/priv/static/packs/flavours/glitch/async/notifications.js.map
--- a/priv/static/packs/flavours/glitch/async/onboarding_modal.js
+++ b/priv/static/packs/flavours/glitch/async/onboarding_modal.js
--- a/priv/static/packs/flavours/glitch/async/onboarding_modal.js.map
+++ b/priv/static/packs/flavours/glitch/async/onboarding_modal.js.map
--- a/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js
+++ b/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js
--- a/Show More
+++ b/Show More