4338 commits

Author	SHA1	Message	Date
Thibaut Girka	2d8be0a6e1	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.	2020-07-05 19:35:56 +02:00
Eugen Rochko	99f3a55540	Add color extraction for audio thumbnails (#14209)	2020-07-05 18:28:25 +02:00
mayaeh	6e399b9df9	Fix-up #13749 (#14204)	2020-07-03 13:26:35 +02:00
Eugen Rochko	9b3677d509	[Glitch] Add customizable thumbnails for audio and video attachments ... Port 64aac30733 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 17:31:09 +02:00
Eugen Rochko	8999eea707	[Glitch] Fix various issues around OpenGraph representation of media ... Port audio player changes from 662a49dc3f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 17:31:09 +02:00
Eugen Rochko	06309129be	[Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI ... Port bb9ca8a587 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>	2020-07-02 17:31:09 +02:00
Eugen Rochko	1c58420831	[Glitch] Change volume control and download buttons in web UI ... Port 419ad6248b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 17:31:09 +02:00
ThibG	1ad79d11f3	[Glitch] Fix audio player not working when media files are hosted on a different domain ... Port aaf91abffa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 17:31:09 +02:00
Eugen Rochko	ad978ab1d4	[Glitch] Change design of audio players in web UI ... Port 75a2b8f815 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 17:31:09 +02:00
Eugen Rochko	162adf61f2	Fix audio modals not using blurhash and poster (#14199)	2020-07-02 16:27:35 +02:00
Takeshi Umeda	1c8eb9bcf7	[Glitch] Fix the conditions for incomplete remote content ... Port 7548a474a5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 13:58:50 +02:00
Thibaut Girka	9d127e15ff	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-02 13:56:02 +02:00
Eugen Rochko	7f1143a40d	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	2020-07-02 00:45:15 +02:00
Takeshi Umeda	7548a474a5	Fix the conditions for incomplete remote content (#14195)	2020-07-01 23:38:44 +02:00
Ariel	f60c78ff3e	[Glitch] Fix cursor type in statuses ... Port e9ea960773 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-01 20:18:07 +02:00
ThibG	24508bb837	[Glitch] Fix lock icon not being shown when locking account in profile settings ... Port 4babf5b8b5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-01 20:13:51 +02:00
Thibaut Girka	45deca65b3	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.	2020-07-01 19:23:14 +02:00
Ariel	e9ea960773	Fix cursor type in statuses (#14185)	2020-07-01 13:52:05 +02:00
ThibG	4babf5b8b5	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
mayaeh	411bf188bb	follow-up #14149 (#14192) ... ran `yarn manage:translations en`	2020-07-01 11:34:19 +02:00
ThibG	511edccf61	[Glitch] Add user notes on accounts ... Port 65506bac3f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:32:02 +02:00
trwnh	50f5254568	[Glitch] Fix padding on account header ... Port d1c6dd2d27 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:10:44 +02:00
ThibG	befe8c72dd	[Glitch] Fix read marker state not being udpated internally ... Port fa4876a1b9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:09:39 +02:00
ThibG	934bacd05f	[Glitch] Change sensitive preview cards to not blur text ... Port a1ad2ad951 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:08:24 +02:00
Thibaut Girka	9c3b9d5ab9	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.	2020-06-30 23:00:20 +02:00
ThibG	65506bac3f	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”	2020-06-30 19:19:50 +02:00
Yamagishi Kazutoshi	5e8f51b29f	Replace to testing-library from enzyme (#14152)	2020-06-29 13:58:07 +02:00
trwnh	d1c6dd2d27	Fix padding on account header (#14179)	2020-06-29 13:57:44 +02:00
Eugen Rochko	64aac30733	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	2020-06-29 13:56:55 +02:00
ThibG	fa4876a1b9	Fix read marker state not being udpated internally (#14155) ... Fixes #14151	2020-06-28 20:55:32 +02:00
ThibG	a1ad2ad951	Change sensitive preview cards to not blur text (#14143) ... Also only require click-through for interactive embeds.	2020-06-26 14:31:13 +02:00
Thibaut Girka	de735286cd	Fix public page CSS to match upstream's changes ... Kind of a port of 418f0a33e9 to glitch-soc	2020-06-26 13:45:40 +02:00
Mélanie Chauvel	4964490bbd	[Glitch] Improve appearence consistency of settings pages ... Port 08cf81f8c1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:31:17 +02:00
ThibG	327f6309e4	[Glitch] Fix design issues with sensitive preview cards ... Port 1d2b0d2121 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:28:52 +02:00
ThibG	9a26d2e127	[Glitch] Fix avatar size in public page detailed status ... Port 0a56a4a1bc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:27:39 +02:00
Eugen Rochko	2bb25c7730	[Glitch] Fix various issues around OpenGraph representation of media ... Port front-end changes (except for audio player) from 662a49dc3f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:23:56 +02:00
Thibaut Girka	a01674fb2b	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
Mélanie Chauvel	08cf81f8c1	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	2020-06-26 00:36:30 +02:00
Mélanie Chauvel	e49bd93211	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	2020-06-26 00:14:29 +02:00
Takeshi Umeda	f7bdfec5bb	Change to correct the role of the boost button (#14132)	2020-06-25 22:44:19 +02:00
Takeshi Umeda	418f0a33e9	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	2020-06-25 22:43:59 +02:00
ThibG	1d2b0d2121	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	2020-06-25 22:42:01 +02:00
ThibG	0a56a4a1bc	Fix avatar size in public page detailed status (#14140) ... Regression from the inline-CSS changes	2020-06-25 22:41:12 +02:00
Eugen Rochko	662a49dc3f	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	2020-06-25 01:33:01 +02:00
ThibG	72d193654b	[Glitch] Fix very wide media attachments resulting in too thin a thumbnail ... Port d469247083 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-24 16:01:28 +02:00
Takeshi Umeda	83bc9f68af	[Glitch] Fix modifier key to keep the EmojiPicker on macOS ... Port 434a6d0b15 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-24 15:56:43 +02:00
fuyu	51922d7ffa	[Glitch] Fix unnecessary gap under of video modal ... Port cb3c6d1780 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-24 15:55:53 +02:00
Thibaut Girka	aae60a2366	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.	2020-06-24 15:33:41 +02:00
Eugen Rochko	bb9ca8a587	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>	2020-06-24 10:25:32 +02:00
ThibG	d469247083	Fix very wide media attachments resulting in too thin a thumbnail (#14127) ... Fixes #14094	2020-06-23 17:24:29 +02:00