glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Eugen Rochko	b6b2d8b8a3	Change design of account notes in web UI (#14208 ) * Change design of account notes in web UI * Fix `for` -> `htmlFor`	4 years ago
Thibaut Girka	c67752f255	Fix vanilla flavour too	4 years ago
Thibaut Girka	edd7bd26f6	Add UI option to show local-only toots in public timeline	4 years ago
Sasha Sorokin	55969e3bc2	Replace shortNumberFormat with <ShortNumber> (#14061 ) This commit introduces new utility component - ShortNumber. It should work almost the same way as original shortNumberFormat function, though it also localizes units and accepts one more prop - renderer. Renderer is a function that takes rendered short formatted number and also ready-to-pluralize number to format display result accordingly. Ready-to-pluralize number allows to correctly select plural for compactly notated numbers, respecting thousands and other units. Issue #12451 accurately describes the issue with using raw numbers when replacing counter with short version. In short, it doesn't work with languages such as Russian, that require different plurals, according to the unit number was compacted to. All previous usages of shortNumberFormat were replaced with new function, and as it became unused, it was removed to avoid misleading.	4 years ago
mayaeh	e439151df3	Fix restored words from "toot" to "status" (#14242 )	4 years ago
Eugen Rochko	3c51c7dd3e	[Glitch] Add color extraction for audio thumbnails Port `8517a5fdb4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	26227204df	[Glitch] Fix audio modals not using blurhash and poster Port `6163518115` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	f5afdaa2e0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.	4 years ago
Eugen Rochko	8517a5fdb4	Add color extraction for audio thumbnails (#14209 )	4 years ago
mayaeh	6f6e9d8214	Fix-up #13749 (#14204 )	4 years ago
Eugen Rochko	e282f9b671	[Glitch] Add customizable thumbnails for audio and video attachments Port `a3ce01a102` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	b907cc66e1	[Glitch] Fix various issues around OpenGraph representation of media Port audio player changes from `12ac904a33` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	9d737108a6	[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI Port `d0dc37eadb` to glitch-soc Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	27becaa9df	[Glitch] Change volume control and download buttons in web UI Port `ce34c13aff` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	a67ad4ffce	[Glitch] Fix audio player not working when media files are hosted on a different domain Port `90477d7e4d` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	a135f3bd98	[Glitch] Change design of audio players in web UI Port `563a77d0b4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	6163518115	Fix audio modals not using blurhash and poster (#14199 )	4 years ago
Takeshi Umeda	cd95fd8105	[Glitch] Fix the conditions for incomplete remote content Port `911c385f2f` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	5c6cf202ba	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	21f1cbaf30	New Crowdin translations (#13749 ) * New translations en.json (Galician) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (German) [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.json (Vietnamese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Dutch) [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.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [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.json (Vietnamese) [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.json (Vietnamese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Taigi) [ci skip] * New translations en.yml (Taigi) [ci skip] * New translations simple_form.en.yml (Taigi) [ci skip] * New translations activerecord.en.yml (Taigi) [ci skip] * New translations devise.en.yml (Taigi) [ci skip] * New translations doorkeeper.en.yml (Taigi) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [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 en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (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 (Chinese Simplified) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [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 doorkeeper.en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Silesian) [ci skip] * New translations en.yml (Silesian) [ci skip] * New translations simple_form.en.yml (Silesian) [ci skip] * New translations activerecord.en.yml (Silesian) [ci skip] * New translations devise.en.yml (Silesian) [ci skip] * New translations doorkeeper.en.yml (Silesian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (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 (Asturian) [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.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Vietnamese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Russian) [ci skip] * i18n-tasks normalize * yarn manage:translations	4 years ago
Takeshi Umeda	911c385f2f	Fix the conditions for incomplete remote content (#14195 )	4 years ago
Ariel	98aa197c07	[Glitch] Fix cursor type in statuses Port `eee8b314af` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	0f633143eb	[Glitch] Fix lock icon not being shown when locking account in profile settings Port `9e14647df8` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	928a3a9fd5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.	4 years ago
Eugen Rochko	ca238c879d	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191 )	4 years ago
Ariel	eee8b314af	Fix cursor type in statuses (#14185 )	4 years ago
ThibG	9e14647df8	Fix lock icon not being shown when locking account in profile settings (#14190 )	4 years ago
ThibG	3e51b04d40	Change move handler to carry blocks over (#14144 ) * Change move handler to carry blocks and mutes over When user A blocks user B and B moves to a new account C, make A block C accordingly. Note that it only works if A's instance is aware of the Move, that is, if B is on A's instance or has followers there. * Also notify instances with known people blocking you when moving * Add automatic account notes when blocking/muting an account that had no note	4 years ago
mayaeh	4b703d398a	follow-up #14149 (#14192 ) ran `yarn manage:translations en`	4 years ago
Thibaut Girka	9b91f64ff3	Add support for li attribute to li element	4 years ago
Thibaut Girka	c28f80802a	Add support for “start” and “reversed” attributes to ol element Fixes #1367	4 years ago
Eugen Rochko	36e5fd547b	Fix remote files not using Content-Type header, streaming (#14184 )	4 years ago
ThibG	50f439db96	[Glitch] Add user notes on accounts Port `3afc7977b1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
trwnh	9dcd3388f6	[Glitch] Fix padding on account header Port `41acf83cdf` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	a11fac77f3	[Glitch] Fix read marker state not being udpated internally Port `8b7066dc61` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	1c3764c6f8	[Glitch] Change sensitive preview cards to not blur text Port `c92278aa1c` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	2a2af880b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.	4 years ago
ThibG	3afc7977b1	Add user notes on accounts (#14148 ) * Add UserNote model * Add UI for user notes * Put comment in relationships entity * Add API to create user notes * Copy user notes to new account when receiving a Move activity * Address some of the review remarks * Replace modal by inline edition * Please CodeClimate * Button design changes * Change design again * Cancel note edition when pressing Escape * Fixes * Tweak design again * Move “Add note” item, and allow users to add notes to themselves * Rename UserNote into AccountNote, rename “comment” Relationship attribute to “note”	4 years ago
Eugen Rochko	16a8db0958	Fix trying to write non-existent image remote URL attribute on preview cards (#14181 ) Regression from #14145	4 years ago
Yamagishi Kazutoshi	72ff9a1d65	Replace to testing-library from enzyme (#14152 )	4 years ago
trwnh	41acf83cdf	Fix padding on account header (#14179 )	4 years ago
Eugen Rochko	a3ce01a102	Add customizable thumbnails for audio and video attachments (#14145 ) - Change audio files to not be stripped of metadata - Automatically extract cover art from audio if it exists - Add `thumbnail` parameter to `POST /api/v1/media`, `POST /api/v2/media` and `PUT /api/v1/media/:id` - Add `icon` to represent it in attachments in ActivityPub - Fix `preview_url` containing URL of missing missing image when there is no thumbnail instead of null - Fix duration of audio not being displayed on public pages until the file is loaded	4 years ago
ThibG	8b7066dc61	Fix read marker state not being udpated internally (#14155 ) Fixes #14151	4 years ago
ThibG	c92278aa1c	Change sensitive preview cards to not blur text (#14143 ) Also only require click-through for interactive embeds.	4 years ago
Thibaut Girka	5ea65bfe13	Fix public page CSS to match upstream's changes Kind of a port of `1aed75c2d0` to glitch-soc	4 years ago
Mélanie Chauvel	2700043e34	[Glitch] Improve appearence consistency of settings pages Port `2fca9d3715` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	00283fe6ab	[Glitch] Fix design issues with sensitive preview cards Port `907fe2996c` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	4500435bb1	[Glitch] Fix avatar size in public page detailed status Port `528c103fc6` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Eugen Rochko	03273b3c7b	[Glitch] Fix various issues around OpenGraph representation of media Port front-end changes (except for audio player) from `12ac904a33` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	0e33582bff	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
Mélanie Chauvel	2fca9d3715	Improve appearence consistency of settings pages (#13938 ) * Fix header button changing header size in settings pages * Make form buttons look more like a part of the form in settings pages - Put buttons closer, using same distance as between inputs - Make buton font size a bit smaller to blend a bit more - Add the class button to button tags for consisent styling	4 years ago
Mélanie Chauvel	cb63e1e0d7	Improve wording of the “Add media” button tooltip (#13954 ) - Remove (incomplete) list of supported formats - List types of media (image, video, audio) - Tell that several images could be uploaded using plural	4 years ago
Sasha Sorokin	8e9572112d	Fix Thai being skipped from language detection (#13989 ) Thai does not separate words by spaces, so I figured out it should be in 'reliable characters regexp' that denotes languages that do the same. Related #13891.	4 years ago
Takeshi Umeda	17c1443b23	Change to correct the role of the boost button (#14132 )	4 years ago
Takeshi Umeda	1aed75c2d0	Add a visibility icon to status (#14123 ) * Add a visibility icon to status * Change to using the icon element * Fix RTL * Add a public globe	4 years ago
ThibG	907fe2996c	Fix design issues with sensitive preview cards (#14126 ) * Fix design issues with sensitive preview cards * Center “sensitive” label on preview image for interactive cards * Add “button” role to sensitive preview card text	4 years ago
ThibG	528c103fc6	Fix avatar size in public page detailed status (#14140 ) Regression from the inline-CSS changes	4 years ago
Eugen Rochko	12ac904a33	Fix various issues around OpenGraph representation of media (#14133 ) - Fix audio attachments not being represented in OpenGraph tags - Fix audio being represented as "1 image" in OpenGraph descriptions - Fix video metadata being overwritten by paperclip-av-transcoder - Fix embedded player not using Mastodon's UI - Fix audio/video progress bars not moving smoothly - Fix audio/video buffered bars not displaying correctly	4 years ago
ThibG	c0ad588857	[Glitch] Fix very wide media attachments resulting in too thin a thumbnail Port `90445230cd` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Takeshi Umeda	26778b8c30	[Glitch] Fix modifier key to keep the EmojiPicker on macOS Port `c0b52ac871` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
fuyu	2e48c4ae55	[Glitch] Fix unnecessary gap under of video modal Port `88cbcb5804` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	c1eb60642b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.	4 years ago
Eugen Rochko	d0dc37eadb	Fix audio/video/images/cards not reacting to window resizes in web UI (#14130 ) * Fix audio/video/images/cards not reacting to window resizes in web UI * Update app/javascript/mastodon/features/audio/index.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	4 years ago
ThibG	90445230cd	Fix very wide media attachments resulting in too thin a thumbnail (#14127 ) Fixes #14094	4 years ago
ThibG	df13142cdd	Fix crash in MergeWorker (#14129 ) Similarly to #12324, the code is passing an Account object where an id is expected.	4 years ago
Thibaut Girka	a6ce37528e	Simplify filtering condition	4 years ago
ash lea	3489cb87b7	never filter own posts from timeline	4 years ago
ThibG	6c42b23382	never filter own posts from timeline (#14128 ) Signed-off-by: Thibaut Girka <thib@sitedethib.com> Co-authored-by: ash lea <example@thisismyactual.email>	4 years ago
Eugen Rochko	ce34c13aff	Change volume control and download buttons in web UI (#14122 ) * Fix audio download button not starting download in web UI * Fix volume controls on audio and video players in web UI * Remove download button from video player in web UI	4 years ago
ThibG	90477d7e4d	Fix audio player not working when media files are hosted on a different domain (#14118 )	4 years ago
Eugen Rochko	563a77d0b4	Change design of audio players in web UI (#14095 )	4 years ago
Takeshi Umeda	c0b52ac871	Fix modifier key to keep the EmojiPicker on macOS (#14096 )	4 years ago
fuyu	88cbcb5804	Fix unnecessary gap under of video modal (#14098 )	4 years ago
fuyu	ad1dfea4fa	Fix not working I18n on 2FA and Sign in token page (#14087 )	4 years ago
ThibG	6a3e2b0fe5	Fix functional user requirements in whitelist mode (#14093 ) Fixes #14092	4 years ago
Eugen Rochko	aeba0f513d	[Glitch] Add hints about incomplete remote content to web UI Port `32b7d341b7` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	743cef53d8	[Glitch] Fix initial audio volume not corresponding to what's displayed Port `3f5fa64211` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
fuyu	14272c3a0e	[Glitch] Fixed emoji detection problem to append border Port `4a3af0386b` to glitch-soc Co-authored-by: ThibG <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	4d5ff62de5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency	4 years ago
ThibG	3f5fa64211	Fix initial audio volume not corresponding to what's displayed (#14057 )	4 years ago
Eugen Rochko	32b7d341b7	Add hints about incomplete remote content to web UI (#14031 )	4 years ago
fuyu	4a3af0386b	Fixed emoji detection problem to append border (#14020 ) * Fixed emoji detection problem to append border * Add tests * Add missing semicolon * Fixed wrong result when includes different variation selector * Add missing semicolon * Remove grapheme-splitter and Change emoji list to array from string * Update comment * Remove spaces Co-authored-by: ThibG <thib@sitedethib.com>	4 years ago
ThibG	9c7220aa3a	Fix TL sometimes jumping when closing modals (#14019 ) Fixes #14018	4 years ago
Thibaut Girka	619e308b2b	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
ThibG	ceac31f04b	Fix WebUI crash when processing accounts before page is loaded (#14015 )	4 years ago
Thibaut Girka	86a8a599c2	[Glitch] Fix WebUI crash when loading account data before page is loaded	4 years ago
ThibG	f6ce71e81c	[Glitch] Add hotkey for toggling content warning composer field Port `56d1dafdc4` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	b709aaba5b	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
ThibG	a203f596f3	[Glitch] Improve rendering of emoji which do not contrast with background Port `f55fe1a5ee` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Ben Lubar	a8ef7570a1	[Glitch] FIX: filters ignore media descriptions Port `da59204700` to glitch-soc Co-authored-by: Thibaut Girka <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
ThibG	4eca2093d9	[Glitch] Hide sensitive preview cards with blurhash Port `eda9bb35f1` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Yamagishi Kazutoshi	6112ad677d	[Glitch] Fix ref attr for react-textarea-autozsize Signed-off-by: Thibaut Girka <thib@sitedethib.com>	4 years ago
Thibaut Girka	83dc54c487	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	4 years ago
ThibG	56d1dafdc4	Add hotkey for toggling content warning composer field (#13987 )	4 years ago
ThibG	a7400a4f97	Make domain block/silence/reject-media code more robust (#13424 ) * Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.	4 years ago
Bei Li	0f43ab4830	Update “status” to “toot” for en.json (#13877 )	4 years ago
ThibG	f55fe1a5ee	Improve rendering of emoji which do not contrast with background (#13772 ) * Refactor list of emoji requiring added outlines so that it can be theme-specific * Split inaccessible emoji to emoji requiring an outline and ones that can be inverted * Drop the “silouhettes” from black emoji as they seem to have changed color * Add inaccessible emojis list for the light theme * Use bordered emoji variant instead of unreliable CSS	4 years ago
Mélanie Chauvel	a617a8394b	Improve wording and add titles on moderated servers section in /about/more (#13930 )	4 years ago
Takeshi Umeda	8054496ea7	Fix performance of follow import (#13836 )	4 years ago
Eugen Rochko	2dbf6bc5ad	Add e-mail-based sign in challenge for users with disabled 2FA (#14013 )	4 years ago

1 2 3 4 5 ...

8180 Commits (654fd699034ee8a58ab8d404cbd19809809ef720)