8321 commits

Author	SHA1	Message	Date
mayaeh	6f6e9d8214	Fix-up #13749 (#14204)	2020-07-03 13:26:35 +02:00
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>	2020-07-02 17:31:09 +02:00
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>	2020-07-02 17:31:09 +02:00
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>	2020-07-02 17:31:09 +02:00
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>	2020-07-02 17:31:09 +02:00
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>	2020-07-02 17:31:09 +02:00
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>	2020-07-02 17:31:09 +02:00
Eugen Rochko	6163518115	Fix audio modals not using blurhash and poster (#14199)	2020-07-02 16:27:35 +02:00
Takeshi Umeda	cd95fd8105	[Glitch] Fix the conditions for incomplete remote content ... Port 911c385f2f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-02 13:58:50 +02:00
Thibaut Girka	5c6cf202ba	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-02 13:56:02 +02:00
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	2020-07-02 00:45:15 +02:00
Takeshi Umeda	911c385f2f	Fix the conditions for incomplete remote content (#14195)	2020-07-01 23:38:44 +02:00
Ariel	98aa197c07	[Glitch] Fix cursor type in statuses ... Port eee8b314af to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-07-01 20:18:07 +02:00
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>	2020-07-01 20:13:51 +02:00
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.	2020-07-01 19:23:14 +02:00
Eugen Rochko	ca238c879d	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
Ariel	eee8b314af	Fix cursor type in statuses (#14185)	2020-07-01 13:52:05 +02:00
ThibG	9e14647df8	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
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	2020-07-01 13:51:15 +02:00
mayaeh	4b703d398a	follow-up #14149 (#14192) ... ran `yarn manage:translations en`	2020-07-01 11:34:19 +02:00
Thibaut Girka	9b91f64ff3	Add support for li attribute to li element	2020-07-01 01:02:27 +02:00
Thibaut Girka	c28f80802a	Add support for “start” and “reversed” attributes to ol element ... Fixes #1367	2020-07-01 01:02:27 +02:00
Eugen Rochko	36e5fd547b	Fix remote files not using Content-Type header, streaming (#14184)	2020-06-30 23:58:02 +02:00
ThibG	50f439db96	[Glitch] Add user notes on accounts ... Port 3afc7977b1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:32:02 +02:00
trwnh	9dcd3388f6	[Glitch] Fix padding on account header ... Port 41acf83cdf to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:10:44 +02:00
ThibG	a11fac77f3	[Glitch] Fix read marker state not being udpated internally ... Port 8b7066dc61 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:09:39 +02:00
ThibG	1c3764c6f8	[Glitch] Change sensitive preview cards to not blur text ... Port c92278aa1c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-30 23:08:24 +02:00
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.	2020-06-30 23:00:20 +02:00
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”	2020-06-30 19:19:50 +02:00
Eugen Rochko	16a8db0958	Fix trying to write non-existent image remote URL attribute on preview cards (#14181) ... Regression from #14145	2020-06-29 17:59:04 +02:00
Yamagishi Kazutoshi	72ff9a1d65	Replace to testing-library from enzyme (#14152)	2020-06-29 13:58:07 +02:00
trwnh	41acf83cdf	Fix padding on account header (#14179)	2020-06-29 13:57:44 +02:00
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	2020-06-29 13:56:55 +02:00
ThibG	8b7066dc61	Fix read marker state not being udpated internally (#14155) ... Fixes #14151	2020-06-28 20:55:32 +02:00
ThibG	c92278aa1c	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	5ea65bfe13	Fix public page CSS to match upstream's changes ... Kind of a port of 1aed75c2d0 to glitch-soc	2020-06-26 13:45:40 +02:00
Mélanie Chauvel	2700043e34	[Glitch] Improve appearence consistency of settings pages ... Port 2fca9d3715 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:31:17 +02:00
ThibG	00283fe6ab	[Glitch] Fix design issues with sensitive preview cards ... Port 907fe2996c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:28:52 +02:00
ThibG	4500435bb1	[Glitch] Fix avatar size in public page detailed status ... Port 528c103fc6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-26 13:27:39 +02:00
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>	2020-06-26 13:23:56 +02:00
Thibaut Girka	0e33582bff	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
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	2020-06-26 00:36:30 +02:00
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	2020-06-26 00:14:29 +02:00
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.	2020-06-25 22:45:01 +02:00
Takeshi Umeda	17c1443b23	Change to correct the role of the boost button (#14132)	2020-06-25 22:44:19 +02:00
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	2020-06-25 22:43:59 +02:00
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	2020-06-25 22:42:01 +02:00
ThibG	528c103fc6	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	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	2020-06-25 01:33:01 +02:00
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>	2020-06-24 16:01:28 +02:00
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>	2020-06-24 15:56:43 +02:00
fuyu	2e48c4ae55	[Glitch] Fix unnecessary gap under of video modal ... Port 88cbcb5804 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-24 15:55:53 +02:00
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.	2020-06-24 15:33:41 +02:00
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>	2020-06-24 10:25:32 +02:00
ThibG	90445230cd	Fix very wide media attachments resulting in too thin a thumbnail (#14127) ... Fixes #14094	2020-06-23 17:24:29 +02:00
ThibG	df13142cdd	Fix crash in MergeWorker (#14129) ... Similarly to #12324, the code is passing an Account object where an id is expected.	2020-06-23 16:40:01 +02:00
Thibaut Girka	a6ce37528e	Simplify filtering condition	2020-06-23 16:09:36 +02:00
ash lea	3489cb87b7	never filter own posts from timeline	2020-06-23 16:09:36 +02:00
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>	2020-06-23 16:01:34 +02:00
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	2020-06-23 12:20:14 +02:00
ThibG	90477d7e4d	Fix audio player not working when media files are hosted on a different domain (#14118)	2020-06-22 19:24:16 +02:00
Eugen Rochko	563a77d0b4	Change design of audio players in web UI (#14095)	2020-06-21 02:27:19 +02:00
Takeshi Umeda	c0b52ac871	Fix modifier key to keep the EmojiPicker on macOS (#14096)	2020-06-20 13:30:40 +02:00
fuyu	88cbcb5804	Fix unnecessary gap under of video modal (#14098)	2020-06-20 13:30:27 +02:00
fuyu	ad1dfea4fa	Fix not working I18n on 2FA and Sign in token page (#14087)	2020-06-20 13:30:13 +02:00
ThibG	6a3e2b0fe5	Fix functional user requirements in whitelist mode (#14093) ... Fixes #14092	2020-06-19 19:18:47 +02:00
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>	2020-06-17 17:48:04 +02:00
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>	2020-06-17 17:20:14 +02:00
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>	2020-06-17 17:18:42 +02:00
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	2020-06-17 17:10:15 +02:00
ThibG	3f5fa64211	Fix initial audio volume not corresponding to what's displayed (#14057)	2020-06-15 16:43:30 +02:00
Eugen Rochko	32b7d341b7	Add hints about incomplete remote content to web UI (#14031)	2020-06-14 22:29:40 +02:00
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>	2020-06-10 21:56:14 +02:00
ThibG	9c7220aa3a	Fix TL sometimes jumping when closing modals (#14019) ... Fixes #14018	2020-06-10 13:57:13 +02:00
Thibaut Girka	619e308b2b	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-10 12:10:26 +02:00
ThibG	ceac31f04b	Fix WebUI crash when processing accounts before page is loaded (#14015)	2020-06-09 20:53:20 +02:00
Thibaut Girka	86a8a599c2	[Glitch] Fix WebUI crash when loading account data before page is loaded	2020-06-09 11:55:07 +02:00
ThibG	f6ce71e81c	[Glitch] Add hotkey for toggling content warning composer field ... Port 56d1dafdc4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-09 11:14:20 +02:00
Thibaut Girka	b709aaba5b	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 11:12:53 +02:00
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>	2020-06-09 11:07:32 +02:00
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>	2020-06-09 11:02:24 +02:00
ThibG	4eca2093d9	[Glitch] Hide sensitive preview cards with blurhash ... Port eda9bb35f1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi	6112ad677d	[Glitch] Fix ref attr for react-textarea-autozsize ... Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-09 10:55:52 +02:00
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.	2020-06-09 10:39:20 +02:00
ThibG	56d1dafdc4	Add hotkey for toggling content warning composer field (#13987)	2020-06-09 10:32:32 +02:00
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.	2020-06-09 10:32:00 +02:00
Bei Li	0f43ab4830	Update “status” to “toot” for en.json (#13877)	2020-06-09 10:28:57 +02:00
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	2020-06-09 10:28:23 +02:00
Mélanie Chauvel	a617a8394b	Improve wording and add titles on moderated servers section in /about/more (#13930)	2020-06-09 10:28:02 +02:00
Takeshi Umeda	8054496ea7	Fix performance of follow import (#13836)	2020-06-09 10:26:58 +02:00
Eugen Rochko	2dbf6bc5ad	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
Takeshi Umeda	654c13ecfb	Add limit parameter to rss (#13743)	2020-06-09 00:18:47 +02:00
Takeshi Umeda	3343de96a0	Add visibility parameter in share page (#13023) ... * Add visibility parameter in share page * Restrict to default privacy	2020-06-09 00:16:30 +02:00
Ben Lubar	da59204700	FIX: filters ignore media descriptions (#13837) ... * FIX: filters ignore media descriptions * remove parentheses to make codeclimate happy * combine the text and run the regular expression only once. https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581 * Fix use of “filter” instead of “compact”, fix coding style issues Co-authored-by: Thibaut Girka <thib@sitedethib.com>	2020-06-09 00:11:42 +02:00
ThibG	eda9bb35f1	Hide sensitive preview cards with blurhash (#13985) ... * Use preview card blurhash in WebUI * Handle sensitive preview cards	2020-06-06 17:41:56 +02:00
ThibG	36f31b5cad	Add blurhash to preview cards (#13984) ... Fixes #13001	2020-06-05 23:10:41 +02:00
ThibG	8b552d6f0c	Fix unpermitted operations on custom emojis leading to cryptic errors (#13951) ... * Display appropriate error when performing unpermitted operation on custom emoji Fixes #13897 * Remove links to custom emoji actions not performable by moderators	2020-06-05 15:23:27 +02:00
ThibG	e67a55ee49	Fix serialization of replies when some of them are URIs (#13957) ... * Fix serialization of replies when some of them are URIs Fixes #13956 * Add test	2020-06-04 19:03:31 +02:00
Eugen Rochko	9de5c70980	Fix wrong route helper in encrypted messages controller (#13952) ... And add `created_at` to encrypted message serializer	2020-06-03 20:32:15 +02:00
Mélanie Chauvel	8579befd58	Put “Add new domain block” button on /admin/instances in header (#13934)	2020-06-03 20:19:14 +02:00
ThibG	8d57f6c4b4	Fix account redirect confirmation message talking about moved followers (#13950) ... Fixes #13949	2020-06-03 20:18:19 +02:00
Takeshi Umeda	fe20381455	Fix activity not being signed (#13948)	2020-06-03 08:33:30 +02:00
Eugen Rochko	b864e78db8	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
Yamagishi Kazutoshi	196bdd3dd7	Fix ref attr for react-textarea-autozsize (#13936)	2020-06-02 03:24:04 +02:00
Christopher Choi	dba59712ca	[Glitch] Adjust flash alert contrast for better readability ... Port 2b1a6e7597 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-01 18:31:45 +02:00
Brian C. Lindner	f8980d714a	[Glitch] Allow Ctrl-click to keep EmojiPicker window open ... Port f8f195b8c2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-06-01 18:31:42 +02:00
Thibaut Girka	61f1d4dbbf	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-01 18:21:43 +02:00
ariasuni	dfc9dd7c99	Improve appearance of notification cleaning UI ... - Use smaller font-size for consistency with the rest of the UI - Make better use of the horizontal space when available	2020-06-01 12:28:27 +02:00
ThibG	4255757678	Fix admin page crashing when trying to block an invalid domain name (#13884) ... * Fix admin page crashing when trying to block an invalid domain name Fixes #13880 * Fix trailing and leading spaces not being properly stripped for domain blocks	2020-06-01 03:47:20 +02:00
ThibG	0c7a21a38c	Fix unsent toot confirmation dialog not popping up in single column (#13888)	2020-05-31 20:38:56 +02:00
Christopher Choi	2b1a6e7597	Adjust flash alert contrast for better readability (#13892)	2020-05-31 20:35:18 +02:00
Brian C. Lindner	f8f195b8c2	Allow Ctrl-click to keep EmojiPicker window open (#13896)	2020-05-31 20:34:34 +02:00
Thibaut Girka	ac9b14d93b	Hide local-only pinned toots from public profiles ... Fixes #1336 This also fixes federating pinned toots when some of them are local-only. Public profiles will not show public toots, whether you are logged in or not (this is consistent with local-only toots that are not pinned).	2020-05-31 17:20:15 +02:00
Thibaut Girka	0b7387cf40	Fix backup archive including outgoing-only content warnings	2020-05-30 18:27:00 +02:00
Thibaut Girka	7a7574317f	Add support for setting Content Warning for CW-less outgoing toots	2020-05-30 18:27:00 +02:00
ThibG	ed6300f3c5	[Glitch] Fix timeline markers in Firefox ... Port 366942b60f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-29 20:02:30 +02:00
ThibG	948f988a04	[Glitch] Fix timeline markers not working on Chrome ... Port bf68cd3bf0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-29 20:02:30 +02:00
Thibaut Girka	cb592b80aa	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-29 19:27:21 +02:00
ThibG	366942b60f	Fix timeline markers in Firefox (regression from #13887) (#13889) ... Unfortunately, Firefox does not support the `keepalive` parameter I used in the previous PR. However it supports the `navigator.sendBeacon` API that allows that kind of things, but does not allow setting headers. Therefore, this PR replaces it with a `sendBeacon` call that passes the bearer token in the POST data. Doorkeeper will then handle the auth token out of the box, as long as it is passed as form data. Passing the query as JSON does not work.	2020-05-29 19:25:57 +02:00
ThibG	bf68cd3bf0	Fix timeline markers not working on Chrome (#13887) ... * Periodically save timeline markers This saves timeline markers immediately upon message arrival, but not more than once every 5 minutes. This does not change how the markers are saved on closing the window, except that it avoids submitting them if there is no need for it. * Use the Fetch API when possible instead of XHR on window unload	2020-05-29 16:14:16 +02:00
Thibaut Girka	cedf9b81e4	Fix local-only hashtag columns	2020-05-28 15:21:16 +02:00
Thibaut Girka	4e225a769a	Fix one import being made on mastodon's codebase instead of glitch-soc's	2020-05-28 15:14:12 +02:00
Mélanie Chauvel	437f457b9f	[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI ... Port 006af53406 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-28 14:08:05 +02:00
Takeshi Umeda	1420db7e2d	[Glitch] Fix local streaming of hashtag timelines ... Port 8dd03cf8f2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-28 14:05:21 +02:00
Thibaut Girka	dcb3e180b9	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-28 13:44:57 +02:00
Ben Lubar	0584eaeaa1	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334) ... * fix exception when trying to serialize posts with <a> tags in them without hrefs * Add tests Co-authored-by: Thibaut Girka <thib@sitedethib.com>	2020-05-28 12:47:40 +02:00
Thibaut Girka	22f2f6f43b	Fix Cmd-Enter not working to send toot ... Fixes #1333	2020-05-26 10:15:35 +02:00
Mélanie Chauvel	006af53406	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	2020-05-25 12:30:34 +02:00
Takeshi Umeda	e2694a18c7	Fix csv upload (#13835)	2020-05-24 09:15:23 +02:00
Takeshi Umeda	56abcac438	Fix searchable status without explicitly mentioning it (#13829)	2020-05-23 05:47:25 +02:00
Takeshi Umeda	8dd03cf8f2	Fix local streaming of hashtag timelines (#13827)	2020-05-23 05:46:29 +02:00
Thibaut Girka	b4396fb459	Fix backup service when user has posted instance-local toots, again	2020-05-21 20:05:46 +02:00
Thibaut Girka	365ccfb96a	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-20 18:22:42 +02:00
ThibG	bb3aff5c8c	Add support for summary field for media description (#13763)	2020-05-15 17:08:59 +02:00
ThibG	063940f489	Fix hashtag search performing account search as well (#13758)	2020-05-14 23:37:37 +02:00
ThibG	60bb6ac6f4	Fix webfinger returning wrong status code on malformed or missing param (#13759) ... Fixes #13757	2020-05-14 23:28:06 +02:00
Eugen Rochko	55f1aec9c4	[Glitch] Fix regression in sparkline style in web UI ... Port bb9edd6321 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-14 18:50:57 +02:00
Thibaut Girka	56e4533bab	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-14 18:49:10 +02:00
Eugen Rochko	bb9edd6321	Fix regression in sparkline style in web UI (#13753)	2020-05-14 09:01:23 +02:00
ThibG	5b9ed6e0c1	[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted ... Port 9af0613629 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-13 23:17:10 +02:00
ThibG	ab970f996b	[Glitch] Fix some account avatars on public pages having incorrect size ... Port e93c08ab96 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-13 23:17:10 +02:00
ThibG	80b1201644	[Glitch] Fix first poll option not being focused when adding a poll ... Port 60dc5738cb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-13 23:17:10 +02:00
Eugen Rochko	b7b081bb51	New Crowdin translations (#13398) ... * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations activerecord.en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations devise.en.yml (Albanian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations activerecord.en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations activerecord.en.yml (Persian) [ci skip] * New translations devise.en.yml (Indonesian) [ci skip] * New translations activerecord.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Chinese Traditional) [ci skip] * New translations activerecord.en.yml (Chinese Traditional) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Turkish) [ci skip] * New translations activerecord.en.yml (Turkish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations activerecord.en.yml (Swedish) [ci skip] * New translations devise.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Spanish, Argentina) [ci skip] * New translations activerecord.en.yml (Slovenian) [ci skip] * New translations activerecord.en.yml (Corsican) [ci skip] * New translations devise.en.yml (Occitan) [ci skip] * New translations devise.en.yml (Esperanto) [ci skip] * New translations activerecord.en.yml (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations devise.en.yml (Welsh) [ci skip] * New translations activerecord.en.yml (Welsh) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations activerecord.en.yml (Estonian) [ci skip] * New translations devise.en.yml (Kazakh) [ci skip] * New translations activerecord.en.yml (Kazakh) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Thai) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations activerecord.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Slovenian) [ci skip] * New translations activerecord.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations activerecord.en.yml (Greek) [ci skip] * New translations activerecord.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations devise.en.yml (Danish) [ci skip] * New translations activerecord.en.yml (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations activerecord.en.yml (Czech) [ci skip] * New translations activerecord.en.yml (Basque) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations activerecord.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations activerecord.en.yml (Arabic) [ci skip] * New translations devise.en.yml (Spanish) [ci skip] * New translations activerecord.en.yml (Spanish) [ci skip] * New translations activerecord.en.yml (French) [ci skip] * New translations devise.en.yml (Greek) [ci skip] * New translations devise.en.yml (Basque) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations activerecord.en.yml (Dutch) [ci skip] * New translations activerecord.en.yml (Russian) [ci skip] * New translations activerecord.en.yml (Portuguese) [ci skip] * New translations devise.en.yml (Polish) [ci skip] * New translations activerecord.en.yml (Polish) [ci skip] * New translations devise.en.yml (Norwegian) [ci skip] * New translations activerecord.en.yml (Norwegian) [ci skip] * New translations devise.en.yml (Dutch) [ci skip] * New translations devise.en.yml (Korean) [ci skip] * New translations activerecord.en.yml (Finnish) [ci skip] * New translations activerecord.en.yml (Korean) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations activerecord.en.yml (Japanese) [ci skip] * New translations devise.en.yml (Italian) [ci skip] * New translations activerecord.en.yml (Italian) [ci skip] * New translations devise.en.yml (Armenian) [ci skip] * New translations activerecord.en.yml (Armenian) [ci skip] * New translations devise.en.yml (Finnish) [ci skip] * New translations devise.en.yml (Corsican) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations devise.en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations devise.en.yml (Romanian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.yml (Sardinian) [ci skip] * New translations simple_form.en.yml (Sardinian) [ci skip] * New translations activerecord.en.yml (Sardinian) [ci skip] * New translations devise.en.yml (Sardinian) [ci skip] * New translations doorkeeper.en.yml (Sardinian) [ci skip] * New translations activerecord.en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations activerecord.en.yml (Sardinian) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations doorkeeper.en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations doorkeeper.en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [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 (Korean) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (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 (Portuguese, Brazilian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * i18n-tasks normalize * yarn manage:translations	2020-05-13 22:35:20 +02:00
Thibaut Girka	4853a87df8	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
ThibG	9af0613629	Change “hide/show boosts from …” menu to be hidden when the account is muted (#13748) ... Otherwise, it may mislead users into believing this setting is an exception to the muting behavior. Fixes #13744	2020-05-13 21:20:45 +02:00
ThibG	e93c08ab96	Fix some account avatars on public pages having incorrect size (#13692) ... * Fix some account avatars on public pages having incorrect size * Remove outdated and overridden width and height attributes * Remove more hardcoded width/height attributes	2020-05-13 21:20:34 +02:00
Takeshi Umeda	15c0903772	Fix RedownloadMediaWorker (#13741)	2020-05-12 15:55:25 +02:00
ThibG	60dc5738cb	Fix first poll option not being focused when adding a poll (#13740) ... Fixes #13698	2020-05-12 15:29:44 +02:00
Takeshi Umeda	25307798d7	Fix keybase config serializer (#13742)	2020-05-12 15:28:29 +02:00
dependabot-preview[bot]	e7e09d3b7b	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) ... * Bump doorkeeper from 5.3.3 to 5.4.0 Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.3.3 to 5.4.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.3.3...v5.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Fix tests * Fix use of Doorkeeper::AccessToken.find_or_create_for * Fix tests? Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Thibaut Girka <thib@sitedethib.com>	2020-05-12 15:25:33 +02:00
Takeshi Umeda	b040567ea0	Fix not publishing update of remote timeline (#13745) ... * Fix not publishing update of remote timeline * fix @ missing * if/unless to if/else	2020-05-12 15:24:35 +02:00
ThibG	f48e191e8e	Fix sr locale being selected over sr-Latn (#13693) ... * Fix sr locale being selected over sr-Latn * Update tests	2020-05-11 01:09:21 +02:00
Takeshi Umeda	885b2e3d86	[Glitch] Add remote only to public timeline ... Port 861661100c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-10 16:19:59 +02:00
ThibG	5a2f0de845	[Glitch] Fix use of inline CSS in public pages ... Port 20ffc12cda to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-10 16:19:59 +02:00
Thibaut Girka	4e4e5316c1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	2020-05-10 16:19:56 +02:00
Eugen Rochko	3144f8dbbc	Refactor monkey-patching of Goldfinger (#12561)	2020-05-10 11:41:43 +02:00
taicv	f4007517a6	Add vi to available locales (#13542) ... * Enable selecting Vietnamese language in Admin Dashboard * Update settings_helper.rb Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-05-10 11:25:35 +02:00
Eugen Rochko	fc7cad8b2d	Add ability to remove identity proofs from account (#13682) ... Fix #12613	2020-05-10 11:21:10 +02:00
Takeshi Umeda	861661100c	Add remote only to public timeline (#13504) ... * Add remote only to public timeline * Fix code style	2020-05-10 10:36:18 +02:00
Eugen Rochko	909c31a765	Fix error within error when limiting backtrace to 3 lines (#13120) ... Fix #13086, close #13113	2020-05-10 10:30:27 +02:00
ThibG	e9227d8c10	Remove confusing “You are already signed in.” flash message (#13547) ... When attempting to access the log-in page while already logged in, Devise's `require_no_authentication` kicks in and sets a flash message “You are already signed in.” In almost all cases, this also causes a redirect to /web, which does not display or clear flash messages, thus leaving the message to a potentially much later date, like for instance, accessing /preferences several minutes after being redirected to /web.	2020-05-10 10:16:39 +02:00
ThibG	41536557be	Improve RSS entries for statuses (#13592) ... * Improve RSS entries for statuses - Render polls in both accounts and tags serializers - Refactor RSS serializers - Change title preview to include ellipsis when truncated - Change title preview to show CW instead of toot text - Add tests * Remove title from OEmbed serialization Twitter doesn't serialize title either, and tihs allows us to move the title formatting code to the RSS serializers.	2020-05-10 09:50:54 +02:00
Thibaut Girka	7bdd7e5c93	Fix crash when invalid addresses are linked in HTML or Markdown toots	2020-05-09 16:01:00 +02:00
ThibG	b20d0db1eb	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679) ... * Make sure wicg-inert doesn't rely on inline CSS * Remove unsafe-inline from style-src	2020-05-08 21:22:57 +02:00
Eugen Rochko	86207f5421	Fix failing jest test (#13681)	2020-05-08 21:21:57 +02:00
ThibG	5479d33843	Fix own following/followers not showing muted users (#13614) ... Fixes #13612	2020-05-08 20:36:34 +02:00
Taras Gogol	1a03de8592	Fix followings list order | Issue #13538 (#13676)	2020-05-08 20:17:16 +02:00
Eugen Rochko	e80d4479c7	Add more ActivityPub controller tests (#13590)	2020-05-03 22:19:24 +02:00
ThibG	20ffc12cda	Fix use of inline CSS in public pages (#13576) ... Change `account_link_to` to use an image tag rather than some inline CSS. Dropped the `size` parameter in the process, but it wasn't used for anything except the default value of 36px. Dropped CSS rules that were always overriden, and defaulted to 36px width and height instead.	2020-05-03 22:04:18 +02:00
ThibG	8b8add863e	[Glitch] Fix admin-facing uses of inline CSS ... Port a30829deee to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-03 21:47:58 +02:00
ThibG	3da2cd21fd	[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus ... Port e88a05f707 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-03 21:47:11 +02:00
ThibG	2ac3e3dc07	[Glitch] Fix end-user-facing uses of inline CSS ... Port 3b7373ed4c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-03 21:44:43 +02:00
ThibG	f261370e7c	[Glitch] Refactor/cleanup TIMELINE_DELETE-related code ... Port df5867f072 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-03 21:42:13 +02:00
ThibG	e869a257d8	[Glitch] Fix messed up z-index when NoScript blocks media/previews ... Port f53bd1bef6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-05-03 21:41:15 +02:00
Thibaut Girka	dfa13deaa1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Upstream disabled the embed controller for reblogs. Not a real conflict, but glitch-soc has an extra line to deal with its theming system. Ported upstream changes. - `app/javascript/packs/public.js`: Upstream made changes to get rid of most inline CSS, this changes javascript for public pages, which in glitch are split between different files. Ported those changes. - `app/models/status.rb`: Upstream changed the block check in `Status#permitted_for` to include domain-block checks. Not a real conflict with glitch-soc, but our scope is slightly different, as our scope for unauthenticated access do not include instance-local toots. Ported upstream changes. - `app/serializers/rest/instance_serializer.rb`: Not a real conflict, upstream added a new field to the instance serializer, the conflict is one line above since we added more of that. Ported upstream changes. - `app/views/settings/profiles/show.html.haml`: Upstream got rid of most inline CSS and moved hidden elements to data attributes in the process, in fields were we have different values. Ported upstream changes while keeping our glitch-specific values. - `app/views/statuses/_simple_status.html.haml`: Upstream got rid of inline CSS on an HAML line we treat differently, stripping empty text nodes. Ported upstream changes to the style attribute, keeping the empty text node stripping behavior.	2020-05-03 21:23:49 +02:00
Yamagishi Kazutoshi	cf55546c41	Revert "improve status title (#8596)" (#13591) ... This reverts commit dff05cd398.	2020-05-03 18:48:13 +02:00
Eugen Rochko	0ca06d0ba9	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
kaiyou	7a65e2f0db	Only check locally when deduplicating usernames (#13581) ... When deduplicating account usernames for OAuthable users, the routine did check if any account was known with that username, including remote accounts. This caused some unnecessary deduplication, and usernames ending with unexpected trailing _1. This fixes #13580	2020-04-30 14:39:05 +02:00
ThibG	a30829deee	Fix admin-facing uses of inline CSS (#13575) ... * Move .back-button inline styles to CSS file All occurrences of the back-button CSS class used the same inline CSS rules, so moved them over to the CSS file * Fix “Add new domain block” button using inline CSS * Replace common pattern of inline-styled button boxes by a CSS class In particular, switching from `float: left/right` to a flexbox with `justify-content: space-between`. This implied changing the order of a few HTML tags and adding an empty `div` in one case. Also removed a `margin-bottom` rule that wasn't needed due to the margins of surrounding elements. * Move account admin view inline CSS to CSS file	2020-04-28 19:39:16 +02:00
ThibG	e88a05f707	Fix page incorrectly scrolling when bringing up dropdown menus (#13574) ... Fixes #13573 For some reason (I suspect this may be related to focusing the item before it got drown by the browser), Firefox scrolls to top when bringing up dropdown menus with pre-selected items. This commit uses the “preventScroll” option as, due to the placement behavior, the menu should be visible anyway and not trigger scrolling.	2020-04-28 13:19:39 +02:00
ThibG	3b7373ed4c	Fix end-user-facing uses of inline CSS (#13438) ... * Move some inline styles to CSS files * Move default_account_display_name span to fix useless tags with duplicate id * Change handling of public pages spoiler text from inline CSS to dataset attribute * Use the `dir` HTML attribute instead of inline CSS * Move status action bar inline CSS to CSS file * Hide logo resources from CSS file, not inline CSS Fixes #11601 * Move translation prompt styling from inline CSS to CSS file * Move “invited by” styling on registration form from inline to CSS file * Use the progress tag to display poll results in JS fallback * Fix poll results JS-less fallback when the user has voted for an option * Change account public page “moved” notice to use img tags instead of inline CSS * Move OTP hint inline CSS to SCSS file * Hide JS-less fallback vote progressbars from accessibility tools Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2020-04-28 10:16:55 +02:00
ThibG	df5867f072	Refactor/cleanup TIMELINE_DELETE-related code (#13175)	2020-04-28 09:53:42 +02:00
ThibG	f53bd1bef6	Fix messed up z-index when NoScript blocks media/previews (#13449) ... Fixes #13444	2020-04-28 09:44:17 +02:00
ThibG	207c5ab2a3	Fix /public showing public instead of community timeline for logged-in users (#13499)	2020-04-28 09:43:45 +02:00
ThibG	09162ceb7c	Add invites_enabled to API (#13501)	2020-04-28 09:43:34 +02:00
Eugen Rochko	adfb22a9dd	Add separate cache directory for non-local uploads (#12821)	2020-04-26 23:29:08 +02:00
Eugen Rochko	96920a7b8e	Fix not being able to resolve public resources in development environment (#13505)	2020-04-25 22:01:08 +02:00
ThibG	2e92d55b64	[Glitch] Fix uninformative error message when uploading unsupported image files ... Port cd3a0a17bc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-25 15:29:01 +02:00
ThibG	ed2267b78e	[Glitch] Fix expanded video player issues ... Port 3526163340 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-25 15:28:16 +02:00
Irie Aoi	1e1b72ff72	[Glitch] Set max-width and max-height to gif video ... Port cf1bf9dda9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-25 15:26:42 +02:00
ThibG	7195bca890	[Glitch] Fix and refactor keyboard navigation in dropdown menus ... Port 69696c62b1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-25 15:24:02 +02:00
Thibaut Girka	2ac1f38bd8	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-25 15:19:32 +02:00
ThibG	cd3a0a17bc	Fix uninformative error message when uploading unsupported image files (#13540) ... Attempting to upload image files that the browser is unable to load results in “Oops! An unexpected error occurred.” This commit changes the error handling so that an unprocessable image results in the file being sent anyway, which might cover a few corner cases, and provide a slightly better error message.	2020-04-25 12:27:29 +02:00
ThibG	3526163340	Fix expanded video player issues (#13541) ... Fixes #13536 - Expanding a paused video doesn't autoplay anymore - Default volume level for the expanded video inherited from the original video Position/playing state/volume are carried over from the original video player to the modal, but they're not reported back to the modal as it would require deeper changes.	2020-04-25 12:16:05 +02:00
Takeshi Umeda	f365b9d6cd	Fix enable/disable relay failures (#13535)	2020-04-23 22:04:18 +02:00
Irie Aoi	cf1bf9dda9	Set max-width and max-height to gif video (#13533)	2020-04-23 15:49:33 +02:00
ThibG	69696c62b1	Fix and refactor keyboard navigation in dropdown menus (#13528) ... Fixes #13527 - Fixes caught keyboard events being needlessly propagated - Let up/down arrows wrap around like the tab key does - Refactor common code	2020-04-21 15:13:26 +02:00
D Anzorge	0b8c354379	[Glitch] Update Twemoji to 12.1.5 ... Port emoji_map.json changes from 945c8e207e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-20 16:54:01 +02:00
Takeshi Umeda	6556bd1f67	[Glitch] Add local only to hashtag timeline ... Port front-end changes from f5606cdab4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-20 16:52:56 +02:00
Thibaut Girka	4c125214de	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-20 16:45:40 +02:00
sternenseemann	674005c08e	Allow users to delete their header and avatar (#13234) ... This is achieved by sending a DELETE request to /settings/profile/pictures/{avatar,header} via a link that is part of the upload form's hint of the respective picture.	2020-04-20 14:03:03 +02:00
D Anzorge	945c8e207e	Update Twemoji to 12.1.5 (#13021) ... * Update Twemoji to 12.1.5 SVGs from Twemoji repo https://github.com/twitter/twemoji * Update emoji_map.json to Unicode 12	2020-04-19 23:38:31 +02:00
Takeshi Umeda	f5606cdab4	Add local only to hashtag timeline (#13502)	2020-04-18 21:52:39 +02:00
ThibG	f41a61965a	[Glitch] Fix uploaded image orientation in some browsers ... Port 2444658e4b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-18 15:48:15 +02:00
Thibaut Girka	ecc53d10e1	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-18 15:47:32 +02:00
ThibG	2444658e4b	Fix uploaded image orientation in some browsers (#13493) ... Some browsers (at least recent Chrome versions) automatically take image metadata into account when drawing images into a canvas. There seem to be no way to prevent that behavior, and the only way to detect it seems to compare with a known image. See: https://github.com/w3c/csswg-drafts/issues/4666 Solution adapted from: 1e4df70782	2020-04-18 15:37:03 +02:00
ThibG	2c92697ec8	[Glitch] Fix not being able to vote ... Port 0f3317fbe2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-17 22:04:10 +02:00
Thibaut Girka	28bdecf004	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-17 22:02:55 +02:00
ThibG	0f3317fbe2	Fix not being able to vote (#13490) ... Fix regression introduced by 53f9f8a4ce	2020-04-17 21:54:25 +02:00
Gurgen Hayrapetyan	f451095c04	[Glitch] Fix Poll fetchPoll action not being debounced. ... Port 53f9f8a4ce to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-17 20:20:06 +02:00
Thibaut Girka	43a9ed3de8	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-17 20:16:24 +02:00
ThibG	a93fc74d31	Fix admin actions log crash when displaying updates of deleted announcements (#13489) ... Fixes #13487	2020-04-17 19:54:58 +02:00
Gurgen Hayrapetyan	53f9f8a4ce	Fix Poll fetchPoll action not being debounced. (#13485) ... * Fix Poll fetchPoll action not being debounced. * Fix unused import in the Poll component	2020-04-16 20:16:20 +02:00
Takeshi Umeda	8eca96eb77	Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable (#13482)	2020-04-16 08:04:10 +02:00
ThibG	c162748a14	Fix confusing error when failing to add an alias to an unknown account (#13480) ... Follow-up to #13452, fixing broken `uri.nil?` test. Also remove the separate check for `uri` presence, as that would result in a “Please review 2 errors below” while only one would be listed.	2020-04-15 20:33:53 +02:00
Eugen Rochko	2d3219549b	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	2020-04-15 20:33:24 +02:00
Thibaut Girka	f9d5864e04	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.	2020-04-15 17:07:49 +02:00
ThibG	add34dd132	Fix “Email changed” notification sometimes having wrong e-mail (#13475) ... * Fix “Email changed” notification sometimes having wrong e-mail Fixes #6778 The root of the issue is that `send_devise_notification` was called before the changes were properly commited to the database, causing the mailer to pick previous values if running too early. Devise's documentation provides guidance on how to handle that[1][2], however, I have found it to not be working, as the following happens, in that order: - `send_devise_notification` is called for the `email_changed` notification. In that case, `changed?` is false and `saved_changes?` is true, so if we use the former, we have the same issue. - the `after_commit` hook is called - `send_devise_notification` is called for the `confirmation_instructions` notification. In that case, `changed?` is still false, and `saved_changes?` still true, so if we use the latter, that second notification email is simply not going to be sent (as we would be queuing the notification *after* executing the after_commit hook). This is because it may be called from either an `after_update` or `after_commit` hook, the difference not being a call to `save` but the transaction actually being committed to the database. This may arguably be a bug in Devise, or Devise's notification. The proposed workaround is inspired by Devise's documentation but checks whether a transaction is open to make the call whether to immediately send the notification or defer it to the `after_commit` hook. [1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification [2]: 406915cb78/lib/devise/models/authenticatable.rb (L133-L194) * Fix cases when sending notifications without changing the model * Defer sending if and only if in transaction including current record	2020-04-15 16:13:44 +02:00
ThibG	dedac235bc	Fix account aliases page (#13452) ... * Fix error not being displayed when adding an account alias, add error for self-references Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> * Add “You have no aliases.” note in confusing empty aliases table Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org> Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>	2020-04-13 06:41:43 +02:00
ThibG	9e12c3f3a7	[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ... Port 9d57af78d2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-12 17:01:41 +02:00
Thibaut Girka	2f49575839	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.	2020-04-12 16:50:27 +02:00
Leonie	a1cc7b361c	Fix API footer link in Web UI (#13441) ... Co-authored-by: koyu <me@koyu.spac>	2020-04-12 13:38:14 +02:00
ThibG	9d57af78d2	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445) ... * Fix following, followers and follow requests pagination * Fix pagination of blocks and mutes	2020-04-12 13:38:00 +02:00
Thibaut Girka	6d3e240aa9	Clean up some dead code	2020-04-10 14:47:06 +02:00
Thibaut Girka	79e5f368ed	Fix deprecated use of createBrowserHistory	2020-04-09 17:03:05 +02:00
ThibG	b746bda60e	Fix styling of polls in JS-less fallback on public pages (#13436)	2020-04-07 18:21:58 +02:00
Eugen Rochko	331bc98f25	Fix trying to delete already deleted file when post-processing (#13406) ... Fix #13403	2020-04-06 14:11:22 +02:00
Thibaut Girka	c13682bc0d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.	2020-04-05 18:32:06 +02:00
Eugen Rochko	7745695860	New Crowdin translations (#13317) ... * New translations en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations activerecord.en.yml (Georgian) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations en.yml (German) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations simple_form.en.yml (Hebrew) [ci skip] * New translations activerecord.en.yml (Hebrew) [ci skip] * New translations devise.en.yml (Hebrew) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations devise.en.yml (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations activerecord.en.yml (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Vietnamese) [ci skip] * New translations devise.en.yml (Vietnamese) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (French) [ci skip] * New translations devise.en.yml (German) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.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 (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Spanish, Argentina) [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 (Ido) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations activerecord.en.yml (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Persian) [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 (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Thai) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * i18n-tasks normalize * yarn manage:translations	2020-04-05 14:56:18 +02:00
Eugen Rochko	50fa554899	Add rate limit for reporting (#13390)	2020-04-05 14:40:08 +02:00
ThibG	edce6fc98f	Fix “Show more” not switching to “Show less” on public pages (#13174) ... * Fix “Show more” not switching to “Show less” on public pages Fixes #13169 * Fix initial text of CW button on public pages when CW are unfolded by default	2020-04-05 14:02:22 +02:00
ThibG	ef48ffc127	Fix PostgreSQL load when linking in announcements (#13250) ... * Fix PostgreSQL load when linking in announcements Fixes #13245 by caching status lookups Since statuses are supposed to be known already and we only need their URLs and a few other things, caching them should be fine. Since it's only used by announcements so far, there won't be much statuses to cache. * Perform status lookup when saving announcements, not when rendering them * Change EntityCache#status to fetch URLs instead of looking into the database * Move announcement link lookup to publishing worker * Address issues pointed out during review	2020-04-05 12:51:22 +02:00
Thibaut Girka	b8dc6c3eba	Fix admin audit log crash due to glitch-soc theming changes	2020-04-04 23:15:08 +02:00
ThibG	08e4bed98c	[Glitch] Add explanation as to why unlocked accounts may have follow requests ... Port ffd6f3fa8a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-04 21:59:49 +02:00
Eugen Rochko	04839f5dda	[Glitch] Add ability to filter audit log in admin UI ... Port 6932e0e2af to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-04 21:53:31 +02:00
Thibaut Girka	d5b5225614	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-04 21:47:37 +02:00
ThibG	ffd6f3fa8a	Add explanation as to why unlocked accounts may have follow requests (#13385) ... * Add explanation as to why unlocked accounts may have follow requests * Change wording to avoid “silenced”	2020-04-04 19:02:10 +02:00
Eugen Rochko	6932e0e2af	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
Sasha Sorokin	56dba219d1	[Glitch] Improve polls: option lengths & redesign ... Port abbc0c6a87 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)	660a3d2b7a	[Glitch] Improve toot clicking areas ... Port part of 899ff914da to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-02 20:49:43 +02:00
ThibG	0a02eade54	[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW ... Port 41ca3cdb37 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)	989f819191	[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI ... Port 5a211c478d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-02 20:45:03 +02:00
ThibG	61052dfa33	[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI ... Port front-end changes from 1a993f9675 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	2020-04-02 20:39:44 +02:00
Thibaut Girka	631dacf1d7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.	2020-04-02 20:32:00 +02:00
Sasha Sorokin	abbc0c6a87	Improve polls: option lengths & redesign (#13257) ... This commit redesign the polls and increases characters limit for the options from 25 to 50 characters, giving pollsters more freedom. Summarizing, the redesign is making the polls more adaptive for upcoming changes to the options characters limit: the bar, or a "chart", is now displayed separately from the option itself; vote check mark is moved next to the option text, making the percentages take less space. Option lengths are taken into account and text is wrapped to multiple lines if necessary to avoid overflow.	2020-04-02 17:10:55 +02:00
Eugen Rochko	11deb933f5	Fix returning results when searching for URL with non-zero offset (#13377) ... Fix #13083	2020-04-02 03:39:37 +02:00
Eugen Rochko	c2fc9bca81	Fix pinning a column in web UI sometimes redirecting out of web UI (#13376) ... Fix #13216	2020-04-02 03:12:10 +02:00
Eugen Rochko	b1c596e8f3	Fix background jobs not using locks like they are supposed to (#13361) ... Also: - Fix locks not being removed when jobs go to the dead job queue - Add UI for managing locks to the Sidekiq dashboard - Remove unused Sidekiq workers Fix #13349	2020-03-31 21:59:03 +02:00
Mélanie Chauvel (ariasuni)	899ff914da	Improve toot clicking areas (#13327) ... * Make the area to the left “Show Thread” also expand the toot in Web UI * Clicking the left part of a conversation with the avatars now opens it in Web UI	2020-03-31 19:40:23 +02:00
ThibG	41ca3cdb37	Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)	2020-03-31 14:10:18 +02:00