Commit Graph

779 Commits (da24c6acedfb06be10177d180900619bd46f599b)

Author SHA1 Message Date
Thibaut Girka da24c6aced Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
2019-02-17 12:26:55 +01:00
Eugen Rochko 85ef358a0a Fix style regressions on landing page () 2019-02-15 18:22:06 +01:00
Thibaut Girka f29b69c08b [Glitch] Fix hashtags select styling in default and high contrast skins
Port bc9930f59d to glitch-soc
2019-02-15 18:21:00 +01:00
Eugen Rochko 74d84d2109 Fix color of static page links in high contrast theme () 2019-02-15 18:10:26 +01:00
Thibaut Girka dabbbe1e71 [Glitch] Fix occasional crash in detailed toot view
Port f9a338b473 to glitch-soc
2019-02-15 17:34:15 +01:00
Thibaut Girka 04d7200ba4 [Glitch] Add "copy link" item to status action bars
Port 12cb694634 to glitch-soc
2019-02-13 07:29:57 +01:00
Thibaut Girka 53cc85871d [Glitch] Don't focus spoiler input when disabled spoiler
Inspired by 6866739387
2019-02-12 21:16:02 +01:00
ThibG 1767bb542c Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-02-12 20:29:55 +01:00
Thibaut Girka d486152092 Handle deletion of filtered toots 2019-02-10 22:54:25 +01:00
Thibaut Girka eb6dfe4d8b Minor fix to timeline jump avoiding behavior 2019-02-10 22:54:25 +01:00
Thibaut Girka 7b23d3c657 Adjust scroll when statuses above the current scroll position are deleted 2019-02-10 22:54:25 +01:00
Thibaut Girka f24bd9d629 Adjust scroll if previewCard appeared 2019-02-10 22:54:25 +01:00
Thibaut Girka 3d5ef5c497 Avoid two-step rendering of statuses as much as possible
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
2019-02-10 22:54:25 +01:00
Thibaut Girka b05cda87f8 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka 18a540da9f Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka f2b7ab4523 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka d96df46a63 [Glitch] Rename from instance to server.
Port f308fb56ab to glitch-soc
2019-02-10 22:19:26 +01:00
Thibaut Girka 75187f908a [Glitch] Fix not showing custom emojis in share page emoji picker
Port b037f6cec5 to glitch-soc
2019-02-10 21:54:43 +01:00
Thibaut Girka b3fc70d13e [Glitch] Add featured hashtags to profiles
Port SCSS changes from d2d4d38f22
2019-02-10 21:50:42 +01:00
Thibaut Girka 07f0cf8573 [Glitch] Allow multiple files upload through web UI, including drag & drop
Port 640966f3fc to glitch-soc
2019-02-10 21:44:14 +01:00
Thibaut Girka 5946d76d0a [Glitch] Add missing rejection handling for Promises
Port missing parts from d88504ec84 to glitch-soc
2019-02-10 21:44:14 +01:00
Thibaut Girka 538bae9f53 [Glitch] Add WebP support
Port bcf34e31bd  to glitch-soc
2019-02-10 21:13:17 +01:00
Thibaut Girka a9078c18eb Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka d55233da9a Fix unfolding CWs on public hashtag page
Fixes 
2019-02-06 14:37:57 +01:00
Thibaut Girka dcf363a623 Remove redundant “options” from “Compose box options”
Thanks @ariasuni.
2019-02-03 01:02:39 +01:00
Marek Ľach 43b2f021eb Minor description corrections 2019-02-03 00:30:34 +01:00
Eugen Rochko 252a765368 Fix link color in high-contrast theme, add underlines ()
Improve sorting of default themes in the dropdown
2019-02-01 16:23:13 +01:00
Thibaut Girka fba0f7dae7 [Glitch] Replace unlock-alt icon with unlock
Port 4fb1d8129d to glitch-soc
2019-02-01 16:15:44 +01:00
Thibaut Girka b0e7af725a Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka afdf789d06 Fix hashtag processing when sending toots
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
2019-02-01 12:37:28 +01:00
Thibaut Girka 00fc362103 [Glitch] Fix initial value of volume slider in video player and handle volume changes
Port b5feaa4d54 to glitch-soc
2019-01-27 22:02:59 +01:00
trwnh 36b6fee96d Fix Firefox scrollbar color regression in ()
In  the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in  while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in .
2019-01-25 11:48:27 +01:00
Jeong Arm fdf6c4a63f Apply style for .landing-page strong () 2019-01-25 11:48:02 +01:00
Thibaut Girka 5e7c9c04e2 Fix crash in Direct Messages column settings
Fixes 
2019-01-23 18:29:18 +01:00
Thibaut Girka 14c617983d [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
Port cbb8399df4 to glitch-soc
2019-01-20 11:56:21 +01:00
Thibaut Girka 8dea30a0c7 [Glitch] Hide floating action button on search and getting started pages
Port 180a665f29 to glitch-soc
2019-01-20 11:54:38 +01:00
tmm576 30f3dad8e8 Allow event defaults on index for text data transfer () 2019-01-20 11:53:22 +01:00
Thibaut Girka a847f3bec6 [Glitch] Fix new hashtag page's items not being full-width on mobile
Port d28a2f7636 to glitch-soc
2019-01-20 11:52:06 +01:00
Thibaut Girka a205783d1c [Glitch] Add information about how to opt-in to the directory on the directory
Port SCSS changes from 86087f7461 to glitch-soc
2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) c4a352bbf6 Fix slightly cropped font on settings page dropdowns when using system font () 2019-01-20 11:49:27 +01:00
Thibaut Girka eaebfc67d8 [Glitch] Improve the public hashtag page
Port 43014334f8 to glitch-soc
2019-01-20 11:47:17 +01:00
Thibaut Girka 8219940214 [Glitch] Redesign public hashtag page to use a masonry layout
Port 380b246728 to glitch flavour
2019-01-20 11:38:09 +01:00
Thibaut Girka 8ea1a8e033 [Glitch] make draggingOver state off correctly
Port e77cb61481 to glitch-soc
2019-01-16 14:50:17 +01:00
Thibaut Girka 426673f17a [Glitch] Make hashtag search results link to the hashtag URL
Port 65c546f9b0 to glitch-soc
2019-01-16 14:25:58 +01:00
Thibaut Girka 1c67a27069 [Glitch] Fix hashtag timeline on mobile
Port 8044612d15 to glitch-soc
2019-01-16 14:24:23 +01:00
Thibaut Girka 1ceb7b32e3 [Glitch] Adjust admin UI right panel size
Port 6d067302ce to glitch-soc
2019-01-13 20:41:38 +01:00
Thibaut Girka 7fcfe054cc [Glitch] change height on narrow view to take 100% of screen
Port 9b409bf95e to glitch-soc
2019-01-13 20:40:46 +01:00
Thibaut Girka 456c0aa9cc [Glitch] Add attachment list fallback to public pages
Port JS changes from bb2dbd681f to glitch-soc
2019-01-13 14:42:50 +01:00
Thibaut Girka c0c04cd2d4 [Glitch] Postpone scroll-to-detailed status after react components are loaded
Port f6a5894af6 to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka d9abcb4b4b [Glitch] Redesign admin instances area
Port SCSS changes from f2ec1803cb
2019-01-10 21:00:33 +01:00