1938 commits

Author	SHA1	Message	Date
Claire	37ca59815c	Remove setting for unfollow confirmation modal, and make it unconditional (#29373)	2024-03-22 16:24:04 +00:00
Claire	387c78ddf9	Change icon of severed relationships notifications (#29712)	2024-03-22 15:45:04 +00:00
Claire	dfa43707eb	Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
Renaud Chaput	ec1e770fea	Add the role ID to the badge component (#29707)	2024-03-22 11:59:35 +00:00
Claire	885d0faf83	Fix duplicate translation string for severed relationships (#29689)	2024-03-21 10:06:21 +00:00
Claire	c0aade79b0	Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream	2024-03-20 18:31:09 +01:00
Eugen Rochko	be52633ee4	Change back button to always appear in advanced web UI (#29669)	2024-03-20 17:21:03 +00:00
Claire	44bf7b8128	Add notifications of severed relationships (#27511)	2024-03-20 15:37:21 +00:00
Claire	3211e960ac	Fix “Explore” icon in navigation bar not being filled when selected (#29649)	2024-03-20 13:31:31 +00:00
Claire	eb3aed9545	Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-20 12:27:52 +01:00
Claire	94f7ae192b	Fix emoji picker placement on limited-height viewports (#29651)	2024-03-20 11:07:02 +00:00
Claire	a583317df6	Fix icon and styling in browser notifications banner (#29658)	2024-03-20 11:06:44 +00:00
Claire	876aa35350	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-19 19:21:12 +01:00
Claire	ffc5be4820	Change filtered icon from “archive” to “inventory 2” (#29652)	2024-03-19 15:39:26 +00:00
Jeong Arm	39839baec3	Fix mute for 30 days (#29640)	2024-03-19 08:18:14 +00:00
Claire	726e7ad024	Fix extra separator besides favourite count on private posts (#29605)	2024-03-16 01:11:59 +00:00
Claire	b8f476256e	Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Claire	d702a03a0c	Add “Learn more” on block modal to inform of federation caveats (#29614)	2024-03-15 19:09:21 +00:00
Claire	2c622497c2	Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream	2024-03-15 18:48:39 +01:00
Eugen Rochko	ec19d0a14b	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
Claire	be7a68b095	Change Explore icon to compass in advanced interface (#29610)	2024-03-15 16:06:48 +00:00
Eugen Rochko	407287573c	Add domain information to profiles in web UI (#29602) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-15 13:08:38 +00:00
Claire	e91ede5be6	Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Eugen Rochko	4991198b70	Change design of metadata underneath posts in web UI (#29585)	2024-03-14 09:18:24 +00:00
Eugen Rochko	1e1d97a787	Fix wrong background color on search results in web UI (#29584)	2024-03-14 09:07:29 +00:00
mogaminsk	3156d04ec1	Use sender's username to column title in notification request if it's display_name is not set (#29575)	2024-03-14 08:58:44 +00:00
Claire	65ca37bbaa	Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream ... Conflicts: - `spec/lib/sanitize/config_spec.rb`: Conflict due to glitch-soc having factored the file differently. Ported upstream's changes.	2024-03-13 20:14:18 +01:00
Claire	48134bcd10	Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream	2024-03-13 20:13:29 +01:00
Claire	c6dbb33944	Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream	2024-03-13 18:58:47 +01:00
Claire	27ffc09847	Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream	2024-03-13 18:56:40 +01:00
Claire	a32a126cac	Hide media by default in notification requests (#29572)	2024-03-13 16:47:48 +00:00
Renaud Chaput	acf3f410ae	Fix navigation panel icons missing classes (#29569)	2024-03-13 12:54:50 +00:00
Eugen Rochko	5b60d4b696	Change background color in web UI (#29522)	2024-03-12 09:51:30 +00:00
Renaud Chaput	af4e44e30a	Fix i18n typo (#29557)	2024-03-12 09:42:51 +00:00
Claire	a5127d0ef8	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.	2024-03-11 17:29:07 +01:00
Eugen Rochko	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2024-03-11 15:02:21 +00:00
Eugen Rochko	19efa1b9f1	Change action button to be last on profiles in web UI (#29533)	2024-03-11 14:33:48 +00:00
Eugen Rochko	16c856729b	Change icons in navigation panel to be filled when active in web UI (#29537)	2024-03-11 13:35:23 +00:00
Renaud Chaput	b9722dfe2b	Use the server setting to get the max number of poll options in UI (#29490)	2024-03-11 09:13:35 +00:00
Eugen Rochko	2347ea813e	Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532)	2024-03-11 08:57:23 +00:00
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
Claire	442a5cb66c	Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream	2024-03-07 12:59:51 +01:00
Mashiro	b8bd94ca8e	Fix unhandled nullable attachments limitation counter (#29183)	2024-03-06 12:53:54 +00:00
Claire	4d7e7cc562	Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Claire	f24c62a5c8	Fix preview card player getting embedded when clicking on the external link button (#29457)	2024-02-29 13:54:02 +00:00
Renaud Chaput	4185f3792c	Fix full date display not respecting the locale 12/24h format (#29448)	2024-02-29 09:40:13 +00:00
Claire	c2f0ea415e	Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.	2024-02-28 20:10:01 +01:00
Claire	a482932649	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.	2024-02-27 19:20:57 +01:00
Renaud Chaput	899eac1a92	Use modern ES syntax rather than .call (#29368)	2024-02-27 15:42:05 +00:00
Claire	90573c3abb	Change behavior of privacy dropdown to only change value on validation (#29406)	2024-02-27 11:41:19 +00:00
Claire	67ca8bb56a	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Change applied to `app/javascript/core/admin.js` instead.	2024-02-26 17:43:16 +01:00
Roni Laukkarinen	10fdd88288	Change new explore compass icon CSS class to explore (#29395)	2024-02-26 15:28:38 +00:00
Claire	2dc244784c	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +01:00
Claire	d2cfc6e5e2	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
Claire	ef3d15554b	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.	2024-02-24 14:46:14 +01:00
Claire	ab2f0daa10	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.	2024-02-24 14:27:43 +01:00
Claire	5b9ddfcfcc	Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
Claire	dfd74f0dae	Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
Claire	20615a516d	Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream	2024-02-24 13:53:59 +01:00
Claire	25ffe0af45	Fix pixel alignment for some composer icons (#29372)	2024-02-23 15:32:13 +00:00
Claire	10a0d76bf0	Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.	2024-02-22 20:58:41 +01:00
Eugen Rochko	b8b2f20b16	Change explore icon from hashtag to compass in web UI (#29294)	2024-02-20 09:10:44 +00:00
Eugen Rochko	63f4ea055a	Change follow suggestions design in web UI (#29272)	2024-02-19 11:09:58 +00:00
Claire	ca8fbda5d0	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
Claire	7ee93b7431	Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)	2024-02-06 17:10:17 +00:00
y.takahashi	3c315a68af	Fix 'focus the compose textarea' shortcut is not working (#29059)	2024-02-02 06:33:53 +00:00
Eugen Rochko	9cdc60ecc6	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
Yamagishi Kazutoshi	b3075a9993	Remove unused l18n messages (#28964)	2024-01-30 15:34:07 +00:00
J H	1467f1e1e1	Fixed the toggle emoji dropdown bug (#29012)	2024-01-30 13:38:49 +00:00
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Claire	805dba7f8d	Change compose form to use server-provided post character limit (#28928)	2024-01-26 14:09:45 +00:00
Eugen Rochko	6936e5aa69	Change design of compose form in web UI (#28119) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-25 15:41:31 +00:00
Eugen Rochko	3205a654ca	Refactor conversations components in web UI (#28833) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-25 14:34:26 +00:00
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	2024-01-24 20:42:53 +01:00
Claire	5a838ceaa9	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
Eugen Rochko	01ce9df880	Fix search form re-rendering spuriously in web UI (#28876)	2024-01-24 07:03:30 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Eugen Rochko	9f8e3cca9a	Fix duplicate and missing keys in search popout component in web UI (#28834)	2024-01-21 07:44:46 +00:00
Claire	e4d07c7bcc	Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream	2024-01-16 12:04:11 +01:00
Renaud Chaput	01b6c83c36	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Claire	464051c2d2	Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream	2024-01-15 20:06:31 +01:00
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	2024-01-13 12:11:29 +01:00
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064)	2024-01-12 20:16:48 +00:00
Renaud Chaput	608f66f978	Change icon SVG imports to use a default import (#28709)	2024-01-12 10:31:24 +00:00
Renaud Chaput	383be173af	Add a version comment to the emoji preval-ed file so it is regenerated (#28700)	2024-01-12 03:39:11 +00:00
Essem	b6e353537b	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +00:00
Claire	51d2d98174	Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream	2024-01-10 18:26:47 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	2024-01-10 17:51:12 +01:00
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585)	2024-01-08 10:57:40 +00:00
Claire	d0fd14f851	Fix scrolling to detailed status not always working (#28577)	2024-01-04 14:17:38 +00:00
Claire	b3542ac57b	Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our README.	2024-01-02 13:35:11 +01:00
Michael Stanclift	fdec8d7ffb	Fix OCR when using S3/CDN for assets (#28551)	2024-01-02 09:09:54 +00:00
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Claire	6374358357	Change media to be hidden/blurred by default in report modal (#28522)	2023-12-29 16:34:13 +00:00
Santiago Kozak	1cba91d6d1	Fix reply icon display in picture-in-picture footer (#28519)	2023-12-29 09:48:27 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Renaud Chaput	1c041356a1	Fix error on viewing a profile when unlogged (#28465)	2023-12-21 20:19:18 +00:00
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
Eugen Rochko	5976d3702f	Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452)	2023-12-21 09:44:09 +00:00
Eugen Rochko	01f0a6ca4f	Fix profile setup showing default avatar in web UI (#28453)	2023-12-21 08:32:25 +00:00
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01:00
Claire	b8209c3b96	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.	2023-12-20 20:10:45 +01:00
Claire	b135b6ba8f	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.	2023-12-19 21:24:01 +01:00
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
Claire	3598c2e1db	Revert "Feature - Prevents multiple audio/video attachments from being played at the same time (#24717)" (#28251)	2023-12-19 05:08:52 +00:00
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	b474cbbd28	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' 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 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
Claire	bc33be0342	Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' 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	ddf3ad9541	Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' 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	9f92b05bd2	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' 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
Matt Jankowski	ee83d5c760	Enable the eslint react/no-unknown-property rule (#28217)	2023-12-06 13:42:12 +00:00
Josh Goldberg ✨	3a7f10c3f1	Converted hashtag.jsx to TypeScript (#27872) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-11-28 18:20:10 +00:00
Claire	6e70819840	Change search popout to not list unusable search options when logged out (#27918)	2023-11-24 09:27:54 +00:00
Eugen Rochko	0e9801443f	Change to single opt-in during profile setup in onboarding in web UI (#27876)	2023-11-17 10:37:04 +00:00
Eugen Rochko	87696ea26e	Add prominent share/copy button on profiles in web UI (#27865)	2023-11-16 10:23:14 +00:00
Eugen Rochko	d67bd44ca1	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
Jeong Arm	922f086253	Fix open status on media modal (#27867)	2023-11-15 09:29:10 +00:00
Brian Holley	4aa06cbdbf	Fix "Hide these posts from home" list setting not refreshing when switching lists (#27763)	2023-11-14 00:39:54 +00:00
Eugen Rochko	7e3c10dec6	Add icons for private and disabled boost in web UI (#27817) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-13 14:39:45 +00: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
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	3bf2a7296e	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00:03 +00:00
mogaminsk	ac8e4ed38d	Fix inserting emojis from emoji picker fails with TypeError (#27647)	2023-11-01 07:22:02 +00:00
Claire	9c8891b39a	Rewrite AutosuggestTextarea as Functional Component (#27618)	2023-10-31 10:17:37 +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
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 '9a3d047f3e604e581e18346424569e28fc9c5b96' 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 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' 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 '134de736dcbc6aa613fd5aec21d983d92d8b0be8' 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
Renaud Chaput	f08ca3f042	Fix missing icon props (#27539)	2023-10-24 20:43:06 +00:00
Claire	4ef66d6538	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' 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 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream	2023-10-24 19:21:01 +02:00
Claire	b0c76eaadd	Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' 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
たいち ひ	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
Renaud Chaput	9d45a444f9	Convert <Button> to Typescript (#27492)	2023-10-23 09:43:00 +02:00
Claire	245513d630	Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream	2023-10-21 14:33:33 +02:00
Eugen Rochko	33bd8eccd5	Fix missing background behind dismissable banner in web UI (#27479)	2023-10-20 04:08:13 +02:00
Claire	cc000c8859	Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
Renaud Chaput	1b70d7ed7c	Upgrade to react-router v5 (#25047) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-10-19 19:44:55 +02:00
Renaud Chaput	126cd7705d	Do not display the navigation banner in the logo container (#27476)	2023-10-19 19:36:08 +02:00
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Brian Campbell	f76e5111f0	Consider shown and pending status in explore prompt calculation (#27466) ... Co-authored-by: Brian Campbell <brcampbell@beta.team>	2023-10-19 14:25:57 +02:00
Renaud Chaput	10df97c542	The class props should be className (#27462)	2023-10-19 13:22:44 +02:00
Claire	63179f0bf4	Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream	2023-10-17 21:59:58 +02:00
Claire	c10a667ac2	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
Jeong Arm	ad44d832b8	Support "in:public" search filter (#26976)	2023-10-17 16:12:03 +02:00
Stanislas Signoud	935d54124e	Fix missing redirections to make sure /home redirect to the advanced UI (#27378)	2023-10-17 14:59:07 +02:00
Claire	3735e6f79d	Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream	2023-10-10 19:53:41 +02:00
Claire	9d1c3d0678	Fix scroll position in thread view reseting when closing a modal (#27350)	2023-10-10 11:35:32 +02:00
Claire	8ef1a95b1c	Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream	2023-10-09 21:14:57 +02:00
Claire	4a9cdfb928	Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream	2023-10-09 21:12:28 +02:00
Claire	3da7afdeed	Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream	2023-10-09 21:10:47 +02:00
Claire	4c2aca777f	Fix clicking on already-loaded thread scrolling to the top of the thread (#27338)	2023-10-09 16:46:09 +02:00
Renaud Chaput	774e1189d2	Change eslint config to autofix missing comma and indentation in JS files (#26711)	2023-10-09 13:38:29 +02:00
Claire	c310374a2f	Fix clicking on already-opened thread post scrolling to the top of the thread (#27331)	2023-10-09 12:21:02 +02:00
Claire	74c27e33e3	Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream	2023-10-08 17:10:39 +02:00
Claire	a5dbb1ee5a	Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream	2023-10-08 17:05:40 +02:00
Claire	e9a181c52c	Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream	2023-10-08 16:53:05 +02:00
Claire	37bbd3c106	Fix double scroll bars in some columns in advanced interface (#27187)	2023-10-03 13:12:39 +02:00
Michael Stanclift	5a437edc7f	Keep version string displayed without breakpoints in UI (#26986)	2023-10-03 11:52:21 +02:00
Claire	d80a819fc6	Fix explore prompt appearing because of posts being received out of order (#27211)	2023-09-29 15:51:36 +02:00
Claire	abdb58840a	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
Claire	a001ae2f39	Fix explore prompt sometimes showing up when the home TL is loading (#27062)	2023-09-25 17:07:01 +02:00
Claire	38753acaa5	Fix width of large text icon buttons (#27127)	2023-09-25 15:06:57 +02:00
Renaud Chaput	4b7bc1f07c	Convert dropdown_menu state to Typescript (#25585)	2023-09-22 18:18:46 +02:00
Claire	f05985f8ec	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.	2023-09-21 15:12:00 +02:00
Claire	5356ddbcca	Fix search results temporarily disappearing while scrolling and loading more results (#27014)	2023-09-21 13:51:21 +02:00
Claire	22ee4e057d	Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Upstream has added a parameter to `streamFrom`, while glitch-soc had an extra parameter. Ported upstream changes.	2023-09-19 12:59:23 +02:00
Claire	70cae19b6b	Fix hashtag bar being sometimes incorrectly hidden (#26960)	2023-09-19 12:25:39 +02:00
Claire	9688c5fcc4	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-18 12:09:37 +02:00
Claire	893755f4cb	Fix error in Web UI when server rules cannot be fetched (#26957)	2023-09-18 09:51:52 +02:00
Claire	e193c848fe	Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.	2023-09-15 21:25:05 +02:00
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
Claire	5d8c65f2a7	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
Claire	3ca94f6d4a	Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream	2023-09-15 20:21:40 +02:00
Claire	e14372c2d1	Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
Renaud Chaput	bd06c13204	Convert actions/account_notes into Typescript (#26601)	2023-09-11 16:09:22 +02:00
Claire	91040da871	Fix confusing behavior of mute button and volume slider in web UI (#26860)	2023-09-08 20:39:29 +02:00
Eugen Rochko	9b2bc3d1de	Add recent searches in web UI (#26834)	2023-09-07 14:56:19 +02:00
Eugen Rochko	f3a2e15f8e	Fix mute button and volume slider feeling disconnected in web UI (#26827)	2023-09-07 04:24:24 +02:00
Claire	9c1ef8302a	Add some information about Full-text search being disabled in search popout (#26756)	2023-09-06 17:23:58 +02:00
Eugen Rochko	d8bdba2f9f	Add in: to search popout in web UI (#26807)	2023-09-06 06:46:26 +02:00
Eugen Rochko	9d290c23d2	Remove obfuscation of reply count in web UI (#26768)	2023-09-05 23:57:03 +02:00
Eugen Rochko	5d20733d8d	Add infinite scrolling for search results in web UI (#26784)	2023-09-05 23:54:24 +02:00
Claire	548c032dbb	Improve interaction modal error handling (#26795)	2023-09-05 23:49:48 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00