061464a563
[Glitch] Fix incorrect element selector from #30221
...
Port 94493cff92
2024-05-16 19:34:17 +02:00
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
66906a1bc1
Fix Web UI trying to save user settings when logged out ( #30324 )
2024-05-16 13:01:01 +00:00
65e82211cd
Rename `cache_*` methods to `preload_*` in controller concern ( #30209 )
2024-05-16 08:03:46 +00:00
f0d6dc4519
Fix: Mark redirect uris field in Development > Application form as required ( #30311 )
2024-05-16 07:59:46 +00:00
cdb042ae86
New Crowdin Translations (automated) ( #30319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-16 07:50:19 +00:00
c9ee1437c0
Use ruby language constants to build version string in software version dimension ( #30309 )
2024-05-16 07:43:35 +00:00
94493cff92
Fix incorrect element selector from #30221 ( #30307 )
2024-05-16 07:33:29 +00:00
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
85c625d319
Fix repetitive database queries from #30040 ( #30259 )
2024-05-15 09:38:16 +00:00
aad5e841b5
New Crowdin Translations (automated) ( #30290 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-15 08:53:57 +00:00
40639510f8
Retain unconfirmed users longer (1 week) ( #30285 )
2024-05-15 08:27:34 +00:00
47ce5f4ca9
[Glitch] Fix missing prop warning for `<Account>`
...
Port 1bf661cddb
2024-05-14 20:53:40 +02:00
160823716a
[Glitch] Add active animation to header settings button
...
Port cb93c1edf0
2024-05-14 20:53:01 +02:00
666760f450
Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream fixed a command we have modified in glitch-soc.
Updated as upstream did.
2024-05-14 20:47:14 +02:00
1bf661cddb
Fix missing prop warning for `<Account>` ( #30291 )
2024-05-14 18:15:42 +00:00
3a7aec2807
New Crowdin Translations (automated) ( #30254 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-13 11:30:41 +00:00
cb93c1edf0
Add active animation to header settings button ( #30221 )
2024-05-13 09:19:42 +00:00
f65a6d50f1
[Glitch] Fix typo
...
Port c36a8786c1
2024-05-11 22:44:41 +02:00
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
c9557bdd3b
New Crowdin Translations (automated) ( #30215 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-10 09:34:48 +00:00
c36a8786c1
Fix typo ( #30224 )
2024-05-10 09:19:27 +00:00
21c904b0f6
Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream
2024-05-07 20:30:17 +02:00
d8c4284723
Ensure custom favicon is converted to PNG and ICO ( #30208 )
2024-05-07 18:15:17 +00:00
f7dadc9f0b
Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream
2024-05-07 12:13:02 +02:00
ed556db395
New Crowdin Translations (automated) ( #30201 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-07 09:36:16 +00:00
96fb6e491f
Revert "Migrate paperclip `_file_size` columns to bigint ( #29263 )" ( #30203 )
2024-05-07 08:46:05 +00:00
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
2fe1b8d169
Add API to get multiple accounts and statuses ( #27871 )
...
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
2024-05-06 15:19:15 +00:00
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
b152f936c1
Migrate paperclip `_file_size` columns to bigint ( #29263 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-06 15:05:12 +00:00
05126d106f
Redirect back after site upload deletion ( #30141 )
2024-05-06 13:31:39 +00:00
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
8e4fea77e3
Fix race condition in `POST /api/v1/push/subscription` ( #30166 )
2024-05-06 12:41:14 +00:00
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00:00
9be2c02e52
New Crowdin Translations (automated) ( #30169 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-06 08:36:29 +00:00
2f73e486b7
Switched HTMLEntities to the expanded flavor which supports a larger … ( #30173 )
2024-05-05 02:24:10 +00:00
c59f6ef5b8
[Glitch] Convert `entrypoints/two_factor_authentication` to Typescript
...
Port 9e260014c7
2024-05-04 16:30:24 +02:00
b6ada33ad4
[Glitch] Fix word breaking in filtered notifications badge
...
Port 616e2f2666
2024-05-04 16:30:05 +02:00
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
4b82dc84f5
[Glitch] Change width breakpoint for mobile placement behavior
...
Port 26e10aa203
2024-05-04 16:16:22 +02:00
6662d604c1
[Glitch] Add loading indicator and empty result message to advanced interface search
...
Port 7d3fe2b4c3
2024-05-04 16:15:54 +02:00
e62595c966
[Glitch] Remove usage of deprecated `defaultTypes` on React functional components
...
Port b9b4db483c
2024-05-04 16:15:16 +02:00
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
David Lapshin
Claire
Matt Jankowski
Emelia Smith
github-actions[bot]
Jason Punyon
Renaud Chaput
Chee Aun
Fawaz Farid
Tim Rogers
mogaminsk
David Beck
Eugen Rochko
Râu Cao
renovate[bot]
Michael Stanclift
nicolas