Merge branch 'new-mastofe' into 'develop'

Bring Mastodon frontend up-to-date

See merge request pleroma/pleroma!87
This commit is contained in:
lambda 2018-03-31 19:33:17 +00:00
commit 5fa8237bc1
295 changed files with 256 additions and 138922 deletions

View File

@ -9,14 +9,17 @@
<link rel="icon" type="image/png" href="/favicon.png"/> <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/common.css" />
<link rel="stylesheet" media="all" href="/packs/default.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/common.js"></script>
<script src="/packs/locale_en.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 id='initial-state' type='application/json'><%= raw @initial_state %></script>
<script src="/packs/application.js"></script> <script src="/packs/application.js"></script>
</head> </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 class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>
</div> </div>
</body> </body>

BIN
priv/static/packs/about.js Normal file

Binary file not shown.

Binary file not shown.

BIN
priv/static/packs/admin.js Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,42 +1,46 @@
CACHE MANIFEST CACHE MANIFEST
#ver:11/12/2017, 12:40:57 PM #ver:2018-3-31 19:06:08
#plugin:4.8.4 #plugin:4.8.4
CACHE: CACHE:
/packs/features/compose-4617f6e912b5bfa71c43.js /packs/base_polyfills.js
/packs/modals/onboarding_modal-399f44a19ddd0ddc4e9c.js /packs/extra_polyfills.js
/packs/features/public_timeline-d6e6bc704f49ebf922be.js /packs/features/compose.js
/packs/features/community_timeline-20bc8a94c08809c127d0.js /packs/modals/onboarding_modal.js
/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js /packs/emoji_picker.js
/packs/emoji_picker-9cf581d158c1cefc73c9.js /packs/features/notifications.js
/packs/features/notifications-99d27ff7a90c7f701400.js /packs/features/account_timeline.js
/packs/features/home_timeline-c146f32b0118845677ee.js /packs/features/home_timeline.js
/packs/features/account_timeline-cad2550e777d3958eca4.js /packs/features/public_timeline.js
/packs/features/pinned_statuses-fc56dd5916a37286e823.js /packs/features/community_timeline.js
/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js /packs/features/following.js
/packs/features/status-1f1807fdb4d1fd6daf40.js /packs/features/followers.js
/packs/features/following-9060b3726e6ad25f3621.js /packs/features/favourited_statuses.js
/packs/features/followers-6716b8606f70dfa12ed7.js /packs/features/list_timeline.js
/packs/features/account_gallery-b13924812f8dd47200c2.js /packs/features/account_gallery.js
/packs/modals/report_modal-7a2950f40d4867b9cbb0.js /packs/features/hashtag_timeline.js
/packs/features/follow_requests-281e5b40331385149920.js /packs/features/status.js
/packs/features/mutes-60c139f123f8d11ed903.js /packs/features/blocks.js
/packs/features/blocks-e9605338ea941de78465.js /packs/modals/report_modal.js
/packs/features/reblogs-e284a8647e830c151a40.js /packs/features/follow_requests.js
/packs/features/favourites-083fedd11007764f7fad.js /packs/features/reblogs.js
/packs/features/getting_started-b65f1e917d66a972f2bf.js /packs/features/favourites.js
/packs/features/generic_not_found-dc757b4cfe00489a06fb.js /packs/features/getting_started.js
/packs/modals/embed_modal-c776fd6a0ea581675783.js /packs/features/keyboard_shortcuts.js
/packs/status/media_gallery-7642f779bf4243e58b78.js /packs/features/generic_not_found.js
/packs/application-1b1f37dff2aac402336b.js /packs/features/list_editor.js
/packs/share-914b479bea45d0f6d4aa.js /packs/status/media_gallery.js
/packs/about-d6275c885cd0e28a1186.js /packs/share.js
/packs/public-88b87539fc95f07f2721.js /packs/application.js
/packs/default-99ffdcf166b2dedef105.js /packs/about.js
/packs/admin-1bab981afc4fd0d71402.js /packs/public.js
/packs/common-1789b98651001ef10c0b.js /packs/mailer.js
/packs/common-daadaac9454e7d14470e7954e3143dca.css /packs/default.js
/packs/default-818c1287ac3c764905d81e549d5e0160.css /packs/admin.js
/packs/common.js
/packs/common.css
/packs/mailer.css
/packs/default.css
/packs/manifest.json /packs/manifest.json
NETWORK: NETWORK:

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"common.css","sourceRoot":""}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"default.css","sourceRoot":""}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 17 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More