Commit graph

842 commits

Author SHA1 Message Date
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
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 (#9840) 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 (#9839) 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
Thibaut Girka
fc64d1d03e [Glitch] Stop gifv timeline preview explicitly when open the media gallery
Port 2a113f0185 to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
e495dc0134 [Glitch] refactored account.js
Port 695de5d134 to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
e950122e06 [Glitch] Fix embed play icons regression
Port 4c99d23df8 to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
95dcaccb03 [Glitch] Display fallback link card thumbnail when none is given
Port 39d81be7de to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
3793296fed Port a few public.js changes from upstream, move some code around
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
Thibaut Girka
ba82ff7c12 [Glitch] Only consider mouse move in scrolling on item insertion
Port 4e067b1bd0 to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
069657286f [Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle
Port 59ecfbd28c to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
d768d0b851 [Glitch] Cancel list scroll reset after mouse move on wheel scroll
Port 54bc905a57 to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
f4191a8a00 [Glitch] Temporarily hold timeline if mouse moved recently
Port 6e72dda7ef to glitch-soc
2019-01-10 12:09:12 +01:00
Thibaut Girka
6fcb487e75 Update glitch-soc admin page style from upstream
Port SCSS changes from 171c20ce72 to glitch-soc
2019-01-08 20:20:35 +01:00
ash lea
b22f9c8792 add list title editing 2019-01-06 13:03:57 +01:00
Thibaut Girka
07592234ac Add local setting to disable swipe-to-change-columns 2019-01-05 21:47:48 +01:00
Thibaut Girka
6956a99a98 [Glitch] Update dependencies for Node.js (2018-12-31)
Port compatibility changes from 101a46ac24 to glitch-soc
2019-01-02 16:07:33 +01:00
Thibaut Girka
9b6e4daca7 [Glitch] Improve admin UI for account view
Port SCSS changes from 8958e58bd4 to glitch-soc
2019-01-02 15:38:48 +01:00
Thibaut Girka
7f96b7ec99 [Glitch] Update emoji codepoint mappings to v11.0
Port 36a5585cac to glitch-soc
2019-01-02 15:36:59 +01:00
Thibaut Girka
536dc2cdea Fix some image paths in SCSS files 2019-01-02 15:36:59 +01:00
Thibaut Girka
c1b47fe774 Fix crash when clearing uninitialized timeline
Fixes #875
2018-12-30 16:56:55 +01:00
Thibaut Girka
57791a2044 Immediately go back in browser history upon successfully sending toot 2018-12-30 14:07:57 +01:00
Thibaut Girka
9e2ceac0ba [Glitch] Add moderation warnings
Port SCSS changes from 2e0d617b8b to glitch-soc
2018-12-23 12:54:09 +01:00
Thibaut Girka
df5e49696f [Glitch] Remove links to bridge.joinmastodon.org (non-functional)
Port eb2994d454 to glitch-soc
2018-12-23 11:43:47 +01:00
Thibaut Girka
89e7274a7f Remove file added by error 2018-12-23 11:43:25 +01:00
Thibaut Girka
e5a25656e8 [Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
Port 240d41b3ca to glitch flavour
2018-12-23 11:40:52 +01:00
Thibaut Girka
d9a6c27f3b Fix composer not getting focus after reply confirmation dialog
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 20:00:49 +01:00
Thibaut Girka
e8845f0cb2 Fix incorrect and duplicate onConfirm callback 2018-12-21 20:00:49 +01:00
Thibaut Girka
89db203110 [Glitch] Fix that translation is not applied to "joining hashtags"
Port 88e40d03d9 to glitch-soc
2018-12-21 19:54:54 +01:00
Thibaut Girka
0cac543474 [Glitch] Deep compare tags for hashtag column reload
Port 98c9ad366b to glitch-soc
2018-12-21 19:54:54 +01:00
Thibaut Girka
423c953518 [Glitch] Allow joining several hashtags in a single column
Port d2a9ea58da to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.
2018-12-21 19:54:54 +01:00
Thibaut Girka
85dc4507e7 [Glitch] Display customized mascot in web UI
Port relevant parts of 2a36092328 to glitch-soc
2018-12-20 18:39:05 +01:00
Thibaut Girka
bbba494092 Make drawer markup and styling closer to upstream
WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!
2018-12-20 18:39:05 +01:00
Thibaut Girka
7d437f7fc9 [Glitch] Back to the getting-started when pins the timeline
Port f579f1b10e to glitch-soc
2018-12-20 14:51:28 +01:00
Thibaut Girka
3ba1aa8d2b Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka
ce7ac8c1d7 [Glitch] Improved appearance of notification filter on safari
Port e9ad8044cc to glitch-soc
2018-12-19 13:00:08 +01:00
Thibaut Girka
4b8cb9696e Reword confirm_before_clearing_draft description 2018-12-18 21:54:34 +01:00
Thibaut Girka
ba8d23c7cb Allow disabling the reply confirmation dialog 2018-12-18 21:54:34 +01:00
Thibaut Girka
55e3dae600 Allow disabling media confirmation from the confirmation dialog itself 2018-12-18 21:54:34 +01:00
Thibaut Girka
79b793be2a Remove dead code 2018-12-18 21:39:35 +01:00
Thibaut Girka
2bf78186aa [Glitch] Put "Media Only" option in column settings instead of content area headline
Port 9c2fc4d684 to glitch-soc
2018-12-18 21:39:35 +01:00