79 commits

Author	SHA1	Message	Date
Jeremy Kescher	8de39432a9	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock # app/javascript/flavours/glitch/actions/interactions.js # config/initializers/rack_attack.rb # config/locales/en_GB.yml	2023-02-17 00:26:21 +01:00
Claire	bae17ebe5e	Fix attached media uploads not being cleared when replying to a post (#23504)	2023-02-10 22:03:35 +01:00
Akira Ouchi	e73b55184b	autofocus the compose form again on /share (#23094)	2023-01-30 14:49:10 +01:00
Jeremy Kescher	0d829dadea	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/features/ui/index.js # app/javascript/mastodon/features/ui/index.js	2023-01-18 22:29:27 +01:00
Claire	4b92e59f4f	Add support for editing media description and focus point of already-posted statuses (#20878) ... * Add backend support for editing media attachments of existing posts * Allow editing media attachments of already-posted toots * Add tests	2023-01-18 16:33:55 +01:00
Jeremy Kescher	1661561640	Merge branch 'reactions' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/es.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/flavours/glitch/locales/ja.js # app/javascript/flavours/glitch/locales/ko.js # app/javascript/flavours/glitch/locales/pl.js # app/javascript/flavours/glitch/locales/zh-CN.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # db/migrate/20221124114030_create_status_reactions.rb	2022-12-22 00:18:36 +01:00
Nick Schonning	06b68490d1	Enable eslint:recommended ruleset (#22433) ... * Enable ESLint recommended ruleset * Disable failing ESLint recommended rules * Remove rules shadowed by eslint:recommended	2022-12-19 00:51:37 +09:00
Jeremy Kescher	a1a1d08890	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock	2022-12-16 17:53:33 +01:00
Claire	ebf1d74e40	Fix being stuck in edit mode when deleting the edited status (#22126)	2022-12-15 17:47:43 +01:00
Claire	f70bdba926	Change default reply language to be default language when replying to a translated reply (#22272) ... Fixes #22250	2022-12-13 19:41:53 +01:00
Jeremy Kescher	730a09f642	v4.0.2+1.0.6	2022-11-29 00:15:08 +01:00
kedama	14e2354eea	Fix status mismatch of sensitive check (#21724)	2022-11-27 20:36:21 +01:00
Jeremy Kescher	122870cb6b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb	2022-11-14 22:18:48 +01:00
Claire	2d54986a03	Fix media metadata being only editable once (#20665)	2022-11-14 17:52:31 +01:00
Jeremy Kescher	c40b063bd4	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb	2022-11-12 14:38:59 +01:00
Claire	31005aad12	Add the ability to edit media attachment metadata for any unattached media (#20402)	2022-11-11 21:22:17 +01:00
Jeremy Kescher	5b797a34df	Merge remote-tracking branch 'upstream/main' into develop	2022-11-08 23:30:01 +01:00
Claire	782b6835f7	Fix redrafting a currently-editing post not leaving edit mode (#20023)	2022-11-08 04:06:54 +01:00
Jeremy Kescher	996267fc8b	Fix vanilla flavor being broken due to incorrect imports	2022-11-06 13:03:02 +01:00
Jeremy Kescher	c3bffb95b6	Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls	2022-11-02 21:16:10 +01:00
Jeremy Kescher	9c8fb2d475	Improve min poll options, expose value in API	2022-11-01 10:29:44 +01:00
Jeremy Kescher	7f6215984b	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml	2022-10-31 21:37:48 +01:00
Eugen Rochko	30ef110224	Fix upload progress not communicating processing phase in web UI (#19530)	2022-10-29 20:05:53 +02:00
Jeremy Kescher	e354a296c1	Web UI: Allow creating polls with only one option	2022-08-12 21:17:29 +02:00
Claire	14d7cf39f4	Change language to be carried over on reply (#18557) ... In most cases, replies to a toot are written in the same language as the toot being replied to.	2022-05-31 05:53:43 +02:00
Eugen Rochko	0cdb077570	Add language dropdown to compose in web UI (#18420)	2022-05-16 11:18:35 +02:00
Eugen Rochko	63002cde03	Add editing for published statuses (#17320) ... * Add editing for published statuses * Fix change of multiple-choice boolean in poll not resetting votes * Remove the ability to update existing media attachments for now	2022-02-10 00:15:30 +01:00
David Sterry	2aafa5b4e7	ignore hashtag suggestions if they vary only in case (#16460) ... * ignore hashtag suggestions if they vary only in case * remove console.logs and unused args * consistently add space when dismissing suggestions * linting	2021-12-15 23:47:19 +01:00
Claire	a8a7066e97	Add confirmation modal when closing media edit modal with unsaved changes (#16518) ... * Add confirmation modal when closing media edit modal with unsaved changes * Move focal point media state to redux so it does not get erased by confirmation dialog * Change upload modal behavior to keep it open while saving changes Instead of closing it immediately and losing changes if they fail to save… * Make it work with react-intl 2.9	2021-07-25 01:14:43 +02:00
Eugen Rochko	06fc6a9cd4	Add ability to choose media thumbnail in web UI (#14244)	2020-07-07 12:14:19 +02:00
ThibG	cf1fa73347	Fix content warning being unnecessarily cleared when enabling/disabling CW (#13348)	2020-03-31 14:10:18 +02:00
ThibG	667708f5b0	Fix pending upload count not being decremented on error (#12499) ... The arguments were passed to the wrong function… also, there is no need to have a conditional decrementation: failure to upload means we marked an upload as pending, in all cases.	2019-11-29 17:02:18 +01:00
ThibG	66684c489c	Fix WebUI allowing to upload more items than the limit (#12300) ... Until this patch, drag'n'drop and copy-paste allowed to start uploading as long as the number of *finished* uploads was below the limit.	2019-11-07 09:07:03 +02:00
ThibG	860a77d45e	Avoid storing audio and video file data in memory (#11974)	2019-09-27 15:22:11 +02:00
ThibG	7baedcb61e	Use blob URL for Tesseract to avoid CORS issues (#11964)	2019-09-27 02:16:11 +02:00
ThibG	5ab1e0e738	Restore hashtag suggestions from local tag history (#11632) ... * Restore hashtag suggestions from local tag history * Append local hashtag suggestions instead of prepending them * Do not display inaccurate usage statistics for hashtags not retrieved from API * Fixup	2019-08-22 04:37:18 +02:00
Eugen Rochko	648cdbc04a	Add hashtag score for better sorting of autosuggestions (#11427) ... * Add hashtag score for better sorting of autosuggestions * Do not use `~<~` operator with no text_pattern_ops index	2019-07-30 13:10:40 +02:00
Eugen Rochko	784c88e16d	Fix emoji autosuggestions (#11442) ... Regression from cfb2ed7823	2019-07-29 15:04:49 +02:00
Eugen Rochko	cfb2ed7823	Add autosuggestions for hashtags (#11422)	2019-07-28 14:37:52 +02:00
ThibG	dc88d226e1	When deleting & redrafting a poll, fill in closest expires_in (#11203) ... Use the smallest preset expires_in such that the new poll would not expire before the old one. In the typical case of a quick delete & redraft, this results in using the same poll duration. Fixes #10567	2019-07-02 00:36:16 +02:00
ThibG	ccc7fe3e1d	When sending a toot, ensure a CW is only set if the CW field is visible (#11206) ... In some occasions, such as the browser or a browser extension auto-filling the existing but disabled/hidden CW field, a CW can be set without the user knowing.	2019-06-29 18:32:36 +02:00
ThibG	2657765d2a	Fix “mark as sensitive” not being used in delete & redraft (#10980)	2019-06-06 13:04:34 +02:00
ThibG	dd118449c2	Fix incorrect reference to raw_content (it is raw_text instead) (#10753)	2019-05-11 23:56:07 +02:00
ThibG	6d44f2441b	Add toot source to delete result to ease Delete & Redraft (#10669) ... * Return Status with raw text in raw_content when deleting a status * Use raw content if available on delete & redraft * Rename raw_content to text; do not serialize formatted content when source is requested	2019-05-11 06:46:43 +02:00
ThibG	f2be71c293	Add emoji suggestions to CW and poll option fields (#10555) ... * Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus	2019-05-09 22:10:27 +02:00
Eugen Rochko	d97cbb0da6	Add UI for creating polls (#10184) ... * Add actions and reducers for polls * Add poll button * Disable media upload if poll enabled * Add poll form * Make delete & redraft work with polls	2019-03-06 04:53:37 +01:00
ThibG	4297de34cf	Split out is_changing_upload from is_submitting (#9536) ... There is no reason to disable the composer textarea when some media metadata is being modified, nor is there any reason to focus the textarea when some media metadata has been modified (prevents clicking one image's description field right after having modified another).	2018-12-16 21:17:56 +01:00
Eugen Rochko	f9b23a5d62	Preserve hashtag casing in web UI hashtag history (#8394) ... Fix #8241	2018-08-23 21:21:15 +02:00
Maciek Baron	f2d9a3c239	Refactor privacyPrefence() to use priority list (#7945)	2018-07-04 17:35:35 +02:00
Eugen Rochko	c75493755f	Preserve newlines in delete & redraft and desktop notifications (#7750) ... Fix #7748	2018-06-06 20:49:53 +02:00