mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Author	SHA1	Message	Date
ThibG	9a5825f864	[Glitch] Add honeypot fields and minimum fill-out time for sign-up form Port `49eb4d4ddf` to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-10 09:44:16 +01:00
ThibG	237025b5ef	[Glitch] Fix notifications being unnecessarily redrawn on state change Port `9669167aae` to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-10 09:42:32 +01:00
Claire	7782e4dc0d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.	2020-12-10 09:41:49 +01:00
ThibG	49eb4d4ddf	Add honeypot fields and minimum fill-out time for sign-up form (#15276 ) * Add honeypot fields to limit non-specialized spam Add two honeypot fields: a fake website input and a fake password confirmation one. The label/placeholder/aria-label tells not to fill them, and they are hidden in CSS, so legitimate users should not fall into these. This should cut down on some non-Mastodon-specific spambots. * Require a 3 seconds delay before submitting the registration form * Fix tests * Move registration form time check to model validation * Give people a chance to clear the honeypot fields * Refactor honeypot translation strings Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2020-12-10 06:27:26 +01:00
ThibG	9669167aae	Fix notifications being unnecessarily redrawn on state change (#15312 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2020-12-09 19:16:30 +01:00
ThibG	7d0e45a3be	[Glitch] Fix column swiping animation logic Port `0b437325dc` to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-09 15:12:28 +01:00
Eugen Rochko	e18f9f8228	[Glitch] Fix unnecessary re-rendering of various components when typing in web UI Partially port `9620ee90be` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-09 15:11:38 +01:00
trwnh	3449ffa133	[Glitch] rename replies_policy enumerables Port front-end changes from `127c543a6e` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-09 14:58:09 +01:00
Eugen Rochko	b5134595d8	[Glitch] Fix alert when failing to save timeline markers in web UI Port `59d943e152` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-09 14:57:17 +01:00
Claire	a16175645d	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-09 14:42:33 +01:00
trwnh	127c543a6e	rename replies_policy enumerables (#15304 )	2020-12-09 04:34:17 +01:00
Takeshi Umeda	f379a52d74	Fix missing pictureInPicture prop in detailed status container (#15309 )	2020-12-09 04:33:33 +01:00
Jeong Arm	7aee364795	Fix open media hotkey (#15308 ) * Fix open media hotkey * Update status.js Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-12-09 00:24:13 +01:00
Takeshi Umeda	765626a3a7	Fix the Open handler for PreviewCard (#15305 )	2020-12-08 12:07:54 +01:00
ThibG	0b437325dc	Fix column swiping animation logic (#15301 ) From the start, swiping columns was highly unreliable because the logic could change `ReactSwipeableViews`'s `animateTransitions` property mid-swipe. PR #11200 partially fixed this, but at the unintended cost of disabling the swipe animation altogether. This PR changes the logic behind `shouldAnimate` to only disable the swiping animation at the end of a column change not initiated by `ReactSwipeableViews`. Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2020-12-07 20:07:24 +01:00
Eugen Rochko	9620ee90be	Fix unnecessary re-rendering of various components when typing in web UI (#15286 )	2020-12-07 19:36:36 +01:00
Eugen Rochko	48bef17cc9	Fix slow distinct queries where grouped queries are faster (#15287 ) About 2x speed-up on inboxes query	2020-12-07 12:08:30 +01:00
Eugen Rochko	a8c471fcc0	Fix not being able to open audio modal in web UI (#15283 ) Fix #15280 Also adds the new action bar and blurhash-based background color to audio and video modals	2020-12-07 04:29:37 +01:00
Eugen Rochko	59d943e152	Fix alert when failing to save timeline markers in web UI (#15285 ) Fix #15267	2020-12-07 03:23:43 +01:00
Eugen Rochko	014733d1e4	Fix too low contrast on new media modal background in web UI (#15284 ) Fix #15258	2020-12-07 02:32:27 +01:00
Takeshi Umeda	17a2e27641	Fix remove number sign from account_featured_tags (#15277 )	2020-12-06 05:55:35 +01:00
Mélanie Chauvel	40e2de3904	[Glitch] Fix character count not ignoring hidden CW field Port `68775b6039` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2020-12-05 21:15:18 +01:00
Claire	f8d867bac4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.	2020-12-05 17:33:37 +01:00
Starfall	13df125b6c	Add favourite modal to light theme CSS	2020-12-05 13:23:39 +01:00
Takeshi Umeda	44d5c6bc8f	Fix incorrect conditions for suspended accounts in Get API for account featured tags (#15270 )	2020-12-04 04:22:35 +01:00
ThibG	fbe7519243	Fix account merging in maintenance script (#15264 ) Also include AccountNote and AccountDeletionRequest to the list of classes needing to be reassigned the merged account.	2020-12-04 02:23:51 +01:00
ThibG	d849aad852	Change public thread view to hide "Show thread" link (#15266 ) Fixes #15262	2020-12-02 21:21:44 +01:00
ThibG	9136be480f	Fix followers hash cache not being invalidated on account merge (#15256 ) Also clear relationships cache.	2020-12-02 21:20:00 +01:00
Eugen Rochko	a55e6e99c0	Fix `ku` locale not being right-to-left (#15252 )	2020-11-30 23:02:32 +01:00
Mélanie Chauvel	68775b6039	Fix character count not ignoring hidden CW field (#15236 )	2020-11-30 12:09:34 +01:00
Eugen Rochko	13b07b88f1	Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection (#15228 )	2020-11-28 05:17:53 +01:00
Eugen Rochko	13206fcfb8	Fix media modal crashing when media has no blurhash (#15229 )	2020-11-28 03:37:01 +01:00
Eugen Rochko	e7e099d1a0	Fix deletes not reaching every server that interacted with status (#15200 ) Extract logic for determining ActivityPub inboxes to send deletes to to its own class and explicitly include the person the status replied to (even if not mentioned), people who favourited it, and people who replied to it (though that one is still not recursive)	2020-11-27 15:48:31 +01:00
Eugen Rochko	e1a6526c8d	Fix media modal regression on public pages (#15221 )	2020-11-27 15:41:58 +01:00
Eugen Rochko	1e89e2ed98	Change media modals look in web UI (#15217 ) - Change overlay background to match color of viewed image - Add interactive reply/boost/favourite buttons to footer of modal - Change ugly "View context" link to button among the action bar	2020-11-27 03:24:11 +01:00
Eugen Rochko	cb7bd8ee03	New Crowdin updates (#15137 ) * New translations en.yml (Kabyle) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Sanskrit) [ci skip] * New translations en.json (Sanskrit) [ci skip] * New translations en.yml (Sardinian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Sorani (Kurdish)) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.yml (Urdu (Pakistan)) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations simple_form.en.yml (Kazakh) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations simple_form.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations simple_form.en.yml (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations simple_form.en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations simple_form.en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Sorani (Kurdish)) [ci skip] * New translations doorkeeper.en.yml (Sorani (Kurdish)) [ci skip] * Ran `i18n-tasks normalize` * Ran `yarn manage:translations` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-11-26 22:42:12 +09:00
abcang	b9fc807115	[Glitch] Fixed ESLint error Port `a2da02626e` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-25 15:56:43 +01:00
Eugen Rochko	3d970faeb1	[Glitch] Remove fade-in animation from modals in web UI Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-25 15:50:22 +01:00
Thibaut Girka	4dab236690	Default to 25 fps for frame seeking if framerate information isn't known	2020-11-25 15:47:23 +01:00
Eugen Rochko	51d0e1c7b4	[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI Port `f970e1fab6` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-25 15:46:09 +01:00
Thibaut Girka	e71b16ae2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.	2020-11-25 15:31:45 +01:00
Eugen Rochko	f844386809	Add `tootctl accounts merge` (#15201 ) * Add `tootctl accounts merge` * Update lib/mastodon/accounts_cli.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-11-23 17:50:16 +01:00
abcang	a2da02626e	Fixed ESLint error (#15214 ) * eslint --fix * fix consistent-return * fix promise/catch-or-return * ignore import rule	2020-11-23 17:35:14 +01:00
Eugen Rochko	272566043a	Remove fade-in animation from modals in web UI (#15199 )	2020-11-21 23:54:36 +01:00
Eugen Rochko	f970e1fab6	Fix hardcoded frame rate for frame by frame video navigation in web UI (#15198 )	2020-11-21 23:19:04 +01:00
ThibG	66832cbf33	Undo outgoing follows when suspending a remote account (#15188 )	2020-11-21 21:27:00 +01:00
ThibG	c43f4cd3bb	Fix not being able to unfavorite toots one has lost access to (#15192 ) Fixes #15191	2020-11-21 06:18:09 +01:00
Thibaut Girka	3281c9b4c0	Fix video not taking focus on interaction Revert part of #737 to restore hotkey functionality	2020-11-20 14:20:17 +01:00
ThibG	15be0bde8a	[Glitch] Fix image uploads being random data when canvas read access is blocked Port `d8d43a427a` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-20 13:41:07 +01:00
Eugen Rochko	b82aa33dea	[Glitch] Add hotkeys for audio/video control Port `04a079e723` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-20 13:40:05 +01:00
Thibaut Girka	48f0f3ffee	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.	2020-11-20 13:27:48 +01:00
ThibG	8b8004a962	Fix webfinger redirect handling in ResolveAccountService (#15187 ) * Fix webfinger redirect handling in ResolveAccountService ResolveAccountService#process_webfinger! handled a one-step webfinger redirection, but only accepting the result if it matched the exact URI passed as input, defeating the point of a redirection check. Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`, updating the resulting `acct:` URI with the result of the first webfinger query. * Add tests	2020-11-19 19:52:06 +01:00
ThibG	96c1e71329	Add import/export feature for bookmarks (#14956 ) * Add ability to export bookmarks * Add support for importing bookmarks * Add bookmark import tests * Add bookmarks export test	2020-11-19 17:48:13 +01:00
Darius Kazemi	8e2530ea16	Mark correctly as read reverse-order announcements (#15070 ) This fixes a bug in #15065 where the "read" indicator was not getting correctly set. The ID of a dismissed announcement is now correct.	2020-11-19 17:40:18 +01:00
ThibG	2f6831f318	Fix sending spurious Rejects when processing remote account deletion (#15104 ) * Fix sending spurious Rejects when processing remote account deletion * Make skip_side_effects imply skip_activitypub	2020-11-19 17:39:47 +01:00
Eugen Rochko	df1653174b	Add cache buster feature for media files (#15155 ) Nginx can be configured to bypass proxy cache when a special header is in the request. If the response is cacheable, it will replace the cache for that request. Proxy caching of media files is desirable when using object storage as a way of minimizing bandwidth costs, but has the drawback of leaving deleted media files for a configured amount of cache time. A cache buster can make those media files immediately unavailable. This especially makes sense when suspending and unsuspending an account.	2020-11-19 17:38:06 +01:00
ThibG	966593393e	Fix DMs not appearing into timelines (#15182 ) Fixes #15179	2020-11-19 00:23:46 +01:00
ThibG	d8d43a427a	Fix image uploads being random data when canvas read access is blocked (#15180 ) Fixes #15178 PR #11499 introduced a way to deal with all-white canvas, but newer Firefox versions set random data instead. This PR detects whether canvas operations are reliable by comparing the results on a hardcoded 2×2 pixels image, and memoizing the result. This should be both more reliable and faster than the previous check.	2020-11-18 18:01:58 +01:00
Eugen Rochko	18ca4e0e9a	Fix pop-out player appearing on mobile screens in web UI (#15157 ) Fix #15092	2020-11-16 05:16:39 +01:00
Eugen Rochko	04a079e723	Add hotkeys for audio/video control (#15158 ) Fix #14515	2020-11-15 14:24:54 +01:00
Thibaut Girka	de5cc20dd8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.	2020-11-14 00:30:36 +01:00
ThibG	0a4d0e8320	Fix AccountDeletionWorker not accepting keyword arguments (#15152 )	2020-11-13 22:17:04 +01:00
Thibaut Girka	8ffae82fa6	Fix minor design issues with fav confirmation modal	2020-11-13 01:14:52 +01:00
Thibaut Girka	339f78fb63	Fix media not being marked sensitive when outgoing CW is set Fixes #1461 Fixes a regression from a recent merge	2020-11-13 01:05:55 +01:00
Thibaut Girka	265b26489a	Fix “Show boosts/replies in public timelines” only affecting streaming Fixes #1456	2020-11-12 23:44:53 +01:00
Thibaut Girka	10bd6f415d	Improve searching for private toots from URL Most of the time, when sharing toots, people use the toot URL rather than the toot URI, which makes sense since it is the user-facing URL. In Mastodon's case, the URL and URI are different, and Mastodon does not have an index on URL, which means searching a private toot by URL is done with a slow query that will only succeed for very recent toots. This change gets rid of the slow query, and attempts to guess the URI from URL instead, as Mastodon's are predictable.	2020-11-12 23:44:30 +01:00
Eugen Rochko	aa10200e58	Fix streaming API allowing connections to persist after access token invalidation (#15111 ) Fix #14816	2020-11-12 23:05:24 +01:00
Eugen Rochko	8532429af7	Fix 2FA/sign-in token sessions being valid after password change (#14802 ) If someone tries logging in to an account and is prompted for a 2FA code or sign-in token, even if the account's password or e-mail is updated in the meantime, the session will show the prompt and allow the login process to complete with a valid 2FA code or sign-in token	2020-11-12 23:05:01 +01:00
Thibaut Girka	3f09d4ca03	Add missing locales to glitch flavor	2020-11-12 22:27:44 +01:00
Takeshi Umeda	412fe2ebb0	[Glitch] Add interrelationship icon Port SCSS changes from `148ce97e21` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-12 22:24:24 +01:00
Eugen Rochko	0aeb833317	[Glitch] Add button to dismiss desktop notifications permissions banner Port `4790a126be` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-12 22:23:06 +01:00
Thibaut Girka	c077cdaba7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.	2020-11-12 22:13:57 +01:00
ThibG	9870b175b4	Fix possible inconsistencies in tag search (#14906 ) Do not downcase the queried tag before passing it to postgres when searching: - tags are not downcased on creation - `arel_table[:name].lower.matches(pattern)` generates an ILIKE anyway - if Postgres and Rails happen to use different case-folding rules, downcasing before query but not before insertion may mean that some tags with some casings are not searchable	2020-11-12 18:35:23 +01:00
Takeshi Umeda	148ce97e21	Add interrelationship icon (#15149 ) * Add interrelationship icon * Fix arrow for rtl * Fix to predefined color	2020-11-12 17:43:12 +01:00
Takeshi Umeda	2b1a6e734f	Add follow selected followers button (#15148 ) * Add follow selected followers button * Fix unused variable * Fix i18n normalize	2020-11-12 16:58:00 +01:00
Eugen Rochko	4790a126be	Add button to dismiss desktop notifications permissions banner (#15141 )	2020-11-11 05:36:29 +01:00
Eugen Rochko	f1858f08c2	Remove auto-redirect to direct messages in web UI (#15142 )	2020-11-11 05:36:22 +01:00
Yamagishi Kazutoshi	5206ede9c9	Add missing locales (#15138 )	2020-11-10 14:44:17 +01:00
Eugen Rochko	880fc9baaf	New Crowdin updates (#15110 ) * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Armenian) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Bulgarian) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Czech) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations simple_form.en.yml (Hebrew) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (Armenian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Croatian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations doorkeeper.en.yml (Croatian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations doorkeeper.en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Urdu (Pakistan)) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations simple_form.en.yml (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Macedonian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Georgian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations simple_form.en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations devise.en.yml (Turkish) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Kabyle) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations simple_form.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations simple_form.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations devise.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations activerecord.en.yml (Icelandic) [ci skip] * New translations devise.en.yml (Icelandic) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations activerecord.en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * Fix invalid syntax * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * bundle exec i18n-tasks normalize * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Icelandic) [ci skip] * bundle exec i18n-tasks normalize * New translations simple_form.en.yml (Vietnamese) [ci skip] * bundle exec i18n-tasks normalize [ci skip] Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-11-10 16:53:54 +09:00
Eugen Rochko	337dc6e0ad	Fix updating account counters when account_stat is not yet created (#15108 )	2020-11-09 16:00:23 +01:00
Thibaut Girka	ecd83f495c	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-09 10:53:53 +01:00
Yamagishi Kazutoshi	2b63c62c57	Remove unnecessary messages (#15109 ) * Remove unnecessary messages * ran `i18n-tasks normalize`	2020-11-09 01:43:16 +01:00
ThibG	b0893291ef	Fix Move handler not being triggered when failing to fetch target (#15107 ) When failing to fetch the target account, the ProcessingWorker fails as expected, but since it hasn't cleared the `move_in_progress` flag, the next attempt at processing skips the `Move` activity altogether. This commit changes it to clear the flag when encountering any unexpected error on fetching the target account. This is likely to occur because, of, e.g., a timeout, when many instances query the same actor at the same time.	2020-11-09 01:41:52 +01:00
Eugen Rochko	cc98f967b1	New Crowdin updates (#14388 ) * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations devise.en.yml (Norwegian) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (French) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations doorkeeper.en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (German) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations devise.en.yml (German) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations devise.en.yml (Corsican) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations simple_form.en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations devise.en.yml (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Standard Moroccan Tamazight) [ci skip] * New translations en.yml (Standard Moroccan Tamazight) [ci skip] * New translations simple_form.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations activerecord.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations devise.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations devise.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations devise.en.yml (Turkish) [ci skip] * New translations activerecord.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * ran `i18n-tasks normalize` * ran `yarn manage:translations` * ran `i18n-tasks normalize` * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-11-09 00:56:52 +01:00
ThibG	1e64666662	Fix crash in SuspendAccountWorker (#15106 ) * Fix crash in SuspendAccountWorker `follows` is an array thanks to `to_a` * Fix code style issue Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-11-08 18:29:48 +01:00
Thibaut Girka	0437d70628	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.	2020-11-08 14:20:35 +01:00
Eugen Rochko	3134691948	Add support for reversible suspensions through ActivityPub (#14989 )	2020-11-08 00:28:39 +01:00
Mashiro	e4d62042bd	[Glitch] Add limitation of image's max zoom rate (max to the original size of image) Port `f720af6b72` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-07 18:33:16 +01:00
dependabot[bot]	91c2f14fd2	[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1 Port `e16b0fb15a` to glitch-soc Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-07 18:32:09 +01:00
Thibaut Girka	412218af2e	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
ThibG	ee8cf246cf	Fix crashes in SuspendAccountService/UnsuspendAccountService (#15100 ) * Fix crashes in SuspendAccountService/UnsuspendAccountService * Catch filesystem errors	2020-11-07 13:16:54 +01:00
ThibG	f84239ecab	Fix suspension/unsuspension not working because of FeedManager change (#15099 )	2020-11-07 13:16:00 +01:00
Eugen Rochko	9b1f2a4b61	Add subresource integrity for JS and CSS assets (#15096 ) Fix #2744	2020-11-06 11:56:31 +01:00
Mélanie Chauvel	68d4b2b83e	Display “Show newer” and “Show older” instead of “Show more” in public pages (#15052 )	2020-11-04 21:15:45 +01:00
ThibG	b29defb851	Change order of announcements in admin page to sort them newest-first (#15091 ) * Change order of announcements in admin page to sort show newly-created first Fixes #15090 * Use reverse-chronological rather than creation date only	2020-11-04 21:15:22 +01:00
Takeshi Umeda	d6fe0c94ca	Add account sensitized (#14361 ) * Add account sensitized * Fix i18n normalize * Fix description and spec * Fix spec * Fix wording	2020-11-04 20:45:01 +01:00
Mashiro	f720af6b72	Add limitation of image's max zoom rate (max to the original size of image) (#15094 ) * limit image max scale rate to fit the actual image size * replace with MIN_SCALE * fix behavior on touch screen	2020-11-04 20:43:31 +01:00
Thibaut Girka	5a9fc749c3	Fix unsightly re-layout delay for media previews	2020-11-04 18:53:52 +01:00
Thibaut Girka	a48dbc78f8	Fix hiding video breaking playback Also make the video player code closer to upstream	2020-11-04 18:53:39 +01:00
dependabot[bot]	e16b0fb15a	Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003 ) * Bump detect-passive-events from 1.0.5 to 2.0.1 Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events) from 1.0.5 to 2.0.1. - [Release notes](https://github.com/rafgraph/detect-passive-events/releases) - [Commits](https://github.com/rafgraph/detect-passive-events/compare/v1.0.5...v2.0.1) Signed-off-by: dependabot[bot] <support@github.com> * Migrate to detect-passive-events v2 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-11-05 02:21:05 +09:00
Mashiro	dc86d814d9	[Glitch] add mouse scroll lock in image expand view Port `f645dad661` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-04 12:24:40 +01:00
Mashiro	40af1cf65b	[Glitch] Add expand/compress image button on image view box Port `6a2db10f76` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-04 12:24:40 +01:00
mayaeh	f5df3d1ae2	[Glitch] Fix width of content text fluctuating over time Port `2ae751f19d` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-04 12:24:40 +01:00
Mélanie Chauvel	078744f210	[Glitch] Make visibility icon clickable as part of the time of a toot Port `1d07f51039` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-04 12:24:40 +01:00
Mélanie Chauvel	578e757d09	[Glitch] Make click area of video/audio player buttons bigger in WebUI Port `a5afbb62d2` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-03 17:42:40 +01:00
ThibG	adfaf9551c	[Glitch] Fix some account media gallery items having empty labels Port `9d023ed4f6` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-03 17:38:50 +01:00
fuyu	37dfb9dddc	[Glitch] Fix wrong seek bar width on media player Port `8d7fbe7dd9` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-03 17:37:53 +01:00
Mélanie Chauvel	3b96141633	[Glitch] Make “Mark media as sensitive” properly translatable Port `c5704e75ae` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-11-03 17:36:54 +01:00
Thibaut Girka	cd675fbe18	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-03 17:28:54 +01:00
Mashiro	f645dad661	add mouse scroll lock in image expand view (#15088 ) * add mouse scroll lock in image expand view * enhancement	2020-11-03 06:06:45 +01:00
Mashiro	6a2db10f76	Add expand/compress image button on image view box (#15068 ) * add zoom image button * enhance zoom algorithm & add translation * code structure * code structure * code structure * enhance grab performance * rm useless state * fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel * remove scroll lock on MouseWheelEvent * code structure * enhance algorithm and code structure * rm Gemfile.lock from tree * codeclimate * fix a stupid mistake	2020-11-02 21:16:38 +01:00
ThibG	fa929d8b81	Tweak signature verification (#15069 ) * Add more specific error message when request body digest is invalid This may help other implementors debug their implementation. * Relax Host parameter requirement to GET requests The only POST requests processed by Mastodon need objects/actors (including their host) to be explicitly mentioned in the request's body, so replaying a legitimate request to another host should not be a security issue. * Support Digest headers using multiple algorithms or lowercase alogirthm names	2020-11-01 23:38:31 +01:00
ThibG	9d023ed4f6	Fix some account media gallery items having empty labels (#15073 ) Remove the labels entirely for images instead of putting an empty label.	2020-11-01 18:31:39 +01:00
Thibaut Girka	b8e790c3c2	Fix crash when viewing a profile with a filtered out pinned toot	2020-11-01 16:53:03 +01:00
ThibG	c49805efb1	Fix poll ending notifications being created for each vote (#15071 ) On a poll ending, notifications were created for each vote instead of for each voter.	2020-11-01 06:34:43 +01:00
Darius Kazemi	f1f0400adc	Show announcements in reverse chronological order (#15065 )	2020-10-30 13:09:51 +01:00
fuyu	8d7fbe7dd9	Fix wrong seek bar width on media player (#15060 )	2020-10-30 13:09:20 +01:00
Thibaut Girka	5a41704f89	Fix IP blocks in admin panel It was broken due to discrepancies between upstream and glitch-soc's theming system.	2020-10-28 23:55:41 +01:00
mayaeh	2ae751f19d	Fix width of content text fluctuating over time (#15055 )	2020-10-27 13:34:02 +01:00
Thibaut Girka	a81bb14abe	Add option to hide notification markers	2020-10-27 11:20:11 +01:00
Mélanie Chauvel	c5704e75ae	Make “Mark media as sensitive” properly translatable (#15051 )	2020-10-27 03:05:50 +01:00
Mélanie Chauvel	1d07f51039	Make visibility icon clickable as part of the time of a toot (#15053 ) - Makes permalink to a toot more easily clickable - Fix clicking between icon and time in fact clicking the display name - Fix clicking slightly under time in fact clicking the display name	2020-10-27 03:00:47 +01:00
Mélanie Chauvel	0a8ab822e2	Sort filters by “keyword or phrase” in Settings (#15050 )	2020-10-27 03:00:06 +01:00
Mélanie Chauvel	a5afbb62d2	Make click area of video/audio player buttons bigger in WebUI (#15049 )	2020-10-27 02:58:47 +01:00
Thibaut Girka	49ee69f75f	Add local setting for pop-in player position	2020-10-26 20:51:28 +01:00
Thibaut Girka	ea5298ab9b	Add setting to disable the pop-in player	2020-10-26 20:31:54 +01:00
Thibaut Girka	5ee2b860f9	Respect glitch-soc's reply counter setting in the pop-in player	2020-10-26 20:31:54 +01:00
Eugen Rochko	47edac871c	[Glitch] Fix regressions in icon buttons in web UI Port `a549415868` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-26 19:51:09 +01:00
Eugen Rochko	8f950e540b	[Glitch] Add pop-out player for audio/video in web UI port `d88a79b456` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-26 19:51:09 +01:00
ThibG	ddbb9f0ec4	[Glitch] Fix follow request notifications Port `3678b10823` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-26 15:50:48 +01:00
Thibaut Girka	9c34090db8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes	2020-10-26 15:48:16 +01:00
ThibG	3678b10823	Fix follow request notifications (#15048 )	2020-10-26 15:41:28 +01:00
ThibG	1f945e7390	Fix followers synchronization mechanism not being triggered on mentions (#15026 ) e.g. if someone on an instance that previously had followers gets mentioned in a private toot, before this PR, they would not receive a Collection-Synchronization header and may show the toot to the former followers in addition to the mentioned person.	2020-10-23 14:22:16 +02:00
ThibG	fb586584f2	Fix account processing failing because of large collections (#15027 ) Fixes #15025	2020-10-23 14:21:31 +02:00
mayaeh	5c60f7eaed	[Glitch] Fix strings that could not be translated Port `fb5f3be18f` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 21:49:46 +02:00
Eugen Rochko	4ae4b03974	[Glitch] Change how missing desktop notifications permission is displayed Port `a69ca29473` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 21:49:46 +02:00
Thibaut Girka	dca05c79a9	Move columns-related CSS rules into the appropriate files	2020-10-21 21:28:47 +02:00
ThibG	b5927301cf	[Glitch] Fix browser notification permission request logic Port `f54ca3d08e` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 21:28:47 +02:00
OSAMU SATO	78ad04420c	[Glitch] Add duration parameter to muting. Port `96761752ec` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 21:28:47 +02:00
ThibG	813c84cd6c	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible Port `4c45b43cb8` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 21:28:47 +02:00
ThibG	842c048c6b	[Glitch] Fix unread notification marker not updating when mounting column Port `dac3e362fd` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 19:36:41 +02:00
ThibG	f7306c7b7c	[Glitch] Ignore alt-key hotkeys in text fields Port `63770d3aac` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 19:34:44 +02:00
Takeshi Umeda	8071613dd7	[Glitch] Fix mark as read in notifications to be saved immediately Port `bec8b12bb5` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 19:33:20 +02:00
ThibG	c3d82027cf	[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts Port `82951920f7` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-10-21 19:24:32 +02:00
Thibaut Girka	ec49aa8175	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.	2020-10-21 19:10:50 +02:00
ThibG	ca56527140	Add follower synchronization mechanism (#14510 ) * Add support for followers synchronization on the receiving end Check the `collectionSynchronization` attribute on `Create` and `Announce` activities and synchronize followers from provided collection if possible. * Add tests for followers synchronization on the receiving end * Add support for follower synchronization on the sender's end * Add tests for the sending end * Switch from AS attributes to HTTP header Replace the custom `collectionSynchronization` ActivityStreams attribute by an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as the `Signature` header and the following fields: - `collectionId` to specify which collection to synchronize - `digest` for the SHA256 hex-digest of the list of followers known on the receiving instance (where “receiving instance” is determined by accounts sharing the same host name for their ActivityPub actor `id`) - `url` of a collection that should be fetched by the instance actor Internally, move away from the webfinger-based `domain` attribute and use account `uri` prefix to group accounts. * Add environment variable to disable followers synchronization Since the whole mechanism relies on some new preconditions that, in some extremely rare cases, might not be met, add an environment variable (DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and avoid followers being incorrectly removed. The current conditions are: 1. all managed accounts' actor `id` and inbox URL have the same URI scheme and netloc. 2. all accounts whose actor `id` or inbox URL share the same URI scheme and netloc as a managed account must be managed by the same Mastodon instance as well. As far as Mastodon is concerned, breaking those preconditions require extensive configuration changes in the reverse proxy and might also cause other issues. Therefore, this environment variable provides a way out for people with highly unusual configurations, and can be safely ignored for the overwhelming majority of Mastodon administrators. * Only set follower synchronization header on non-public statuses This is to avoid unnecessary computations and allow Follow-related activities to be handled by the usual codepath instead of going through the synchronization mechanism (otherwise, any Follow/Undo/Accept activity would trigger the synchronization mechanism even if processing the activity itself would be enough to re-introduce synchronization) * Change how ActivityPub::SynchronizeFollowersService handles follow requests If the remote lists a local follower which we only know has sent a follow request, consider the follow request as accepted instead of sending an Undo. * Integrate review feeback - rename X-AS-Collection-Synchronization to Collection-Synchronization - various minor refactoring and code style changes * Only select required fields when computing followers_hash * Use actor URI rather than webfinger domain in synchronization endpoint * Change hash computation to be a XOR of individual hashes Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues. * Marginally improve followers_hash computation speed * Further improve hash computation performances by using pluck_each	2020-10-21 18:04:09 +02:00
abcang	9649ca0fbe	Removed disabling comments for Style/MethodMissingSuper (#15014 ) * Removed disabling comments for Style/MethodMissingSuper * Update rubocop for codeclimate	2020-10-20 09:13:39 +02:00
otrapersona	29870d2be6	Glitchsoc translation to 'es' language (#1439 ) glitch-soc-specific translation to 'es' language	2020-10-19 22:17:29 +02:00
Josh Leeb-du Toit	0c24f4dce2	Add support for Gemini urls (#15013 ) This PR updates the `valid_url` regex and sanitizer allowlist to provide support for Gemini urls. Closes #14991	2020-10-19 17:02:13 +02:00
mayaeh	4130aef29c	Fix translation string (#14986 )	2020-10-16 21:41:43 +02:00
mayaeh	fb5f3be18f	Fix strings that could not be translated (#14980 )	2020-10-15 21:24:58 +02:00
Eugen Rochko	a69ca29473	Change how missing desktop notifications permission is displayed (#14985 ) Add missing controls for new notification type	2020-10-15 16:24:47 +02:00
Takeshi Umeda	b4c4af18dc	Fix a bear check when the activity object is nil (#14981 )	2020-10-13 22:41:00 +02:00
Thibaut Girka	311f457430	Fix crash when autolinking an invalid URI in Markdown	2020-10-13 14:35:07 +02:00
ThibG	4c45b43cb8	Change how CDN_HOST is passed down to make assets build reproducible (#14381 ) * Change how CDN_HOST is passed down to make assets build reproducible * Change webpacker/webpack configuration to dynamically load publicPath based on meta header * Fix embedded layout missing the cdn-host meta header	2020-10-13 01:19:35 +02:00
OSAMU SATO	96761752ec	Add duration parameter to muting. (#13831 ) * Adding duration to muting. * Remove useless checks	2020-10-13 01:01:14 +02:00
ThibG	f54ca3d08e	Fix browser notification permission request logic (#13543 ) * Add notification permission handling code * Request notification permission when enabling any notification setting * Add badge to notification settings when permissions insufficient * Disable alerts by default, requesting permission and enable them on onboarding	2020-10-13 00:37:21 +02:00
Eugen Rochko	5e1364c448	Add IP-based rules (#14963 )	2020-10-12 16:33:49 +02:00
ThibG	dc52a778e1	Fix issue checking for last unread notification when there are gaps (#14960 )	2020-10-09 17:12:52 +02:00
Thibaut Girka	cd861c051c	Fix issue checking for last unread notification when there are gaps	2020-10-08 22:44:30 +02:00
ThibG	dac3e362fd	Fix unread notification marker not updating when mounting column (#14954 )	2020-10-08 00:35:27 +02:00
Eugen Rochko	7d985f2aac	Remove dependency on goldfinger gem (#14919 ) There are edge cases where requests to certain hosts timeout when using the vanilla HTTP.rb gem, which the goldfinger gem uses. Now that we no longer need to support OStatus servers, webfinger logic is so simple that there is no point encapsulating it in a gem, so we can just use our own Request class. With that, we benefit from more robust timeout code and IPv4/IPv6 resolution. Fix #14091	2020-10-08 00:34:57 +02:00
ThibG	63770d3aac	Ignore alt-key hotkeys in text fields (#14942 ) Fixes #14862 This used to be the case until #13987, which introduced a hotkey to toggle the Content Warning field. Unfortunately, MacOS relies on the “alt” key for many things, including composing text (see #14862), therefore, even if that makes the CW toggle hotkey significantly less useful, it makes sense to not interfere with composing toots.	2020-10-05 22:04:06 +02:00
mayaeh	5a9ad221bf	Update translation files (#14920 )	2020-10-05 02:57:38 +02:00
Eugen Rochko	a549415868	Fix regressions in icon buttons in web UI (#14915 )	2020-10-04 15:02:36 +02:00
Takeshi Umeda	bec8b12bb5	Fix mark as read in notifications to be saved immediately (#14907 ) * Fix mark as read in notifications to be saved immediately * fix code style	2020-10-01 04:17:46 +02:00
ThibG	65136600e3	Fix logging out on mobile (#14901 ) Fixes #14900	2020-09-30 19:31:17 +02:00
ThibG	78e45a5285	Add option to disable swiping motions across the WebUI (#13885 ) Fixes #13882	2020-09-30 19:31:03 +02:00
Takeshi Umeda	f5d08f2417	Fix unread notification markers (#14897 )	2020-09-29 15:30:56 +02:00
Thibaut Girka	b5edf30160	Fix boost icon not being displayed in boost notifications	2020-09-29 11:05:05 +02:00
ThibG	82951920f7	Fix bell button causing a brief “Cancel follow request” on locked accounts (#14896 )	2020-09-28 21:44:29 +02:00
Thibaut Girka	ccfc2b6dce	Make explicit in glitch-soc's WebUI when an account is suspended	2020-09-28 18:00:49 +02:00
Thibaut Girka	e3f822ac1b	Do not filter out temporarily-suspended accounts from relationships API	2020-09-28 17:56:16 +02:00
Eugen Rochko	dadec533ce	[Glitch] Fix unreadable placeholder text color in high contrast theme in web UI (#14803 ) Port `bbcbf12215` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 17:56:16 +02:00
Thibaut Girka	6dde075425	Fix actions being performed before the redux state is set up	2020-09-28 17:49:55 +02:00
ThibG	f8205b7b4a	[Glitch] Add paragraph about browser add-ons when encountering some errors Port `b67caf9be4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 17:49:55 +02:00
Eugen Rochko	14869ee656	[Glitch] Add option to be notified when a followed user posts Port `974b1b79ce` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 17:49:55 +02:00
Eugen Rochko	0a069bffd9	[Glitch] Optimize the process of following someone Port front-end changes from `6d59dfa15d` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 17:49:55 +02:00
Eugen Rochko	6775de3fc9	[Glitch] Change web UI to show empty profile for suspended accounts Port `fcb9350ff8` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 17:49:55 +02:00
ThibG	572d1a1bf8	[Glitch] Fix home TL marker code mishandling gaps Port `eaea2311aa` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 15:00:19 +02:00
ThibG	4586202448	[Glitch] Fix notification filter bar incorrectly filtering gaps Port `aab867b0e8` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 14:59:10 +02:00
ThibG	d31792a2a6	[Glitch] Add border around 🕺 emoji Port `91eecd1b3c` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-28 14:58:25 +02:00
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	2020-09-28 14:13:30 +02:00
Eugen Rochko	d88a79b456	Add pop-out player for audio/video in web UI (#14870 ) Fix #11160	2020-09-28 13:29:43 +02:00
ThibG	d60290044e	Add environment variable to allow requests to some private addresses (#14722 )	2020-09-26 20:57:39 +02:00
ThibG	ff89025979	Add unread notification markers (#14818 ) * Add unread notification markers Fixes #14804 * Allow IntersectionObserverArticle's children to be updated	2020-09-26 20:57:07 +02:00
Jeremy Rose	03b6b034b9	add og:published_time to opengraph meta tags (#14865 )	2020-09-24 23:32:13 +02:00
Takeshi Umeda	b655a7f88f	Fix a slow query for TagFeed (#14861 ) * Fix a slow query for TagFeed * rename tags to tag_ids	2020-09-23 16:01:54 +02:00
Takeshi Umeda	070026e634	Fix method of the DELETE DATA button (#14855 )	2020-09-21 20:37:19 +02:00
Eugen Rochko	8c8bf0289f	Fix not being able to enable status notifications in Web Push API (#14822 )	2020-09-21 17:48:55 +02:00
Thibaut Girka	787d5d7289	Fix minor bugs	2020-09-19 15:01:46 +02:00
Thibaut Girka	312c936d51	Minor refactoring and fixups	2020-09-19 14:15:28 +02:00
Thibaut Girka	85b9086e6b	Filter out mounted lists from “getting started” column	2020-09-18 20:07:25 +02:00
Eugen Rochko	974b1b79ce	Add option to be notified when a followed user posts (#13546 ) * Add bell button Fix #4890 * Remove duplicate type from post-deployment migration * Fix legacy class type mappings * Improve query performance with better index * Fix validation * Remove redundant index from notifications	2020-09-18 17:26:45 +02:00
Thibaut Girka	a681980307	Submit timeline markers closer to the moment they change	2020-09-17 15:22:56 +02:00
Thibaut Girka	60eebc6cc4	Fix crashes when connection drops	2020-09-17 15:22:56 +02:00
Thibaut Girka	f1c0cf9806	Add button to manually mark all notifications as read	2020-09-17 15:22:56 +02:00
Thibaut Girka	94c290d7d2	Only update read marker when giving focus/mounting column	2020-09-17 15:22:56 +02:00
Thibaut Girka	145ed37978	Refactor and change logic to only update marker if we reached the last read notification.	2020-09-17 15:22:56 +02:00
Thibaut Girka	66e9a77e36	Display unread marker for notifications	2020-09-17 15:22:56 +02:00
Thibaut Girka	ae698469d0	Clean up leftover from DM conversation view redesign	2020-09-17 15:22:56 +02:00
ThibG	eaea2311aa	Fix home TL marker code mishandling gaps (#14809 )	2020-09-16 20:17:40 +02:00
ThibG	aab867b0e8	Fix notification filter bar incorrectly filtering gaps (#14808 )	2020-09-16 20:17:16 +02:00
kawaguchi	5d3c8baa9a	Fix validates :sign_count of WebauthnCredential (#14806 )	2020-09-16 20:16:46 +02:00
Eugen Rochko	ed099d8bdc	Change account suspensions to be reversible by default (#14726 )	2020-09-15 14:37:58 +02:00
Eugen Rochko	bbcbf12215	Fix unreadable placeholder text color in high contrast theme in web UI (#14803 ) Fix #14717	2020-09-15 09:24:24 +02:00
ThibG	b67caf9be4	Add paragraph about browser add-ons when encountering some errors (#14801 ) * Add paragraph about browser add-ons when encountering some errors When a crash is caused by a NotFoundError exception, add a paragraph to the error page mentioning browser add-ons. Indeed, crashes with NotFoundError are often caused by browser extensions messing with the DOM in ways React.JS can't recover from (e.g. issues #13325 and #14731). * Reword error messages	2020-09-14 15:05:22 +02:00
ThibG	cd4ec7cd74	Do not serve account actors at all in limited federation mode (#14800 ) * Do not serve account actors at all in limited federation mode When an account is fetched without a signature from an allowed instance, return an error. This isn't really an improvement in security, as the only information that was previously returned was required protocol-level info, and the only personal bit was the existence of the account. The existence of the account can still be checked by issuing a webfinger query, as those are accepted without signatures. However, this change makes it so that unallowed instances won't create account records on their end when they find a reference to an unknown account. The previous behavior of rendering a limited list of fields, instead of not rendering the actor at all, was in order to prevent situations in which two instances in Authorized Fetch mode or Limited Federation mode would fail to reach each other because resolving an account would require a signed query… from an account which can only be fetched with a signed query itself. However, this should now be fine as fetching accounts is done by signing on behalf of the special instance actor, which does not require any kind of valid signature to be fetched. * Fix tests	2020-09-14 13:04:29 +02:00
Eugen Rochko	42c4322ce7	Fix reported statuses not being included in warning e-mail (#14778 )	2020-09-13 12:52:17 +02:00
tateisu	fa0c71f0d9	allow pagination by min_id and max_id (#14776 ) * allow pagination by min_id and max_id * also AccountConversation allows min_id,max_id pair * also home,list TL allows min_id,max_id pair	2020-09-12 17:09:49 +02:00
Eugen Rochko	4e4b3a0c8e	Refactor settings controllers (#14767 ) - Disallow suspended accounts from revoking sessions and apps - Allow suspended accounts to access exports	2020-09-11 20:56:35 +02:00
Eugen Rochko	e6b272e5c9	Change REST API to return empty data for suspended accounts (#14765 )	2020-09-11 15:16:29 +02:00
ThibG	91eecd1b3c	Add border around 🕺 emoji (#14769 ) Fixes #14768	2020-09-10 19:08:03 +02:00
kedama	afa753a890	[Glitch] Set z-index of dropdown to 9999. Port `678f5ed296` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-10 17:44:38 +02:00
Eugen Rochko	fcb9350ff8	Change web UI to show empty profile for suspended accounts (#14766 )	2020-09-10 00:07:19 +02:00
Thibaut Girka	9748f074a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.	2020-09-08 16:26:47 +02:00
Eugen Rochko	65760f59df	Refactor feed manager (#14761 )	2020-09-08 03:41:16 +02:00
ThibG	517af45e32	Fix multiple boosts of a same toot erroneously appearing in TL (#14759 ) * Check for and record reblog info atomically Instead of using ZREVRANK to determine whether a reblog is a new reblog or not, use ZADD's NX option to perform the check/addition option atomically. * Replace ZREVRANK call with ZSCORE key which is more efficient * Make tests a bit stricter * Fix off-by-one	2020-09-07 18:00:15 +02:00
abcang	e79d719e92	Changed tag most_used to recently_used (#14760 )	2020-09-07 17:47:41 +02:00
Eugen Rochko	e8bc187845	Refactor how public and tag timelines are queried (#14728 )	2020-09-07 11:02:04 +02:00
Thibaut Girka	e5f934ddf0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.	2020-09-07 09:21:38 +02:00
Eugen Rochko	a6121a159c	Remove obsolete IndexedDB operations from web UI (#14730 ) Storing objects in IndexedDB was disabled in #7932, but we were still trying to read objects from it before making an API call	2020-09-04 20:22:40 +02:00
Takeshi Umeda	272aa4a109	Fix direct visibility style for light theme (#14727 )	2020-09-04 08:49:56 +02:00
ThibG	abee40b232	Add outbox attribute to instance actor (#14721 ) It's not useful for now, but it's required by ActivityPub	2020-09-02 18:42:50 +02:00
Takeshi Umeda	33ad850c98	Added account featured tags API (#11817 )	2020-09-02 02:13:10 +02:00
Eugen Rochko	17340365bb	Add featured hashtags as an ActivityPub collection (#11595 )	2020-09-02 02:11:12 +02:00
ThibG	787a629b8f	[Glitch] Update Tesseract.js Port `5fc5a9f9f1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-01 17:10:20 +02:00
ThibG	a2d66a90e6	[Glitch] Add border around 🐞 emoji Port JS change from `f0b6ddd979` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-01 17:08:09 +02:00
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	2020-09-01 17:02:18 +02:00
Thibaut Girka	d95dd3883e	Change radio button design to be consistent with that of the directory explorer Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-01 14:09:35 +02:00
Thibaut Girka	70e64206be	Capitalize replies_policy strings Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-09-01 14:09:35 +02:00
ThibG	79305428a7	Add configuration option to filter replies in lists (#9205 ) * Add database support for list show-reply preferences * Add backend support to read and update list-specific show_replies settings * Add basic UI to set list replies setting * Add specs for list replies policy * Switch "cycling" reply policy link to a set of radio inputs * Capitalize replies_policy strings * Change radio button design to be consistent with that of the directory explorer	2020-09-01 13:31:28 +02:00
Eugen Rochko	1c308af84c	Change own direct-visibility statuses to be in the home feed again (#14711 ) And remove highlighting in web UI Full circle from #8940	2020-09-01 13:30:42 +02:00
Thibaut Girka	e02f375d22	Fix threaded mode Fixes #1414	2020-09-01 09:37:17 +02:00
dependabot[bot]	8972e5f7f6	Bump rubocop from 0.86.0 to 0.88.0 (#14412 ) * Bump rubocop from 0.86.0 to 0.88.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix for latest RuboCop Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2020-09-01 03:04:00 +02:00
ThibG	5fc5a9f9f1	Update Tesseract.js (#14708 ) * [WiP] Update Tesseract.js - Update Tesseract.js to 2.2.1 - Use versioned file names - differentiate two progression states: preparing OCR and detecting picture * Get rid of copy-webpack-plugin	2020-09-01 00:26:10 +02:00
Thibaut Girka	38182fceb3	Fix crash when opening detailed view of a status you boosted	2020-08-31 23:48:16 +02:00
ThibG	f0b6ddd979	Add border around 🐞 emoji (#14712 )	2020-08-31 23:30:27 +02:00
ThibG	7febf19296	Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted (#14707 ) * Add back "Home" link to "Getting started" when Home column isn't mounted * Fix keys in getting_started It should not matter much in practice as the list of items will only change extremely rarely, but having a `key` that corresponds to the actual item makes much more sense than having it be the index of the item within the list.	2020-08-31 18:11:37 +02:00
Takeshi Umeda	b1bb1906be	Fix limited follower id in fan-out-on-write service (#14709 )	2020-08-31 18:11:27 +02:00
Akihiko Odaki	ae871c4d46	Make Array-creation behavior of Paginable more predictable (#14687 ) * Make Array-creation behavior of Paginable more predictable Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it returns an Array if min_id option is present. The behavior caused problems fixed with the following commits: - `552e886b64` - `b63ede5005` - `64ef37b89d` To prevent from recurring similar problems, this commit introduces two changes: - The scope now always returns an Array whether min_id option is present or not. - The scope is renamed to to_a_paginated_by_id to clarify it returns an Array. * Transform Paginable.to_a_paginated_by_id from a scope to a class method https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope > The method is intended to return an ActiveRecord::Relation object, which > is composable with other scopes. Paginable.to_a_paginated_by_id returns an Array and is not appropriate as a scope.	2020-08-31 12:47:09 +02:00
Thibaut Girka	a68ec50e4e	Adapt 2FA changes to glitch-soc's theming system	2020-08-30 17:26:18 +02:00
santiagorodriguez96	a340e653df	[Glitch] Add WebAuthn as an alternative 2FA method Port CSS changes from `e8d41bc2fe` Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 17:21:16 +02:00
Tdxdxoz	bf55b5463a	[Glitch] Fix: also use custom private boost icon for detailed status Port `a3ec9af9b0` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 16:51:16 +02:00
Daigo 3 Dango	72b1d5fdc5	[Glitch] Better manage subscriptionCounters Port `9669557be1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 16:35:33 +02:00
proxy	3bbf6b1519	[Glitch] reword "boost to original audience" as per tootsuite#14596 Port `46210a65d1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 16:34:38 +02:00
Takeshi Umeda	cd806663af	[Glitch] Fix click range discrepancies in gifv Port `debf6ae316` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 16:31:41 +02:00
ThibG	45d1f34a30	[Glitch] Fix scrolling issues when closing some dropdown menus Port `c7cfd4e67a` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-08-30 16:31:02 +02:00
Thibaut Girka	8c3c27bf06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.	2020-08-30 16:13:08 +02:00
Eugen Rochko	52157fdcba	Add support for dereferencing objects through bearcaps (#14683 )	2020-08-30 12:34:20 +02:00

... 3 4 5 6 7 ...

8727 Commits