treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,715 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

795 Commits (69fd801c8e48cad45ee8392664bd0d5858b75194)

Author SHA1 Message Date
Thibaut Girka 69fd801c8e Port upstream refactoring of reducers and actions 
Also includes 4923646361
 2019-03-05 21:35:03 +01:00
Eugen Rochko 0dc5c2a4a5 Fix home timeline perpetually reloading when empty 
Port 0c8d1435c5 to glitch-soc
 2019-03-05 19:30:11 +01:00
Mélanie Chauvel (ariasuni) c02d1558f1 [Glitch] Fix errors found by eslint 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni) f01d004a1a [Glitch] Make the column header of profile view look like the others, too 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni) 2a7690601a [Glitch] Make the column header of toot/thread view look like the others 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Thibaut Girka bdc5cd092e Port public page mastodon-light fixes from upstream 2019-02-27 16:24:57 +01:00
Eugen Rochko df01d5181e Fix web UI not removing notifications after block (#10108) 
Regression from #7311
 2019-02-26 19:33:59 +01:00
abcang 6f471916f5 Keep notification when muting_notifications is true (#7311) 
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
 2019-02-26 19:33:42 +01:00
Thibaut Girka fa1b843522 Fix non-numeric account identifiers leading to /web/accounts/NaN 
I'm not sure what purpose these “+” served?!
 2019-02-22 17:52:21 +01:00
Thibaut Girka 8ded9a0c02 [Glitch] Internationalize unexpected error message 
Port e8a1d0b4d4 to glitch-soc,
fixing a crash in the process
 2019-02-18 19:49:06 +01:00
Eugen Rochko e34c5db19e Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-18 18:16:35 +01:00
Thibaut Girka 2bf47542f3 Fix video player width not being updated to fit container width 2019-02-18 10:44:37 +01:00
Ben Lubar 9ad1ca9a2b Allow multi-line image descriptions. (Glitch) 2019-02-17 15:19:12 +01:00
Thibaut Girka e8ae6b050b [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 3547e3e59e to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka 09c6d1c534 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 6534acc019 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka 9b89a7b2f2 Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
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 (#10030) 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 (#10028) 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 #913 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 #909
 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 (#9949) 
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 #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 fdf6c4a63f Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka 5e7c9c04e2 Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00