Jeremy Kescher
21a0804210
Add ability to disable the suspicious sign in detector
...
The CatCatNya~ production config has an IP retention period of one day. That will cause suspicious login emails to be sent out simply because we don't have any known IP data.
Therefore, add an option disabling it.
2024-05-23 01:16:55 +02:00
Jeremy Kescher
d1856ea48d
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2024-05-22 23:56:46 +02: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
Jeremy Kescher
16ce10a2bd
Apply changes from emoji reactions branch
2024-05-21 05:47:06 +02:00
Jeremy Kescher
47884616f7
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-05-21 00:46:17 +02:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02: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
Jeremy Kescher
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02: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
Jeremy Kescher
74ed5bf354
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-14 18:56:01 +02: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
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Chee Aun
f65a6d50f1
[Glitch] Fix typo
...
Port c36a8786c1
2024-05-11 22:44:41 +02:00
