f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
494d28bb56
[Glitch] Convert `entrypoints/sign_up` to Typescript
...
Port 4527e012da
2024-05-04 15:51:58 +02:00
fe7db7905f
[Glitch] Convert easy entrypoints files to Typescript
...
Port 36909065b5
2024-05-04 15:49:30 +02:00
defd1e4024
[Glitch] Remove home marker updates
...
Port 4f4b77920e
2024-05-04 15:42:33 +02:00
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
552e09d57f
[Glitch] Fix marker thunks to not ignore eslint directives for the whole file
...
Port 65093c619f
2024-05-04 15:30:18 +02:00
a4ce53df27
[Glitch] Change moderation warning notification icon
...
Port de4a7bf531
2024-05-04 15:29:51 +02:00
aac59a34ed
[Glitch] Add in-app notifications for moderation actions/warnings
...
Port 4ef0b48b95
2024-05-04 15:29:29 +02:00
8dbcf8a287
[Glitch] Change design of people tab on explore in web UI
...
Port 0ec061aa8f
2024-05-04 15:28:17 +02:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
333905b2d5
[Glitch] Change mute options to be in dropdown on muted users list in web UI
...
Port 74012831f6
2024-05-04 15:15:00 +02:00
bac4026d80
Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream
2024-05-04 15:10:54 +02:00
bceb45adda
Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
2024-05-04 14:59:00 +02:00
9aa31be8d3
Fix local account search on LDAP login being case-sensitive ( #30113 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-03 09:22:48 +00:00
253ead3aa7
Fix not being able to block a subdomain of an already-blocked domain through the API ( #30119 )
2024-05-02 20:56:21 +00:00
9e260014c7
Convert `entrypoints/two_factor_authentication` to Typescript ( #30105 )
2024-05-02 12:02:13 +00:00
616e2f2666
Fix word breaking in filtered notifications badge ( #30114 )
2024-05-02 09:40:18 +00:00
88882fbbee
Move Rails/HABTM cop out of todo ( #30118 )
2024-05-02 09:40:05 +00:00
1e7d5d2957
Update `devise-two-factor` to version 5.0.0 ( #28325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
309f352e6a
New Crowdin Translations (automated) ( #30140 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-02 08:57:30 +00:00
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' 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
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' 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
df933836ca
[Glitch] Fix incorrect label for filtered notifications badge
...
Port 66ee0d4a1f
2024-05-01 19:18:06 +02:00
62b3f284db
[Glitch] Fix unfollow button being out of frame on small screens on old browsers
...
Port 4117c8f6b8
2024-05-01 19:17:28 +02:00
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
ac5113d524
[Glitch] Update eslint (non-major)
...
Port 37d984b8bf
2024-05-01 19:04:59 +02:00
e76ddf79bc
[Glitch] Add `/` keyboard shortcut to focus the search field
...
Port c386c36866
2024-05-01 18:57:39 +02:00
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
2d43547934
[Glitch] Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`)
...
Port 730e2127e1
2024-05-01 18:43:37 +02:00
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
555e33a392
Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict because of our different theming systems.
Updated accordingly, along with `app/helpers/theme_helper.rb`
and `app/helpers/theme_helper_spec.rb`.
2024-05-01 18:38:55 +02:00
3739dda2f6
[Glitch] Add purple border to active compose field search inputs
...
Port 1c87cb8019
2024-05-01 17:31:39 +02:00
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
41c43168fb
[Glitch] Makes the star icon rotate around its actual centre axis
...
Port c6da3ee828
2024-05-01 17:27:59 +02:00
b21322b406
[Glitch] Fix blue border on emoji/language search in Safari & Chrome
...
Port e284417349
2024-05-01 17:27:29 +02:00
4543bb9384
[Glitch] Fix language and emoji search field background colors on light theme
...
Port 5d67247061
2024-05-01 17:27:10 +02:00
3503fe1865
Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream
2024-05-01 17:26:21 +02:00
46cc9141c9
[Glitch] Fix contrast in notification request badge
...
Port 0b9d4103cb
2024-05-01 17:23:07 +02:00
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
87b9b23025
[Glitch] Use integers and not numbers in notification policy API counters
...
Port b4d991adaa
2024-05-01 17:12:57 +02:00
c316852a65
[Glitch] Add API types for status and related objects
...
Port e47a3d00fe
2024-05-01 17:12:16 +02:00
297c8c37b1
[Glitch] Fix Redux Middleware types
...
Port 07635228e2
2024-05-01 17:08:44 +02:00
0f756eaed2
[Glitch] Fix search box color on light theme
...
Port fa9574086d
2024-05-01 17:08:05 +02:00
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
3b1c8d56b2
[Glitch] Fix light theme header on mobile
...
Port 90eb4a5d01
2024-05-01 16:49:21 +02:00
1783820acd
[Glitch] Fix background tint in single column light theme
...
Port 430da03160
2024-05-01 16:48:55 +02:00
375bd52d97
[Glitch] Handle `createAppAsyncThunk` rejected actions in the errors middleware
...
Port 69e5771881
2024-05-01 16:48:27 +02:00
7f404fd635
Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream
2024-05-01 16:47:25 +02:00
b3d5567bd0
[Glitch] Remove global `boosts` state and convert boosts modal to Typescript
...
Port 67442f9039
2024-05-01 16:42:20 +02:00
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
bc370938ef
[Glitch] Fix logo pushing header buttons out of view on certain conditions in mobile layout
...
Port 4f068d4fcc
2024-05-01 15:56:38 +02:00
cc720cd38f
[Glitch] Fix `<RelativeTimestamp>` types
...
Port 961bb84e4c
2024-05-01 15:56:37 +02:00
0ab212f6a9
[Glitch] Fix props for `<Button>`
...
Port d088964761
2024-05-01 15:56:37 +02:00
02f9ce9ce3
[Glitch] Fix PropTypes for some record objects
...
Port f2fd1da23f
2024-05-01 15:56:37 +02:00
5cb4adbf4e
[Glitch] Fix language picker and privacy picker not having a backdrop filter
...
Port c913e2f3e5
2024-05-01 15:56:37 +02:00
555f45f249
[Glitch] Fix notifications marker fetch
...
Port b9982ce578
2024-05-01 15:56:37 +02:00
371c5e59eb
[Glitch] Rewrite PIP state in Typescript
...
Port 9fbe8d3a0c
2024-05-01 15:56:37 +02:00
059e10e546
[Glitch] Rewrite markers reducer in Typescript
...
Port 27d014a7fa
2024-05-01 14:55:03 +02:00
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
03af271d3d
[Glitch] Fix column borders disappearing in advanced interface on low width viewports
...
Port b2d841ce9a
2024-05-01 14:32:29 +02:00
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
d63c0a2879
[Glitch] Support "system" theme setting (light/dark theme depending on user system preference)
...
Port 02ea161506
2024-05-01 14:25:51 +02:00
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
26e10aa203
Change width breakpoint for mobile placement behavior ( #30131 )
2024-04-30 23:39:28 +00:00
d6048d3a6c
Add compatibility `app/javascript/flavours/glitch/styles/index.scss`
2024-04-30 21:27:04 +02:00
8a34c42341
Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`
...
This is just to reduce differences with upstream.
2024-04-30 21:03:04 +02:00
56821ed879
New Crowdin Translations (automated) ( #30128 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-30 09:05:53 +00:00
81f0002e76
Fix missing destory audit logs for Domain Allows ( #30125 )
2024-04-30 08:48:02 +00:00
924af400da
Remove unused memoization in `CustomFilter#expires_in` method ( #30117 )
2024-04-29 12:49:31 +00:00
7d3fe2b4c3
Add loading indicator and empty result message to advanced interface search ( #30085 )
2024-04-29 09:55:41 +00:00
ac7f4d57bb
Use composable query in `Status.without_replies` scope ( #30086 )
2024-04-29 09:55:37 +00:00
95e9de5777
Prevent accidental serialization of `Account` and `User` records ( #30079 )
2024-04-29 09:45:58 +00:00
e336466894
Use shared form partial for `admin/rules` views ( #30067 )
2024-04-29 09:33:27 +00:00
a9816f051d
Use shared form partial for `admin/warning_presets` views ( #30069 )
2024-04-29 09:33:06 +00:00
b9b4db483c
Remove usage of deprecated `defaultTypes` on React functional components ( #30099 )
2024-04-29 09:29:59 +00:00
2739d8d5a4
Use shorter `render` call in `admin/webhooks` view ( #30071 )
2024-04-29 09:10:23 +00:00
bbf1b603e0
Remove unused `Account.popular` scope ( #30068 )
2024-04-29 09:04:35 +00:00
2123281f7c
Move `Account` limits to constants ( #30087 )
2024-04-29 09:02:47 +00:00
f0c9cbaf3b
Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class ( #30088 )
2024-04-29 09:01:46 +00:00
4527e012da
Convert `entrypoints/sign_up` to Typescript ( #30106 )
2024-04-29 08:23:05 +00:00
9be7efedf0
New Crowdin Translations (automated) ( #30092 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-29 08:15:43 +00:00
36909065b5
Convert easy entrypoints files to Typescript ( #30102 )
2024-04-29 08:02:41 +00:00
4f4b77920e
Remove home marker updates ( #22721 )
2024-04-29 07:55:58 +00:00
e0a3662d7b
Drop hardcoded reliance on vanilla flavor
2024-04-28 22:38:11 +02:00
7208edbd37
Replace `use_pack`, `layouts/theme` and `@theme` by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
c3e12a4dfa
Change how theme style packs are loaded
...
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
2024-04-28 15:45:41 +02:00
93cdc66e64
Make `common` inheritence unconditional and simplify theming code
2024-04-28 15:06:48 +02:00
dee57982f1
Rename “home” pack to “application”
2024-04-28 15:06:41 +02:00
9a8be8cf49
Remove theme fallback mechanism
...
Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.
Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
2024-04-28 15:05:16 +02:00
62bc36416f
Get rid of `app/javascript/core`
...
Have all flavors implement everything they need instead.
2024-04-28 15:04:52 +02:00
65093c619f
Fix marker thunks to not ignore eslint directives for the whole file ( #30089 )
2024-04-26 17:11:27 +00:00
de4a7bf531
Change moderation warning notification icon ( #30081 )
2024-04-26 15:33:15 +00:00
bb8c6346fb
Reword and rearrange Content Retention page ( #27733 )
2024-04-26 15:17:41 +00:00
91ca90e25b
Fix Idempotency-Key ignored when scheduling a post ( #30084 )
2024-04-26 13:19:02 +00:00
e845594878
Fix moderator account being exposed in account moderation notification ( #30082 )
2024-04-26 12:42:06 +00:00
5201882a23
New Crowdin Translations (automated) ( #30077 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-26 10:05:18 +00:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
0ec061aa8f
Change design of people tab on explore in web UI ( #30059 )
2024-04-25 16:25:33 +00:00
85fdbd0ad5
New Crowdin Translations (automated) ( #30062 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-25 08:50:54 +00:00
113c931cda
Fix follow request notifications not being displayed ( #2695 )
2024-04-24 17:00:48 +02:00
b128474625
Fixed rendering of excess whitespace in status card titles ( #30017 )
2024-04-24 09:09:21 +00:00
f4a53f3fb4
Extract constants for column size length validation limits ( #30045 )
2024-04-24 08:56:28 +00:00
ebcf9840f4
New Crowdin Translations (automated) ( #30050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-24 08:45:24 +00:00
74012831f6
Change mute options to be in dropdown on muted users list in web UI ( #30049 )
2024-04-24 08:45:12 +00:00
3f6887557b
Move JS source from `packs` to `entrypoints` ( #30037 )
2024-04-23 16:45:12 +00:00
32ead51e5a
Add material design icons to admin/settings views ( #27780 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-23 16:43:49 +00:00
a2399046ca
Fix string interpolation for software updates admin mailer ( #30035 )
2024-04-23 12:54:52 +00:00
049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )
2024-04-23 11:47:00 +00:00
d754b15afb
New Crowdin Translations (automated) ( #30034 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-23 09:07:05 +00:00
33e829763d
Use shared `form` partial for `admin/domain_blocks` views ( #29609 )
2024-04-22 12:22:16 +00:00
1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable ( #30022 )
2024-04-22 09:00:24 +00:00
75163d9daf
Fixed rendering error on /start when not logged in ( #30023 )
2024-04-22 08:53:08 +00:00
3655fb6a22
New Crowdin Translations (automated) ( #30014 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-22 08:42:35 +00:00
c61130af33
New Crowdin translations
2024-04-22 04:27:38 +00:00
ec71c02c4b
New Crowdin Translations (automated) ( #29994 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-19 13:57:43 +00:00
4837bfcc6a
Use shared `form` partial for `admin/announcements` views ( #29608 )
2024-04-19 13:57:32 +00:00
443186ff40
New Crowdin Translations (automated) ( #29980 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-18 11:18:39 +00:00
11e0049b08
Use enum-generated scopes/queries for `BulkImport` ( #29975 )
2024-04-18 10:13:35 +00:00
650c548c31
Add `not_featured_by` scope to Tag ( #28815 )
2024-04-17 10:05:38 +00:00
1d3ecd3fba
Add `API::Pagination` concern ( #28826 )
2024-04-17 09:22:45 +00:00
c35042b7eb
New Crowdin Translations (automated) ( #29972 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-17 09:07:13 +00:00
fc89ecc6ca
Change `/api/v1/announcements` to return regular `Status` entities ( #26736 )
2024-04-17 09:06:23 +00:00
6fed108703
Use Rails `upsert` to generate update_count! query in Counters concern ( #28738 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-17 08:16:51 +00:00
caad1e2628
Add scope `Status.distributable_visibility` ( #29950 )
2024-04-16 13:16:54 +00:00
6b33d3f81b
Add `CustomFilter.unexpired` scope ( #29896 )
2024-04-16 09:29:34 +00:00
66ee0d4a1f
Fix incorrect label for filtered notifications badge ( #29922 )
2024-04-16 09:25:23 +00:00
3159c0a547
Add scope `Status.list_eligible_visibility` ( #29951 )
2024-04-16 09:17:03 +00:00
285d4123b5
New Crowdin Translations (automated) ( #29955 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-16 08:36:21 +00:00
4117c8f6b8
Fix unfollow button being out of frame on small screens on old browsers ( #29923 )
2024-04-15 11:56:48 +00:00
4e78cb9988
New Crowdin Translations (automated) ( #29939 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-15 09:29:39 +00:00
ee4ea83a87
Remove `image_pack_tag` usage ( #29925 )
2024-04-15 09:05:19 +00:00
c386c36866
Add `/` keyboard shortcut to focus the search field ( #29921 )
2024-04-12 09:42:12 +00:00
13bbde2246
Use existing `DEFAULT_FIELDS_SIZE` constant to limit `Account#fields` ( #29911 )
2024-04-12 09:04:23 +00:00
5992df0762
New Crowdin Translations (automated) ( #29920 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-12 08:19:48 +00:00
449f99e168
Fix repeated concat output buffer duplicating layout markup ( #29918 )
2024-04-11 23:37:07 +00:00
20b1e55f24
New Crowdin Translations (automated) ( #29903 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-11 10:30:31 +00:00
db5a5636d9
New Crowdin Translations (automated) ( #29888 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-10 13:03:40 +00:00
b57ee5cf5b
Fix `Style/MapIntoArray` cop in context helper ( #29885 )
2024-04-10 12:46:39 +00:00
285f63c02e
Use composable query in `User.active` scope ( #29775 )
2024-04-08 13:53:49 +00:00
babbf6017d
Remove caching in `cache_collection` ( #29862 )
2024-04-08 13:46:13 +00:00
f3430eebbb
Fix hashtag string interpolation in welcome email ( #29879 )
2024-04-08 13:45:25 +00:00
13faf26315
New Crowdin Translations (automated) ( #29859 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-08 13:44:54 +00:00
730e2127e1
Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) ( #29869 )
2024-04-08 08:17:51 +00:00
91531e9586
[Glitch] Add ability to reorder uploaded media before posting in web UI
...
Port 8e7e86ee35
2024-04-06 22:34:03 +02:00
fc533cfad3
[Glitch] Fix background and icon on notification requests in web UI
...
Port 0cea7a623b
2024-04-06 21:51:51 +02:00
b55bbfa2b3
[Glitch] Change design of notification about lost connections in web UI
...
Port 29f9dc742e
2024-04-06 21:49:57 +02:00
1ae08ae257
[Glitch] Change out-of-band hashtags design in web UI
...
Port dd061291b1
2024-04-06 21:48:52 +02:00
0e76b919b5
Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
a844a6a577
[Glitch] Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately
...
Port dfa43707eb
2024-04-06 21:39:04 +02:00
c3a128f31e
Remove strings already defined upstream
2024-04-06 21:25:04 +02:00
afaad0755f
[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional
...
Port 37ca59815c
2024-04-06 21:17:45 +02:00
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
f635cde756
[Glitch] Change new modals to allow vertical scrolling
...
Port de6c9e0fcd
2024-04-06 20:43:43 +02:00
0f8b33238f
[Glitch] Change icon of severed relationships notifications
...
Port 387c78ddf9
2024-04-06 20:39:07 +02:00
576c085ea0
[Glitch] Add the role ID to the badge component
...
Port ec1e770fea
2024-04-06 20:35:29 +02:00
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
f14b6f3d99
[Glitch] Fix duplicate translation string for severed relationships
...
Port 885d0faf83
2024-04-06 20:31:09 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
375af259a2
[Glitch] Change back button to always appear in advanced web UI
...
Port be52633ee4
2024-04-06 19:55:13 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
0f966209ca
[Glitch] Add notifications of severed relationships
...
Port 44bf7b8128
2024-04-06 19:38:57 +02:00
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
9451997fa8
Refactor notifications code to reduce differences with upstream ( #2692 )
...
* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container
2024-04-06 19:34:30 +02:00
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02:00
b61ae28f8d
Separate methods for theme style and meta color tags ( #29802 )
2024-04-05 09:52:43 +00:00
c0fe8a9f13
Extract shared callback behaviour to `CustomFilterCache` concern ( #29695 )
2024-04-05 09:17:58 +00:00
6ac90d4c5d
Add tests for our number formatting function ( #29852 )
2024-04-05 08:06:31 +00:00
906a399634
Fix wrong extension for a test file ( #29853 )
2024-04-05 07:57:44 +00:00
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
601834d746
Use partial collection render for welcome mailer features ( #29843 )
2024-04-04 16:13:10 +00:00
1c87cb8019
Add purple border to active compose field search inputs ( #29839 )
2024-04-04 11:51:06 +00:00
966d7f5bf9
Add missing snowflake range correction ( #29841 )
2024-04-04 11:33:17 +00:00
4045c069f8
Use `public_visibility` ( #29847 )
2024-04-04 07:31:30 +00:00
c6da3ee828
Makes the star icon rotate around its actual centre axis ( #29844 )
2024-04-03 21:10:02 +00:00
cde3206478
Simplify feature loop in welcome mailer ( #29760 )
2024-04-03 20:10:59 +00:00
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
e284417349
Fix blue border on emoji/language search in Safari & Chrome ( #29832 )
2024-04-03 15:19:10 +00:00
5d67247061
Fix language and emoji search field background colors on light theme ( #29828 )
2024-04-03 14:22:50 +00:00
56d13069cd
New Crowdin Translations (automated) ( #29836 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-03 09:04:29 +00:00
edde54e991
Update stoplight to version 4.1.0 ( #28366 )
2024-04-02 15:47:40 +00:00
921c4c1273
Match comment style of `FeedManager` list/tags checks ( #29639 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-04-02 14:07:31 +00:00
0b9d4103cb
Fix contrast in notification request badge ( #29826 )
2024-04-02 14:05:46 +00:00
34489591ec
Add `max_pinned_statuses` to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
f56309f5f0
Add `by_latest_used` scope, move admin area recent IPs to partial ( #29497 )
2024-04-02 13:51:34 +00:00
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
e47a3d00fe
Add API types for status and related objects ( #29792 )
2024-04-02 10:03:33 +00:00
07635228e2
Fix Redux Middleware types ( #29800 )
2024-04-02 09:56:03 +00:00
c717747603
New Crowdin Translations (automated) ( #29812 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-02 09:26:06 +00:00
fa9574086d
Fix search box color on light theme ( #29808 )
2024-04-02 09:15:31 +00:00
90eb4a5d01
Fix light theme header on mobile ( #29809 )
2024-03-29 21:03:30 +00:00
430da03160
Fix background tint in single column light theme ( #29803 )
2024-03-29 17:16:51 +00:00
69e5771881
Handle `createAppAsyncThunk` rejected actions in the errors middleware ( #29791 )
2024-03-29 13:57:39 +00:00
f96648d41c
New Crowdin Translations (automated) ( #29796 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-29 13:35:50 +00:00
672c9f5f05
Change the `theme-color` value automatically when using a built-in theme ( #29795 )
2024-03-29 13:32:07 +00:00
67442f9039
Remove global `boosts` state and convert boosts modal to Typescript ( #29774 )
2024-03-28 15:33:15 +00:00
8a498f4e65
New Crowdin Translations (automated) ( #29785 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-28 14:48:09 +00:00
4f068d4fcc
Fix logo pushing header buttons out of view on certain conditions in mobile layout ( #29787 )
2024-03-28 14:00:57 +00:00
e85f24174e
Simplify checklist step loop in welcome mailer ( #29761 )
2024-03-28 10:56:33 +00:00
961bb84e4c
Fix `<RelativeTimestamp>` types ( #29781 )
2024-03-28 10:07:01 +00:00
d088964761
Fix props for `<Button>` ( #29780 )
2024-03-28 10:06:25 +00:00
f2fd1da23f
Fix PropTypes for some record objects ( #29786 )
2024-03-28 10:05:16 +00:00
1025fff6b9
New Crowdin Translations (automated) ( #29772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-27 21:19:03 +00:00
c913e2f3e5
Fix language picker and privacy picker not having a backdrop filter ( #29779 )
2024-03-27 16:32:00 +00:00
b9982ce578
Fix notifications marker fetch ( #29777 )
2024-03-27 15:49:02 +00:00
9fbe8d3a0c
Rewrite PIP state in Typescript ( #27645 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-27 15:19:33 +00:00
b016f03637
Pull out constant from `AccountWarning.recent` scope ( #29767 )
2024-03-27 14:08:04 +00:00
27d014a7fa
Rewrite markers reducer in Typescript ( #27644 )
2024-03-27 12:47:09 +00:00
1d0a43f6a3
Use composable query in `Status.not_domain_blocked_by_account` scope ( #29766 )
2024-03-27 09:59:45 +00:00
b2d841ce9a
Fix column borders disappearing in advanced interface on low width viewports ( #29763 )
2024-03-26 23:14:11 +00:00
c4feba4347
Use existing `MascotHelper#instance_presenter` instead of local var in `welcome` email template ( #29759 )
2024-03-26 15:58:48 +00:00
9c24f2d6b1
Undo notification permissions on individual and domain blocks ( #29570 )
2024-03-26 14:46:38 +00:00
7508472d84
Fix admin interface repeating rule title instead of showing hint text ( #29758 )
2024-03-26 14:46:05 +00:00
cfea9cc172
Add list of pending releases directly in mail notifications for version updates ( #29436 )
2024-03-26 14:45:19 +00:00
32938dadd7
Add `not_allowed` scope for `PreviewCardTrend` ( #29599 )
2024-03-26 13:21:20 +00:00
cf76380c91
Add `AccountStat.by_recent_status`, use in `Account` ( #29704 )
2024-03-26 13:12:09 +00:00
b3d970bdb8
New Crowdin Translations (automated) ( #29756 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-26 09:49:19 +00:00
eb926b7e60
Ensure case-insensitive fields are converted to lowercase in user imports ( #29740 )
2024-03-26 09:30:10 +00:00
a3e8b78250
Ensure case-insensitive fields are converted to lowercase in Admin Imports ( #29739 )
2024-03-26 09:30:07 +00:00
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
0cea7a623b
Fix background and icon on notification requests in web UI ( #29706 )
2024-03-25 13:39:06 +00:00
29f9dc742e
Change design of notification about lost connections in web UI ( #29731 )
2024-03-25 13:27:38 +00:00
dd061291b1
Change out-of-band hashtags design in web UI ( #29732 )
2024-03-25 12:45:00 +00:00
799e3be9bd
New Crowdin Translations (automated) ( #29726 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-25 11:07:38 +00:00
8e7e86ee35
Add ability to reorder uploaded media before posting in web UI ( #28456 )
2024-03-25 10:29:55 +00:00
6c381f20b1
Restore advanced filter bar setting ( #29737 )
2024-03-24 14:17:06 +00:00
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
d71d26a3c9
Reattribute notification-related records if possible when merging accounts ( #29694 )
2024-03-22 16:21:53 +00:00
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
387c78ddf9
Change icon of severed relationships notifications ( #29712 )
2024-03-22 15:45:04 +00:00
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
34f293475e
Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )
2024-03-22 15:08:27 +00:00
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
8c1d29df7e
Use `has_many through` instead of `delegate` for ARSE<>SR ( #29672 )
2024-03-22 14:43:35 +00:00
ec1e770fea
Add the role ID to the badge component ( #29707 )
2024-03-22 11:59:35 +00:00
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
75f34b80a8
Clean up notification requests when deleting accounts ( #29693 )
2024-03-21 14:12:26 +00:00
885d0faf83
Fix duplicate translation string for severed relationships ( #29689 )
2024-03-21 10:06:21 +00:00
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
77897cd24c
Use existing `SeveredRelationship.about_local_account` scope in more places ( #29673 )
2024-03-21 08:36:49 +00:00
cdd168f5d3
Update `enum` away from deprecated ( #29678 )
2024-03-21 08:32:35 +00:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
2024-03-20 18:33:00 +01:00
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
be52633ee4
Change back button to always appear in advanced web UI ( #29669 )
2024-03-20 17:21:03 +00:00
f4d753aedf
Fix error in severed relationship event serializer ( #29670 )
2024-03-20 17:14:53 +00:00
98a2bb8be2
Fix issue with severed relationships notifications ( #29668 )
2024-03-20 17:02:09 +00:00
954b470fbc
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 16:48:24 +00:00
d4449cc682
Fix account_relationship_severance_events unique indexes ( #29665 )
2024-03-20 16:08:34 +00:00
Claire
Renaud Chaput
David Beck
Eugen Rochko
Râu Cao
mogaminsk
Matt Jankowski
github-actions[bot]
renovate[bot]
Michael Stanclift
nicolas
Emelia Smith
Tim Rogers
GitHub Actions
Jeong Arm