treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,619 Commits
11 Branches
15 Tags
736 MiB
Commit Graph

780 Commits (9a47f2cbdf8ef70cb93ac2b5ee2947948d1a1d04)

Author SHA1 Message Date
Thibaut Girka 9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka 369a475a70 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 59fa38a4f6 Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka a151c5566a [Glitch] Fix hashtags select styling in default and high contrast skins 
Port 169b9d4428 to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko 4dcb04b888 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka 2769b54466 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Thibaut Girka 614ea184bb [Glitch] Add "copy link" item to status action bars 
Port 3cfadd875c to glitch-soc
 2019-02-13 07:29:57 +01:00
Thibaut Girka e230b176fb [Glitch] Don't focus spoiler input when disabled spoiler 
Inspired by 0e513ff862
 2019-02-12 21:16:02 +01:00
ThibG a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-12 20:29:55 +01:00
Thibaut Girka b89e003c4d Handle deletion of filtered toots 2019-02-10 22:54:25 +01:00
Thibaut Girka 7c0728c776 Minor fix to timeline jump avoiding behavior 2019-02-10 22:54:25 +01:00
Thibaut Girka dfe1d548a5 Adjust scroll when statuses above the current scroll position are deleted 2019-02-10 22:54:25 +01:00
Thibaut Girka 0b91322762 Adjust scroll if previewCard appeared 2019-02-10 22:54:25 +01:00
Thibaut Girka 049c9a3b97 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 68f3d003d6 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka e49e54a5ff Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka 405ef5ad37 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka b47a53f902 [Glitch] Rename from instance to server. 
Port 46e806cd2f to glitch-soc
 2019-02-10 22:19:26 +01:00
Thibaut Girka 14a1bb703a [Glitch] Fix not showing custom emojis in share page emoji picker 
Port e02a13f64e to glitch-soc
 2019-02-10 21:54:43 +01:00
Thibaut Girka b7fbcb21b3 [Glitch] Add featured hashtags to profiles 
Port SCSS changes from 364f2ff9aa
 2019-02-10 21:50:42 +01:00
Thibaut Girka 7ed2aeb6e9 [Glitch] Allow multiple files upload through web UI, including drag & drop 
Port 750c67660d to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka a963ea67dd [Glitch] Add missing rejection handling for Promises 
Port missing parts from 2c51bc0ca5 to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka 6b2eefc7bf [Glitch] Add WebP support 
Port 5092d17f29  to glitch-soc
 2019-02-10 21:13:17 +01:00
Thibaut Girka 1a70fca168 Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka 3ce34ce7a2 Fix unfolding CWs on public hashtag page 
Fixes #909
 2019-02-06 14:37:57 +01:00
Thibaut Girka c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
Eugen Rochko 663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka 2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka 762e4fdf55 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 f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
trwnh 8ef0498f1c Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 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 #9210.
 2019-01-25 11:48:27 +01:00
Jeong Arm 77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka c30da25c5f Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Thibaut Girka 5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576 9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka 8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) 6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka 02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka 3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Thibaut Girka 5684cd090c [Glitch] make draggingOver state off correctly 
Port d6433b3931 to glitch-soc
 2019-01-16 14:50:17 +01:00
Thibaut Girka 92830029ca [Glitch] Make hashtag search results link to the hashtag URL 
Port 6cfb357940 to glitch-soc
 2019-01-16 14:25:58 +01:00
Thibaut Girka ad32896a93 [Glitch] Fix hashtag timeline on mobile 
Port c5b8824a3e to glitch-soc
 2019-01-16 14:24:23 +01:00
Thibaut Girka 4cec7a77c3 [Glitch] Adjust admin UI right panel size 
Port 9ee9cb549b to glitch-soc
 2019-01-13 20:41:38 +01:00
Thibaut Girka 2c5f0f12ac [Glitch] change height on narrow view to take 100% of screen 
Port 1183246043 to glitch-soc
 2019-01-13 20:40:46 +01:00
Thibaut Girka 278ff1318f [Glitch] Add attachment list fallback to public pages 
Port JS changes from 4fb94c758e to glitch-soc
 2019-01-13 14:42:50 +01:00
Thibaut Girka 394525e329 [Glitch] Postpone scroll-to-detailed status after react components are loaded 
Port 70801b850c to glitch-soc
 2019-01-10 21:00:33 +01:00