3989 Commits (f8e6d5ed5c03aa5405cbf2c109abf7c42fc72b3a)

Author	SHA1	Message	Date
Thibaut Girka	e859334b33	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system	5 years ago
Eugen Rochko	37795253fc	Revert "Fix an eslint warning (#12426)" (#12596) ... This reverts commit b93456fd64.	5 years ago
Thibaut Girka	a9cece1403	Fix erroneous inclusion of upstream code	5 years ago
Hinaloe	e3cac8df6d	[Glitch] Highlight border when focusing poll-form footer ... Port 26dedf7857 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Takeshi Umeda	5ccd525287	[Glitch] Add basic support for group actors ... Port 58dd9698c3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	2674dd5701	[Glitch] Fix poll options not being selectable via keyboard ... Port c53ba20166 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	8bc0822716	[Glitch] Add follow_request notification type ... Port 60d26cabf0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Shlee	1fb108c696	[Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2 ... Port 80a3e8e0e4 to glitch-soc Co-authored-by: hina <hina@hinaloe.net> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	2cc60e8b09	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	5 years ago
Hinaloe	26dedf7857	Highlight border when focusing poll-form footer (#12544)	5 years ago
Jeong Arm	d37ed5bc2a	Fix media open hotkey (#12546)	5 years ago
Takeshi Umeda	58dd9698c3	Add basic support for group actors (#12071) ... * Show badge on group actor in WebUI * Do not notify in case of by following group actor * If you mention group actor, also mention group actor followers * Relax characters that can be used in username (same as Application) * Revert "Relax characters that can be used in username (same as Application)" This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b. * Delete display_name method	5 years ago
Shlee	80a3e8e0e4	upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543) ... * Update stream.js * Update package.json * Update yarn.lock Co-authored-by: hina <hina@hinaloe.net>	5 years ago
ThibG	c53ba20166	Fix poll options not being selectable via keyboard (#12538) ... * Fix poll options not being selectable via keyboard Fixes #12384 * Improve styling of poll option checkboxes/radio buttons * Use more appropriate ARIA roles for poll options * Allow switching between single and multiple choice from keyboard * Coding style * Avoid using .bind()	5 years ago
ThibG	272bc36227	Fix blocking/unblocking users from status dropdown menu (#12535) ... Fixes #12511	5 years ago
mayaeh	08693d09ca	Fix notifications label (#12517) ... * Fix translations not being displayed * ran `yarn manage:translations en`	5 years ago
ThibG	60d26cabf0	Add follow_request notification type (#12198) ... * Add follow_request notification type The notification type already existed in the backend but was never pushed to the front-end. This also means translation strings were also available for the backend, from the notification mailer. Unlike other notification types, these are off by default, to match what I remember of Gargron's view on the topic: that follow requests should not clutter notifications and should instead be reviewed at the user's own leisure in the dedicated column. Since follow requests have their own column, I've deemed it unnecessary to add a specific tab for them in the notification quick filter. * Show follow request link in single-column if there are pending requests, even if account isn't locked * Push follow requests from notifications to the follow_requests list * Offer to accept or reject follow request from the notification * Redesign follow request notification	5 years ago
Eugen Rochko	9de10c16d7	[Glitch] Fix conversations not having an unread indicator in web UI ... Fix d15b346826 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	df04f885a5	[Glitch] Fix lost focus when modals open/close ... Port 6041cfb13d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	93167b3665	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	d15b346826	Fix conversations not having an unread indicator in web UI (#12506)	5 years ago
ThibG	6041cfb13d	Fix lost focus when modals open/close (#12437) ... * Fix lost focus after modal closes Regression caused by the use of the wicg-inert polyfill * Fix regression introduced by wicg-inert * Catch errors to please CodeClimate	5 years ago
Sasha Sorokin	2169e61bc9	[Glitch] Fix counter sizing ... Port 67a2dfa8ee to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	55d1f5c78c	[Glitch] Add hotkey for opening media files ... Port af891f82be to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	d9f15fb6ed	[Glitch] Fix pending upload count not being decremented on error ... Port 9b3ebf9166 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	95164e759b	[Glitch] Fix OCR with delete & redraft ... Port c872f1cdb6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	e48f63787d	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Sasha Sorokin	67a2dfa8ee	Fix counter sizing (#12446) ... Counter size is currently set to strict 33.3% width, but with it counter may break in other languages than English. For example it is already broken on Gargron's profile on mastodon.social using Russian locale. This commit changes "width" to "min-width", so counters still displayed correctly, but if they need more width to fit text, they are now allowed to take as many width as they need.	5 years ago
ThibG	af891f82be	Add hotkey for opening media files (#12498) ... * [WiP] Add hotkey to open media * Give focus to play/pause button when opening video modal	5 years ago
ThibG	9b3ebf9166	Fix pending upload count not being decremented on error (#12499) ... The arguments were passed to the wrong function… also, there is no need to have a conditional decrementation: failure to upload means we marked an upload as pending, in all cases.	5 years ago
Thibaut Girka	510f98c7c2	Link move target account	5 years ago
Thibaut Girka	b78c9e0980	Show acct of target account	5 years ago
Thibaut Girka	5bf65f4e97	Add moved account warning	5 years ago
ThibG	c872f1cdb6	Fix OCR with delete & redraft (#12465)	5 years ago
ThibG	c3afeaf0fc	[Glitch] Fix blur behind closed registration message ... Port SCSS changes from d1eebde0ff to glitch flavour Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	d72c04a88e	[Glitch] Change media description label to be context-sensitive ... Port ed940a3a4a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	5aa79af7cb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Dimitri Merejkowsky	b93456fd64	Fix an eslint warning (#12426)	5 years ago
ThibG	d1eebde0ff	Fix blur behind closed registration message (#12442) ... * Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425	5 years ago
ThibG	ed940a3a4a	Change media description label to be context-sensitive (#12270) ... “Describe for the visually impaired” makes no sense when the uploaded media is an audio file.	5 years ago
ThibG	333b93e632	[Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines ... Port 6364adba64 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	a96375d2ef	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	5 years ago
Eugen Rochko	c4601b8eb6	Fix account dropdown not opening due to regression from #12377 (#12430)	5 years ago
Eugen Rochko	9046efbcbd	Add relationship-based options to status dropdowns (#12377) ... Move bookmark action in inline statuses from action bar to dropdown	5 years ago
Eugen Rochko	8eac21be16	New Crowdin translations (#12146) ... * New translations en.json (Tamil) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations simple_form.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.yml (Kannada) [ci skip] * New translations simple_form.en.yml (Kannada) [ci skip] * New translations activerecord.en.yml (Kannada) [ci skip] * New translations devise.en.yml (Kannada) [ci skip] * New translations doorkeeper.en.yml (Kannada) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Marathi) [ci skip] * New translations simple_form.en.yml (Marathi) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations devise.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations simple_form.en.yml (Hindi) [ci skip] * New translations activerecord.en.yml (Hindi) [ci skip] * New translations devise.en.yml (Hindi) [ci skip] * New translations doorkeeper.en.yml (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.yml (Urdu (Pakistan)) [ci skip] * New translations simple_form.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Urdu (Pakistan)) [ci skip] * New translations devise.en.yml (Urdu (Pakistan)) [ci skip] * New translations doorkeeper.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations activerecord.en.yml (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Malayalam) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (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 (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Bengali) [ci skip] * i18n-tasks normalize * yarn manage:translations	5 years ago
ThibG	517c1cd062	Add bookmarks (#7107) ... * Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red	5 years ago
ThibG	6364adba64	Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) ... * Fix unread toot indicator not honoring onlyMedia in public and community timelines * Fixup: `unread` already accounts for new content in pending items	5 years ago
Thibaut Girka	1fa2d96434	[Glitch] Minor improvements to poll composing UI ... Port aa21aeb838 to glitch-soc	5 years ago
ThibG	c98e2faa41	[Glitch] Fix WebUI allowing to upload more items than the limit ... Port 83a88426ca to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	0fc784f8d0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's	5 years ago