1811 Commits

Author	SHA1	Message	Date
Claire	946bd2e7e1	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
Claire	6f342a6d4c	Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.	2024-05-01 18:56:48 +02:00
Claire	2c386d4cfe	Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream	2024-05-01 17:06:49 +02:00
Claire	0f90e624c5	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict due to our theming system being different. Ported upstream's changes.	2024-05-01 16:10:45 +02:00
Claire	3f61981f5d	Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
Claire	a6147a831f	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper.	2024-05-01 14:25:47 +02:00
Claire	66ee0d4a1f	Fix incorrect label for filtered notifications badge (#29922)	2024-04-16 09:25:23 +00:00
Claire	c386c36866	Add / keyboard shortcut to focus the search field (#29921)	2024-04-12 09:42:12 +00:00
Claire	0e76b919b5	Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02:00
Claire	1d1c3a808a	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.	2024-04-06 21:01:40 +02:00
Claire	777984faeb	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Claire	903dc53522	Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream	2024-04-06 20:01:25 +02:00
Claire	67842ffb22	Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream	2024-04-06 19:54:11 +02:00
Claire	f2b23aa5f3	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.	2024-04-06 19:35:21 +02:00
Renaud Chaput	b4d991adaa	Use integers and not numbers in notification policy API counters (#29810)	2024-04-02 10:06:26 +00:00
Renaud Chaput	67442f9039	Remove global boosts state and convert boosts modal to Typescript (#29774)	2024-03-28 15:33:15 +00:00
Renaud Chaput	f2fd1da23f	Fix PropTypes for some record objects (#29786)	2024-03-28 10:05:16 +00:00
Renaud Chaput	9fbe8d3a0c	Rewrite PIP state in Typescript (#27645) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-27 15:19:33 +00:00
Renaud Chaput	02ea161506	Support "system" theme setting (light/dark theme depending on user system preference) (#29748) ... Co-authored-by: Nishiki Liu <hello@nshki.com>	2024-03-26 09:25:49 +00:00
Eugen Rochko	0cea7a623b	Fix background and icon on notification requests in web UI (#29706)	2024-03-25 13:39:06 +00:00
Eugen Rochko	29f9dc742e	Change design of notification about lost connections in web UI (#29731)	2024-03-25 13:27:38 +00:00
Eugen Rochko	8e7e86ee35	Add ability to reorder uploaded media before posting in web UI (#28456)	2024-03-25 10:29:55 +00:00
Renaud Chaput	6c381f20b1	Restore advanced filter bar setting (#29737)	2024-03-24 14:17:06 +00:00
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