141 commits

Author	SHA1	Message	Date
Jeremy Kescher	0406f173cf	Merge remote-tracking branch 'reactions/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js	2022-12-17 11:09:32 +01: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
Rens Groothuijsen	d7a6a9393a	[Glitch] Display search popout at fixed screen position ... Port 726c7dea31 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-12-15 21:05:28 +01:00
Pleclown	98f7b3657a	[Glitch] Adding 12 hours option for polls ... Port 3a59ffde8d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-12-15 20:54:53 +01:00
Alex Stine	aad42cfc35	[Glitch] Fix hidden label causing accessibility issue for search inputs ... Port 903e5a3f45 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-12-15 20:54:11 +01:00
fef	8398f7ad4e	move react button to action bar	2022-12-09 23:04:12 +01:00
Jeremy Kescher	32600375b3	Merge remote-tracking branch 'upstream/main' into develop	2022-12-01 20:57:06 +01:00
Claire	4ac6601476	Port navigation bar from upstream (#1986) ... Fixes #1977	2022-12-01 20:06:08 +01:00
Jeremy Kescher	41ce71cc92	Merge remote-tracking branch 'upstream/main' into develop	2022-11-23 22:54:06 +01:00
Claire	43dbc62568	Fix privacy dropdown in boost modal on mobile (#1967) ... Fixes #1965	2022-11-22 11:26:14 +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	9255bfb908	[Glitch] Add the ability to edit media attachment metadata for any unattached media ... Port 31005aad12 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 14:01:47 +01:00
Claire	8ac4165c72	[Glitch] Remove “No description added” media warning in edit mode ... Port 5e796dc6f8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-12 13:57:41 +01:00
Claire	73b68fcabb	Fix styling of advanced options dropdown (#1916) ... Fixes #1914	2022-11-12 09:59:28 +01:00
Jeremy Kescher	5b797a34df	Merge remote-tracking branch 'upstream/main' into develop	2022-11-08 23:30:01 +01:00
Claire	fe1b694128	[Glitch] Fix opening the language picker scrolling the single-column view to the top ... Port 608343c135 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-08 15:49:09 +01:00
Jeremy Kescher	03f50f2f00	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png	2022-11-06 20:59:47 +01:00
Claire	0be6da42d3	Change glitch-soc composer classes to match upstream	2022-11-06 17:29:04 +01:00
Sunny Ripert	93ccb4a29e	[Glitch] Fix JavaScript console error on upload editing status ... Port c95d9aab56 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-11-06 10:46:03 +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	ebfe393e9c	[Glitch] Fix upload progress not communicating processing phase in web UI ... Port 30ef110224 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-30 18:30:58 +01:00
Eugen Rochko	eb307ec1bd	[Glitch] Fix logged out search and changed logged-in search placeholder ... Port 55af04b253 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-10-30 18:24:57 +01:00
Jeremy Kescher	a0ac183609	Merge remote-tracking branch 'upstream/main' into develop	2022-10-13 06:52:27 +02:00
Claire	2bb443c7d5	Port various forgotten fixes from upstream (#1864) ... * [Glitch] Fix crash when failing to load emoji picker Port bd3420b139 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Remove duplicate frequently used emojis Port 98146281e1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Harmon <Harmon758@gmail.com>	2022-10-12 19:03:28 +02:00
Jeremy Kescher	b153ef2672	Merge remote-tracking branch 'upstream/main' into develop	2022-10-12 07:25:19 +02:00
Claire	e1db6cf320	Move flavours/glitch/features/emoji_picker back to flavours/glitch/features/compose/containers/emoji_picker_dropdown_container	2022-10-11 14:17:27 +02:00
Claire	b75bf336bd	Move more modules from flavours/glitch/utils to flavours/glitch	2022-10-11 12:25:45 +02:00
Claire	0f4a4d7527	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/	2022-10-11 12:15:08 +02:00
Claire	015e798394	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/	2022-10-11 11:31:11 +02:00
Claire	d3879c07b1	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
Claire	26b687160b	Move flavours/glitch/util/initial_state to flavours/glitch/initial_state	2022-10-11 10:17:04 +02:00
Jeremy Kescher	7d927f3c19	Merge remote-tracking branch 'upstream/main' into develop	2022-08-26 08:43:43 +02:00
Claire	0b733ca790	[Glitch] Add ability to filter individual posts ... Port 50487db122 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-08-25 09:52:13 +02:00
Jeremy Kescher	f2fef712b3	Web UI: Allow removing a second poll choice	2022-08-12 21:42:19 +02:00
Eugen Rochko	7bf37551c8	[Glitch] Change label of publish button to be "Publish" again ... Port 628c177ebe to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-06-02 11:11:26 +02:00
Claire	4ab3ad3bef	Fix crash in glitch-soc search results when Elasticsearch is disabled (#1780)	2022-05-24 16:10:18 +02:00
Eugen Rochko	2e5fb45be5	[Glitch] Add language dropdown to compose in web UI ... Port 0cdb077570 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-05-16 23:06:29 +02:00
Claire	e4bec702ac	[Glitch] Rename toots to posts in various places, add or reword DM warnings ... Port part of be0bc9acbf and 7e244879fe to glitch-soc	2022-05-03 10:59:23 +02:00
Eugen Rochko	91e6df7026	[Glitch] Add hint about missing media attachment description in web UI ... Port 4e9855e09a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-03-22 17:55:17 +01:00
Claire	8e04ba87b7	[Glitch] Fix reply button on media modal not giving focus to compose form ... Port 2cd31b3177 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-02-26 09:54:48 +01:00
Claire	f3429d7354	[Glitch] Fix controls for unchangeable properties on status edit not being disabled ... Port 38845592c4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-02-12 22:36:39 +01:00
Holly	27803cd2b7	Make the settings button go to settings when opened in a new tab	2022-02-12 20:12:29 +01:00
Eugen Rochko	5e67858fbc	[Glitch] Add editing for published statuses ... Port 63002cde03 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-02-10 19:10:20 +01:00
Claire	0bb3d445ab	Please Codeclimate	2022-02-09 17:15:36 +01:00
Claire	e1a4590bca	Rework actions modal to bring it closer to upstream and fix modal stacking issue	2022-02-09 16:40:23 +01:00
Claire	bc2eaf3581	Remove unused noModal prop	2022-02-09 16:40:23 +01:00
Claire	f03dc97070	Some more refactoring	2022-02-09 16:40:23 +01:00
Claire	f87ce13afc	Refactor dropdown and action modal code slightly ... Simplify it a bit and make it closer to upstream	2022-02-09 13:23:12 +01:00
Claire	4dd4fc2e5e	[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share ... Port 3a103cd317 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2022-01-23 18:24:34 +01:00