3,699 commits

Author	SHA1	Message	Date
Claire	b039e62194	Merge commit 'a2399046ca' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
Claire	6204d13a2e	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	2024-05-01 19:38:34 +02:00
Claire	360590ecd8	Merge commit 'a390299744' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.	2024-05-01 19:30:41 +02:00
Claire	946bd2e7e1	Merge commit '0622107449' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
Claire	6f342a6d4c	Merge commit '34e826f373' 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	9ce82a35cb	Merge commit '20b1e55f24' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
Claire	0fb469e2f3	Merge commit '52ab8a59c6' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
Claire	3503fe1865	Merge commit '4045c069f8' into glitch-soc/merge-upstream	2024-05-01 17:26:21 +02:00
Claire	2c386d4cfe	Merge commit 'c70c39cad0' into glitch-soc/merge-upstream	2024-05-01 17:06:49 +02:00
Claire	7f404fd635	Merge commit '90eb4a5d01' into glitch-soc/merge-upstream	2024-05-01 16:47:25 +02:00
Claire	0f90e624c5	Merge commit '672c9f5f05' 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 '8a498f4e65' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
Claire	7b46517c38	Merge commit 'd49343ed11' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
Claire	a6147a831f	Merge commit '02ea161506' 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
github-actions[bot]	d754b15afb	New Crowdin Translations (automated) (#30034) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-23 09:07:05 +00:00
Tim Rogers	75163d9daf	Fixed rendering error on /start when not logged in (#30023)	2024-04-22 08:53:08 +00:00
github-actions[bot]	3655fb6a22	New Crowdin Translations (automated) (#30014) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-22 08:42:35 +00:00
github-actions[bot]	ec71c02c4b	New Crowdin Translations (automated) (#29994) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-19 13:57:43 +00:00
github-actions[bot]	443186ff40	New Crowdin Translations (automated) (#29980) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-18 11:18:39 +00:00
github-actions[bot]	c35042b7eb	New Crowdin Translations (automated) (#29972) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-17 09:07:13 +00:00
Claire	66ee0d4a1f	Fix incorrect label for filtered notifications badge (#29922)	2024-04-16 09:25:23 +00:00
github-actions[bot]	285d4123b5	New Crowdin Translations (automated) (#29955) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-16 08:36:21 +00:00
github-actions[bot]	4e78cb9988	New Crowdin Translations (automated) (#29939) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-15 09:29:39 +00:00
Claire	c386c36866	Add / keyboard shortcut to focus the search field (#29921)	2024-04-12 09:42:12 +00:00
github-actions[bot]	5992df0762	New Crowdin Translations (automated) (#29920) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-12 08:19:48 +00:00
github-actions[bot]	20b1e55f24	New Crowdin Translations (automated) (#29903) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-11 10:30:31 +00:00
github-actions[bot]	db5a5636d9	New Crowdin Translations (automated) (#29888) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-10 13:03:40 +00:00
github-actions[bot]	13faf26315	New Crowdin Translations (automated) (#29859) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-08 13:44:54 +00:00
Renaud Chaput	730e2127e1	Fix webpack warnings due to unhandled extensions (LICENCE and README.md) (#29869)	2024-04-08 08:17:51 +00:00
Claire	0e76b919b5	Merge commit '0cea7a623b' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02:00
Claire	1d1c3a808a	Merge commit '6c381f20b1' 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 '119c7aa0df' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Claire	903dc53522	Merge commit '05eda8d193' into glitch-soc/merge-upstream	2024-04-06 20:01:25 +02:00
Claire	67842ffb22	Merge commit '01464074c9' into glitch-soc/merge-upstream	2024-04-06 19:54:11 +02:00
Claire	f2b23aa5f3	Merge commit '954b470fbc' 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	6ac90d4c5d	Add tests for our number formatting function (#29852)	2024-04-05 08:06:31 +00:00
Renaud Chaput	906a399634	Fix wrong extension for a test file (#29853)	2024-04-05 07:57:44 +00:00
renovate[bot]	37d984b8bf	Update eslint (non-major) (#29820) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-04-03 18:05:39 +00:00
github-actions[bot]	56d13069cd	New Crowdin Translations (automated) (#29836) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-03 09:04:29 +00: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	e47a3d00fe	Add API types for status and related objects (#29792)	2024-04-02 10:03:33 +00:00
Renaud Chaput	07635228e2	Fix Redux Middleware types (#29800)	2024-04-02 09:56:03 +00:00
github-actions[bot]	c717747603	New Crowdin Translations (automated) (#29812) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-04-02 09:26:06 +00:00
Renaud Chaput	69e5771881	Handle createAppAsyncThunk rejected actions in the errors middleware (#29791)	2024-03-29 13:57:39 +00:00
github-actions[bot]	f96648d41c	New Crowdin Translations (automated) (#29796) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-03-29 13:35:50 +00:00
Renaud Chaput	67442f9039	Remove global boosts state and convert boosts modal to Typescript (#29774)	2024-03-28 15:33:15 +00:00
github-actions[bot]	8a498f4e65	New Crowdin Translations (automated) (#29785) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-03-28 14:48:09 +00:00
Renaud Chaput	961bb84e4c	Fix <RelativeTimestamp> types (#29781)	2024-03-28 10:07:01 +00:00
Renaud Chaput	d088964761	Fix props for <Button> (#29780)	2024-03-28 10:06:25 +00:00
Renaud Chaput	f2fd1da23f	Fix PropTypes for some record objects (#29786)	2024-03-28 10:05:16 +00:00