3,417 commits

Author	SHA1	Message	Date
Claire	b474cbbd28	Merge commit '7840c6b75b' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.	2023-12-18 18:40:58 +01:00
Claire	46ddaffd40	Merge commit 'b87bfb8c96' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
Claire	bc33be0342	Merge commit '23e32a4b30' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.	2023-12-18 18:07:24 +01:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Claire	ddf3ad9541	Merge commit '3bf896c973' into glitch-soc/main ... Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency.	2023-12-17 17:43:30 +01:00
Claire	1474318691	Merge commit 'a916251d8a' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.	2023-12-17 15:32:29 +01:00
Claire	9f92b05bd2	Merge commit '2e6bf60f15' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Aleks Xhuvani	7840c6b75b	Do not try to update an undefined video element (#27798)	2023-11-09 22:35:53 +00:00
Claire	c451bbe249	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
Claire	9b06c0f24a	Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791)	2023-11-09 12:58:02 +00:00
github-actions[bot]	5c328ae674	New Crowdin Translations (automated) (#27768) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-11-08 12:40:09 +00:00
João Pedro Marques	d3cd37d73e	Feature - Prevents multiple audio/video attachments from being played at the same time (#24717)	2023-11-07 23:37:58 +00:00
Jasmin Johal	27cbdc6f22	Change alt text to empty string for avatars (#21875) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-11-07 21:46:08 +00:00
Aleks Xhuvani	58f01a5c9a	Add volume saving/reuse to video player (#27488)	2023-11-07 18:15:38 +00:00
Renaud Chaput	f476d9dab2	Fix the notificationsUpdate call (#27758)	2023-11-07 14:18:59 +00:00
github-actions[bot]	1b28ab7263	New Crowdin Translations (automated) (#27687) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-11-07 09:03:59 +00:00
Renaud Chaput	6712bf86cd	Fixes website not loading for unlogged users (#27698)	2023-11-04 21:52:56 +00:00
Renaud Chaput	3bf2a7296e	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00:03 +00:00
github-actions[bot]	2d548e273e	New Crowdin Translations (automated) (#27646) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-11-03 10:10:13 +00:00
mogaminsk	ac8e4ed38d	Fix inserting emojis from emoji picker fails with TypeError (#27647)	2023-11-01 07:22:02 +00:00
Renaud Chaput	277e6968f5	Use helpers to check environment in frontend (#27633)	2023-10-31 16:05:44 +00:00
Renaud Chaput	0e3401bc1c	Improve Babel configuration and automatically load polyfills (#27333)	2023-10-31 10:55:13 +00:00
Claire	9c8891b39a	Rewrite AutosuggestTextarea as Functional Component (#27618)	2023-10-31 10:17:37 +00:00
github-actions[bot]	e5b7ae9576	New Crowdin Translations (automated) (#27630) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-31 08:43:17 +00:00
github-actions[bot]	a918208ec6	New Crowdin Translations (automated) (#27596) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-30 14:19:25 +00:00
SouthFox	08bdd5751e	Fix account click on detailed status (#27587)	2023-10-27 14:03:21 +00:00
Renaud Chaput	13d310e64d	Simplify column headers (#27557)	2023-10-27 13:21:07 +00:00
Eugen Rochko	fa7e64df1d	Fix various icon styles in web UI (#27579)	2023-10-26 23:37:58 +00:00
Simon Rapilly	2d8f759a34	Add HTML lang attribute to preview card descriptions (#27503)	2023-10-26 20:34:15 +00:00
github-actions[bot]	3427b51d63	New Crowdin Translations (automated) (#27567) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-26 11:05:47 +00:00
Renaud Chaput	537442853f	Use a context to propagate column-related Props, and remove forceUpdate usage (#27548)	2023-10-26 11:00:10 +00:00
Claire	62620956d5	Merge commit '9a3d047f3e' into glitch-soc/merge-upstream	2023-10-25 19:59:17 +02:00
Renaud Chaput	a4e6fe36cb	Add missing ban icons (#27555)	2023-10-25 12:47:37 +00:00
Claire	6e9f89e5b6	Merge commit 'c85e0a6b04' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc - `app/javascript/packs/public.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc	2023-10-25 12:18:45 +02:00
Claire	ba527c071f	Merge commit '134de736dc' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.	2023-10-25 12:14:24 +02:00
github-actions[bot]	c85e0a6b04	New Crowdin Translations (automated) (#27544) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-25 07:36:07 +00:00
Renaud Chaput	cb92cdf9af	Fix <ColumnBackButtonSlim> (#27540)	2023-10-24 20:43:55 +00:00
Renaud Chaput	f08ca3f042	Fix missing icon props (#27539)	2023-10-24 20:43:06 +00:00
Claire	4ef66d6538	Merge commit '15182d1e5e' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.	2023-10-24 20:31:20 +02:00
Eugen Rochko	134de736dc	Change icons in web UI (#27385) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-10-24 17:45:08 +00:00
Claire	e6c3d3c744	Merge commit 'd9503a1965' into glitch-soc/merge-upstream	2023-10-24 19:21:01 +02:00
Claire	b0c76eaadd	Merge commit '0ad66175bf' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.	2023-10-24 18:41:20 +02:00
Claire	15182d1e5e	Fix history handling not properly handling states after update to react-router v5 (#27526)	2023-10-24 13:24:57 +00:00
github-actions[bot]	50b7ea810e	New Crowdin Translations (automated) (#27523) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-24 09:51:34 +00:00
たいち ひ	9482810703	Rewrite emoji_unicode_mapping_light to TS (#25444) ... Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>	2023-10-24 08:06:14 +00:00
Eugen Rochko	d9503a1965	Fix explore page reloading when you navigate back to it in web UI (#27489)	2023-10-23 17:07:13 +02:00
Claire	0ad66175bf	Fix incorrect proptypes from react-router-v5 update (#27507)	2023-10-23 11:39:53 +02:00
github-actions[bot]	70fd819935	New Crowdin Translations (automated) (#27490) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-10-23 10:04:54 +02:00
Renaud Chaput	9d45a444f9	Convert <Button> to Typescript (#27492)	2023-10-23 09:43:00 +02:00
Claire	245513d630	Merge commit '1b70d7ed7c' into glitch-soc/merge-upstream	2023-10-21 14:33:33 +02:00