Skip to content
GitLab
Commit 5fa8237b authored by lain's avatar lain
Browse files

Merge branch 'new-mastofe' into 'develop' 

Bring Mastodon frontend up-to-date

See merge request pleroma/pleroma!87
parents 86525e3a 7f2174d8
Pipeline #1035 failed with stage
in 2 minutes and 19 seconds
Hide whitespace changes
Inline Side-by-side
lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
View file @ 5fa8237b
......@@ -9,14 +9,17 @@
<link rel="icon" type="image/png" href="/favicon.png"/>
<link rel="stylesheet" media="all" href="/packs/common.css" />
<link rel="stylesheet" media="all" href="/packs/default.css" />
<link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" />
<script src="/packs/common.js"></script>
<script src="/packs/locale_en.js"></script>
<link as='script' crossorigin='anonymous' href='/packs/features/getting_started.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/compose.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/home_timeline.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/notifications.js' rel='preload'>
<script id='initial-state' type='application/json'><%= raw @initial_state %></script>
<script src="/packs/application.js"></script>
</head>
<body class='app-body'>
<body class='app-body no-reduce-motion'>
<div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>
</div>
</body>
......
priv/static/packs/about-d6275c885cd0e28a1186.js deleted 100644 → 0
View file @ 86525e3a
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/about.js 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/about.js.map 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/admin-1bab981afc4fd0d71402.js → priv/static/packs/admin.js
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/admin.js.map 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/appcache/manifest.appcache
View file @ 5fa8237b
CACHE MANIFEST
#ver:11/12/2017, 12:40:57 PM
#ver:2018-3-31 19:06:08
#plugin:4.8.4
CACHE:
/packs/features/compose-4617f6e912b5bfa71c43.js
/packs/modals/onboarding_modal-399f44a19ddd0ddc4e9c.js
/packs/features/public_timeline-d6e6bc704f49ebf922be.js
/packs/features/community_timeline-20bc8a94c08809c127d0.js
/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js
/packs/emoji_picker-9cf581d158c1cefc73c9.js
/packs/features/notifications-99d27ff7a90c7f701400.js
/packs/features/home_timeline-c146f32b0118845677ee.js
/packs/features/account_timeline-cad2550e777d3958eca4.js
/packs/features/pinned_statuses-fc56dd5916a37286e823.js
/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js
/packs/features/status-1f1807fdb4d1fd6daf40.js
/packs/features/following-9060b3726e6ad25f3621.js
/packs/features/followers-6716b8606f70dfa12ed7.js
/packs/features/account_gallery-b13924812f8dd47200c2.js
/packs/modals/report_modal-7a2950f40d4867b9cbb0.js
/packs/features/follow_requests-281e5b40331385149920.js
/packs/features/mutes-60c139f123f8d11ed903.js
/packs/features/blocks-e9605338ea941de78465.js
/packs/features/reblogs-e284a8647e830c151a40.js
/packs/features/favourites-083fedd11007764f7fad.js
/packs/features/getting_started-b65f1e917d66a972f2bf.js
/packs/features/generic_not_found-dc757b4cfe00489a06fb.js
/packs/modals/embed_modal-c776fd6a0ea581675783.js
/packs/status/media_gallery-7642f779bf4243e58b78.js
/packs/application-1b1f37dff2aac402336b.js
/packs/share-914b479bea45d0f6d4aa.js
/packs/about-d6275c885cd0e28a1186.js
/packs/public-88b87539fc95f07f2721.js
/packs/default-99ffdcf166b2dedef105.js
/packs/admin-1bab981afc4fd0d71402.js
/packs/common-1789b98651001ef10c0b.js
/packs/common-daadaac9454e7d14470e7954e3143dca.css
/packs/default-818c1287ac3c764905d81e549d5e0160.css
/packs/base_polyfills.js
/packs/extra_polyfills.js
/packs/features/compose.js
/packs/modals/onboarding_modal.js
/packs/emoji_picker.js
/packs/features/notifications.js
/packs/features/account_timeline.js
/packs/features/home_timeline.js
/packs/features/public_timeline.js
/packs/features/community_timeline.js
/packs/features/following.js
/packs/features/followers.js
/packs/features/favourited_statuses.js
/packs/features/list_timeline.js
/packs/features/account_gallery.js
/packs/features/hashtag_timeline.js
/packs/features/status.js
/packs/features/blocks.js
/packs/modals/report_modal.js
/packs/features/follow_requests.js
/packs/features/reblogs.js
/packs/features/favourites.js
/packs/features/getting_started.js
/packs/features/keyboard_shortcuts.js
/packs/features/generic_not_found.js
/packs/features/list_editor.js
/packs/status/media_gallery.js
/packs/share.js
/packs/application.js
/packs/about.js
/packs/public.js
/packs/mailer.js
/packs/default.js
/packs/admin.js
/packs/common.js
/packs/common.css
/packs/mailer.css
/packs/default.css
/packs/manifest.json
NETWORK:
......
priv/static/packs/application.js
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/application.js.map 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/base_polyfills-0e7cb02d7748745874eb.js deleted 100644 → 0
View file @ 86525e3a
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/base_polyfills.js 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/base_polyfills.js.map 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/common.css
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/common.css.map 0 → 100644
View file @ 5fa8237b
{"version":3,"sources":[],"names":[],"mappings":"","file":"common.css","sourceRoot":""}
\ No newline at end of file
priv/static/packs/common.js
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/common.js.map 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/default-99ffdcf166b2dedef105.js deleted 100644 → 0
View file @ 86525e3a
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/default.css
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
priv/static/packs/default.css.map 0 → 100644
View file @ 5fa8237b
{"version":3,"sources":[],"names":[],"mappings":"","file":"default.css","sourceRoot":""}
\ No newline at end of file
priv/static/packs/default.js 0 → 100644
View file @ 5fa8237b
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment