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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-05-16 19:34:50 +02:00
David Lapshin
061464a563
[Glitch] Fix incorrect element selector from #30221
...
Port 94493cff92
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-05-14 20:53:40 +02:00
David Lapshin
160823716a
[Glitch] Add active animation to header settings button
...
Port cb93c1edf0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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