Matt Jankowski
9cc4040308
Extract COMMENT_SIZE_LIMIT constant in AP::Activity::Flag class ( #30637 )
2024-06-10 15:23:55 +00:00
Matt Jankowski
9bf2e2eda0
Extract TEXT_LENGTH_LIMIT constant in Appeal class ( #30638 )
2024-06-10 15:23:17 +00:00
github-actions[bot]
bb27321781
New Crowdin Translations (automated) ( #30608 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-10 14:29:30 +00:00
Daniel M Brasil
77c2216e47
fix: Return HTTP 422 when scheduled status time is less than 5 minutes ( #30584 )
2024-06-10 13:33:48 +00:00
GitHub Actions
33b3330dc7
New Crowdin translations
2024-06-09 04:29:04 +00:00
Claire
4c55a6ee73
Merge pull request #2730 from mayafri/fixes/collapsed-toots-gradient
...
light theme: fix gradient for collapsed toots
2024-06-08 14:41:10 +02:00
Claire
905e9fab97
Merge pull request #2696 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2024-06-08 13:42:34 +02:00
GitHub Actions
aab5b10c38
New Crowdin translations
2024-06-08 04:29:18 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
496c10542b
Fix division by zero on some video/GIF files ( #30600 )
2024-06-07 17:42:43 +00:00
Claire
9e9613b286
Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints ( #30591 )
2024-06-07 13:45:11 +00:00
github-actions[bot]
c1b0c1a5e4
New Crowdin Translations (automated) ( #30586 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-07 09:59:30 +00:00
Claire
1408733386
Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS ( #30590 )
2024-06-07 09:27:59 +00:00
Maya Friedrichs
ac3d761c78
Remove gradient for collapsed toots
...
This gradient is already set in `components.scss` with the new background
2024-06-07 00:36:41 +02:00
Claire
1ffc293b86
Add missing moderation_warning notification support to grouped notifications API ( #30576 )
2024-06-06 14:12:06 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
github-actions[bot]
a729104a41
New Crowdin Translations (automated) ( #30575 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-06 08:53:28 +00:00
Eugen Rochko
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
Matt Jankowski
2fdd782f21
Fix empty aria-hidden attribute value in logo resources area ( #30570 )
2024-06-06 07:50:15 +00:00
Emelia Smith
e02d23b549
Change read:me scope to profile scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Eugen Rochko
3c435f9ba0
Change counters to be displayed on profile timelines in web UI ( #30525 )
2024-06-05 23:52:46 +00:00
Emelia Smith
4655be0da6
Fix add validation to webpush subscription keys ( #30542 )
2024-06-05 19:16:47 +00:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
Emelia Smith
eef2cc054f
Add url validation to Web::PushSubscription endpoints ( #30540 )
2024-06-05 08:06:06 +00:00
github-actions[bot]
e4e3875452
New Crowdin Translations (automated) ( #30543 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-05 07:52:25 +00:00
Matt Jankowski
249cbc449c
Use existing config access to local_domain value ( #30509 )
2024-06-03 09:15:58 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
github-actions[bot]
aa9b80f57d
New Crowdin Translations (automated) ( #30517 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-03 07:34:33 +00:00
Matt Jankowski
469de923aa
Update current_user override mode description in controllers ( #30515 )
2024-06-03 07:16:29 +00:00
github-actions[bot]
dac4eba46b
New Crowdin Translations (automated) ( #30499 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-31 09:26:52 +00:00
Matt Jankowski
85d9053b36
Move pagination_params into API::BaseController ( #28845 )
2024-05-30 14:56:48 +00:00
github-actions[bot]
a0b525e50b
New Crowdin Translations (automated) ( #30477 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-30 14:54:51 +00:00
Claire
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
Claire
3ea4275ae3
Merge pull request from GHSA-5fq7-3p3j-9vrf
2024-05-30 14:03:13 +02:00
Eugen Rochko
4069fae10d
[Glitch] Add support for fediverse:creator OpenGraph tag
...
Port 128987eded
2024-05-29 18:52:11 +02:00
Renaud Chaput
2e3d6e451f
[Glitch] Enable stricter Typescript options
...
Port 3750e8050c
2024-05-29 17:09:35 +02:00
Renaud Chaput
6b4c182806
[Glitch] Fix createDataLoadingThunk to allow actions without arguments
...
Port 6a75e1c8c8
2024-05-29 17:08:13 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Emelia Smith
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
github-actions[bot]
6eea83211c
New Crowdin Translations (automated) ( #30464 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-29 11:12:23 +00:00
Claire
36fe8f8566
Change ids param to id in /api/v1/statuses and /api/v1/accounts for consistency ( #30465 )
2024-05-29 09:19:17 +00:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
Matt Jankowski
4a77e477ee
Consolidate account scopes for LOWER (index using) username/domain queries ( #30451 )
2024-05-28 14:11:31 +00:00
Matt Jankowski
c61e356475
Add Status::MEDIA_ATTACHMENTS_LIMIT configuration constant ( #30433 )
2024-05-27 09:49:44 +00:00
github-actions[bot]
e5c3dc33a2
New Crowdin Translations (automated) ( #30421 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-27 09:35:45 +00:00
Renaud Chaput
3750e8050c
Enable stricter Typescript options ( #30435 )
2024-05-27 09:24:59 +00:00
Renaud Chaput
6a75e1c8c8
Fix createDataLoadingThunk to allow actions without arguments ( #30439 )
2024-05-27 09:00:40 +00:00
Claire
1a2a28eb4a
Fix rubocop warnings
2024-05-24 17:13:34 +02:00
Renaud Chaput
e947f1f2ed
[Glitch] Fix a leftover argument to api()
...
Port 8ea2726376
2024-05-24 17:09:49 +02:00
Claire
d76106da12
Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
Renaud Chaput
acc77c3836
Add instrumentation to the search services ( #30350 )
2024-05-24 13:13:23 +00:00
Matt Jankowski
9b5055d34d
Fix Style/SuperArguments cop ( #30406 )
2024-05-24 08:36:21 +00:00
github-actions[bot]
54351d01f2
New Crowdin Translations (automated) ( #30410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-24 08:26:38 +00:00
Renaud Chaput
8ea2726376
Fix a leftover argument to api() ( #30405 )
2024-05-24 08:25:42 +00:00
Renaud Chaput
e32bfad88a
[Glitch] Fix createDataLoadingThunk and related actions
...
Port b6fd14f0e2
2024-05-23 20:37:00 +02:00
Renaud Chaput
8d6058b40a
[Glitch] Proposal: a modern & typed way of writing Redux actions doing API requests
...
Port 10ec421dd4
2024-05-23 20:33:05 +02:00
Claire
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Renaud Chaput
b6fd14f0e2
Fix createDataLoadingThunk and related actions ( #30408 )
2024-05-23 18:22:42 +00:00
Renaud Chaput
c465ef7560
[Glitch] Fix some API calls that should not use an API token
...
Port 15d3070754
2024-05-23 20:11:20 +02:00
Claire
0e8633f6c7
Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
Claire
133d98fb25
Normalize language code of incoming posts ( #30403 )
2024-05-23 17:28:18 +00:00
Renaud Chaput
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )
2024-05-23 09:50:13 +00:00
github-actions[bot]
5b5a35cf96
New Crowdin Translations (automated) ( #30402 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-23 08:26:29 +00:00
Renaud Chaput
15d3070754
Fix some API calls that should not use an API token ( #30401 )
2024-05-23 07:30:48 +00:00
Renaud Chaput
3e9298370d
[Glitch] Remove the access token from Redux & context
...
Port 2c5ab8f647
2024-05-22 21:14:54 +02:00
Claire
22d12229b2
Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream
2024-05-22 21:05:19 +02:00
Renaud Chaput
2c5ab8f647
Remove the access token from Redux & context ( #30275 )
2024-05-22 14:45:18 +00:00
github-actions[bot]
a2b4c29c8f
New Crowdin Translations (automated) ( #30394 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-22 07:57:51 +00:00
David Lapshin
dc35563f65
[Glitch] Fix announcements icon rotating like settings one
...
Port cd0c547936
2024-05-21 17:45:59 +02:00
Claire
5ab111554e
Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
David Lapshin
cd0c547936
Fix announcements icon rotating like settings one ( #30388 )
2024-05-21 15:24:51 +00:00
Claire
edf6ca56e3
Fix rubocop error and cleanup Status.as_direct_timeline a little
2024-05-21 13:12:46 +02:00
Claire
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
Claire
89f89d738f
Revert "Allow unblocking email addresses from any matching account ( #29305 )" ( #30385 )
2024-05-21 08:56:08 +00:00
github-actions[bot]
eda2bdfc7a
New Crowdin Translations (automated) ( #30383 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-21 08:48:36 +00:00
Renaud Chaput
ca5955ed76
[Glitch] Use a modern React context for identity in the app
...
Port a178ba7cd5
2024-05-20 12:53:52 +02:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange cop ( #30343 )
2024-05-20 09:37:36 +00: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
Joshua Byrd
6282b6da77
Fix og:image requests when html in a web page is over 1.megabyte ( #30362 )
2024-05-19 16:30:05 +00:00
Emelia Smith
2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications ( #29192 )
2024-05-17 13:46:12 +00:00
Claire
57fb2cf948
Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream
2024-05-17 12:33:41 +02:00
Jeong Arm
a627219b25
Fix moderation action logs ( #30342 )
2024-05-17 09:18:54 +00:00
Matt Jankowski
a6d12299f2
Remove duplicate method def ApplicationHelper#instance_presenter ( #30331 )
2024-05-17 08:29:13 +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
Matt Jankowski
65e82211cd
Rename cache_* methods to preload_* in controller concern ( #30209 )
2024-05-16 08:03:46 +00:00
Emelia Smith
f0d6dc4519
Fix: Mark redirect uris field in Development > Application form as required ( #30311 )
2024-05-16 07:59:46 +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
Matt Jankowski
c9ee1437c0
Use ruby language constants to build version string in software version dimension ( #30309 )
2024-05-16 07:43:35 +00:00
David Lapshin
94493cff92
Fix incorrect element selector from #30221 ( #30307 )
2024-05-16 07:33:29 +00:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
Jason Punyon
85c625d319
Fix repetitive database queries from #30040 ( #30259 )
2024-05-15 09:38:16 +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
40639510f8
Retain unconfirmed users longer (1 week) ( #30285 )
2024-05-15 08:27:34 +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
21c904b0f6
Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream
2024-05-07 20:30:17 +02:00
Claire
d8c4284723
Ensure custom favicon is converted to PNG and ICO ( #30208 )
2024-05-07 18:15:17 +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
96fb6e491f
Revert "Migrate paperclip _file_size columns to bigint ( #29263 )" ( #30203 )
2024-05-07 08:46:05 +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
Claire
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
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
Matt Jankowski
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
Fawaz Farid
05126d106f
Redirect back after site upload deletion ( #30141 )
2024-05-06 13:31:39 +00:00
Emelia Smith
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
Claire
30ef9fccf0
Fix hashtag matching pattern matching some link anchors ( #30190 )
2024-05-06 12:47:19 +00:00
Claire
8e4fea77e3
Fix race condition in POST /api/v1/push/subscription ( #30166 )
2024-05-06 12:41:14 +00:00
Claire
e5062b7135
Fix post deletion not being deferred when those are part of an account warning ( #30163 )
2024-05-06 09:52:34 +00: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
Tim Rogers
2f73e486b7
Switched HTMLEntities to the expanded flavor which supports a larger … ( #30173 )
2024-05-05 02:24:10 +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
Râu Cao
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
Claire
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
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
Matt Jankowski
88882fbbee
Move Rails/HABTM cop out of todo ( #30118 )
2024-05-02 09:40:05 +00:00
Matt Jankowski
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
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
Claire
df933836ca
[Glitch] Fix incorrect label for filtered notifications badge
...
Port 66ee0d4a1f
2024-05-01 19:18:06 +02:00
Claire
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
Claire
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
renovate[bot]
ac5113d524
[Glitch] Update eslint (non-major)
...
Port 37d984b8bf
2024-05-01 19:04:59 +02:00
Claire
e76ddf79bc
[Glitch] Add / keyboard shortcut to focus the search field
...
Port c386c36866
2024-05-01 18:57:39 +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
Renaud Chaput
2d43547934
[Glitch] Fix webpack warnings due to unhandled extensions (LICENCE and README.md)
...
Port 730e2127e1
2024-05-01 18:43:37 +02:00
Claire
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
Claire
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
Michael Stanclift
3739dda2f6
[Glitch] Add purple border to active compose field search inputs
...
Port 1c87cb8019
2024-05-01 17:31:39 +02:00
Claire
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
nicolas
41c43168fb
[Glitch] Makes the star icon rotate around its actual centre axis
...
Port c6da3ee828
2024-05-01 17:27:59 +02:00
Michael Stanclift
b21322b406
[Glitch] Fix blue border on emoji/language search in Safari & Chrome
...
Port e284417349
2024-05-01 17:27:29 +02:00
Michael Stanclift
4543bb9384
[Glitch] Fix language and emoji search field background colors on light theme
...
Port 5d67247061
2024-05-01 17:27:10 +02:00
Claire
3503fe1865
Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream
2024-05-01 17:26:21 +02:00
Claire
46cc9141c9
[Glitch] Fix contrast in notification request badge
...
Port 0b9d4103cb
2024-05-01 17:23:07 +02:00
Claire
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
Renaud Chaput
87b9b23025
[Glitch] Use integers and not numbers in notification policy API counters
...
Port b4d991adaa
2024-05-01 17:12:57 +02:00
Renaud Chaput
c316852a65
[Glitch] Add API types for status and related objects
...
Port e47a3d00fe
2024-05-01 17:12:16 +02:00
Renaud Chaput
297c8c37b1
[Glitch] Fix Redux Middleware types
...
Port 07635228e2
2024-05-01 17:08:44 +02:00
Michael Stanclift
0f756eaed2
[Glitch] Fix search box color on light theme
...
Port fa9574086d
2024-05-01 17:08:05 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Michael Stanclift
3b1c8d56b2
[Glitch] Fix light theme header on mobile
...
Port 90eb4a5d01
2024-05-01 16:49:21 +02:00
Michael Stanclift
1783820acd
[Glitch] Fix background tint in single column light theme
...
Port 430da03160
2024-05-01 16:48:55 +02:00
Renaud Chaput
375bd52d97
[Glitch] Handle createAppAsyncThunk rejected actions in the errors middleware
...
Port 69e5771881
2024-05-01 16:48:27 +02:00
Claire
7f404fd635
Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream
2024-05-01 16:47:25 +02:00
Renaud Chaput
b3d5567bd0
[Glitch] Remove global boosts state and convert boosts modal to Typescript
...
Port 67442f9039
2024-05-01 16:42:20 +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
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
Renaud Chaput
cc720cd38f
[Glitch] Fix <RelativeTimestamp> types
...
Port 961bb84e4c
2024-05-01 15:56:37 +02:00
Renaud Chaput
0ab212f6a9
[Glitch] Fix props for <Button>
...
Port d088964761
2024-05-01 15:56:37 +02:00
Renaud Chaput
02f9ce9ce3
[Glitch] Fix PropTypes for some record objects
...
Port f2fd1da23f
2024-05-01 15:56:37 +02:00
Claire
5cb4adbf4e
[Glitch] Fix language picker and privacy picker not having a backdrop filter
...
Port c913e2f3e5
2024-05-01 15:56:37 +02:00
Renaud Chaput
555f45f249
[Glitch] Fix notifications marker fetch
...
Port b9982ce578
2024-05-01 15:56:37 +02:00
Renaud Chaput
371c5e59eb
[Glitch] Rewrite PIP state in Typescript
...
Port 9fbe8d3a0c
2024-05-01 15:56:37 +02:00
Renaud Chaput
059e10e546
[Glitch] Rewrite markers reducer in Typescript
...
Port 27d014a7fa
2024-05-01 14:55:03 +02:00
Claire
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
Claire
03af271d3d
[Glitch] Fix column borders disappearing in advanced interface on low width viewports
...
Port b2d841ce9a
2024-05-01 14:32:29 +02:00
Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Renaud Chaput
d63c0a2879
[Glitch] Support "system" theme setting (light/dark theme depending on user system preference)
...
Port 02ea161506
2024-05-01 14:25:51 +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
26e10aa203
Change width breakpoint for mobile placement behavior ( #30131 )
2024-04-30 23:39:28 +00:00
Claire
d6048d3a6c
Add compatibility app/javascript/flavours/glitch/styles/index.scss
2024-04-30 21:27:04 +02:00
Claire
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
github-actions[bot]
56821ed879
New Crowdin Translations (automated) ( #30128 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-30 09:05:53 +00:00
Emelia Smith
81f0002e76
Fix missing destory audit logs for Domain Allows ( #30125 )
2024-04-30 08:48:02 +00:00
