Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
github-actions[bot]
8b75d18371
New Crowdin Translations (automated) ( #30358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-20 07:41:38 +00:00
Renaud Chaput
990a0c19a9
Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API ( #30368 )
2024-05-20 07:29:27 +00:00
Renaud Chaput
a178ba7cd5
Use a modern React context for identity in the app ( #30098 )
2024-05-19 17:07:32 +00:00
Claire
7b078b46a2
[Glitch] Fix Web UI trying to save user settings when logged out
...
Port 66906a1bc1
2024-05-16 19:34:50 +02:00
David Lapshin
061464a563
[Glitch] Fix incorrect element selector from #30221
...
Port 94493cff92
2024-05-16 19:34:17 +02:00
Claire
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
Claire
66906a1bc1
Fix Web UI trying to save user settings when logged out ( #30324 )
2024-05-16 13:01:01 +00:00
github-actions[bot]
cdb042ae86
New Crowdin Translations (automated) ( #30319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-16 07:50:19 +00:00
David Lapshin
94493cff92
Fix incorrect element selector from #30221 ( #30307 )
2024-05-16 07:33:29 +00:00
github-actions[bot]
aad5e841b5
New Crowdin Translations (automated) ( #30290 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-15 08:53:57 +00:00
Renaud Chaput
47ce5f4ca9
[Glitch] Fix missing prop warning for <Account>
...
Port 1bf661cddb
2024-05-14 20:53:40 +02:00
David Lapshin
160823716a
[Glitch] Add active animation to header settings button
...
Port cb93c1edf0
2024-05-14 20:53:01 +02:00
Claire
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
Renaud Chaput
1bf661cddb
Fix missing prop warning for <Account> ( #30291 )
2024-05-14 18:15:42 +00:00
github-actions[bot]
3a7aec2807
New Crowdin Translations (automated) ( #30254 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-13 11:30:41 +00:00
David Lapshin
cb93c1edf0
Add active animation to header settings button ( #30221 )
2024-05-13 09:19:42 +00:00
Chee Aun
f65a6d50f1
[Glitch] Fix typo
...
Port c36a8786c1
2024-05-11 22:44:41 +02:00
Claire
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
github-actions[bot]
c9557bdd3b
New Crowdin Translations (automated) ( #30215 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-10 09:34:48 +00:00
Chee Aun
c36a8786c1
Fix typo ( #30224 )
2024-05-10 09:19:27 +00:00
Claire
f7dadc9f0b
Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream
2024-05-07 12:13:02 +02:00
github-actions[bot]
ed556db395
New Crowdin Translations (automated) ( #30201 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-07 09:36:16 +00:00
Claire
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
github-actions[bot]
9be2c02e52
New Crowdin Translations (automated) ( #30169 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-06 08:36:29 +00:00
Renaud Chaput
c59f6ef5b8
[Glitch] Convert entrypoints/two_factor_authentication to Typescript
...
Port 9e260014c7
2024-05-04 16:30:24 +02:00
mogaminsk
b6ada33ad4
[Glitch] Fix word breaking in filtered notifications badge
...
Port 616e2f2666
2024-05-04 16:30:05 +02:00
Claire
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
Claire
4b82dc84f5
[Glitch] Change width breakpoint for mobile placement behavior
...
Port 26e10aa203
2024-05-04 16:16:22 +02:00
Claire
6662d604c1
[Glitch] Add loading indicator and empty result message to advanced interface search
...
Port 7d3fe2b4c3
2024-05-04 16:15:54 +02:00
Renaud Chaput
e62595c966
[Glitch] Remove usage of deprecated defaultTypes on React functional components
...
Port b9b4db483c
2024-05-04 16:15:16 +02:00
Claire
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
Renaud Chaput
494d28bb56
[Glitch] Convert entrypoints/sign_up to Typescript
...
Port 4527e012da
2024-05-04 15:51:58 +02:00
Renaud Chaput
fe7db7905f
[Glitch] Convert easy entrypoints files to Typescript
...
Port 36909065b5
2024-05-04 15:49:30 +02:00
David Beck
defd1e4024
[Glitch] Remove home marker updates
...
Port 4f4b77920e
2024-05-04 15:42:33 +02:00
Claire
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
Renaud Chaput
552e09d57f
[Glitch] Fix marker thunks to not ignore eslint directives for the whole file
...
Port 65093c619f
2024-05-04 15:30:18 +02:00
Claire
a4ce53df27
[Glitch] Change moderation warning notification icon
...
Port de4a7bf531
2024-05-04 15:29:51 +02:00
Claire
aac59a34ed
[Glitch] Add in-app notifications for moderation actions/warnings
...
Port 4ef0b48b95
2024-05-04 15:29:29 +02:00
Eugen Rochko
8dbcf8a287
[Glitch] Change design of people tab on explore in web UI
...
Port 0ec061aa8f
2024-05-04 15:28:17 +02:00
Claire
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Eugen Rochko
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
Claire
bac4026d80
Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream
2024-05-04 15:10:54 +02:00
Claire
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
Renaud Chaput
9e260014c7
Convert entrypoints/two_factor_authentication to Typescript ( #30105 )
2024-05-02 12:02:13 +00:00
mogaminsk
616e2f2666
Fix word breaking in filtered notifications badge ( #30114 )
2024-05-02 09:40:18 +00:00
github-actions[bot]
309f352e6a
New Crowdin Translations (automated) ( #30140 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-02 08:57:30 +00:00
Claire
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
Claire
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
Claire
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
