784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
1 year ago
4885232358
Add users index on unconfirmed_email ( #25672 )
1 year ago
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
1 year ago
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
1 year ago
843448c7d9
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
1 year ago
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
1 year ago
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
1 year ago
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
1 year ago
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
1 year ago
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
1 year ago
498e3231b6
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
1 year ago
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
1 year ago
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
1 year ago
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
1 year ago
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
1 year ago
989a8758e3
Change edit profile page ( #25413 )
1 year ago
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
1 year ago
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
1 year ago
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
1 year ago
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
1 year ago
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
1dd243cc09
Add time zone preference ( #25342 )
1 year ago
8b5680fd9a
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
6debddcf89
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
a04157e69f
Add `allow_other_host: true` to backups controller ( #25266 )
1 year ago
572086c8ad
Add support for importing lists ( #25203 )
1 year ago
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
3d550b5712
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
1 year ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
1 year ago
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
1 year ago
b55d56387b
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port 86961b5b7b
1 year ago
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
1 year ago
11368da545
Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
1 year ago
31fe0780bf
Change captcha to be presented even for invited users ( #2227 )
1 year ago
4e8d882274
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
1 year ago
0b4d3bf363
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
1 year ago
6e38ffcaee
Fix uncaught TypeError in POST `/api/v1/featured_tags` ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
5009e9aed5
Fix uncaught NoMethodError in POST `/api/v1/featured_tags` ( #25063 )
1 year ago
da9237adb5
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
1 year ago
4d07793150
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
1 year ago
9cf831be0b
Order sessions by most-recent to least-recently updated ( #25005 )
1 year ago
Claire
Daniel M Brasil
Vivianne
Matt Jankowski
Eugen Rochko
Darius Kazemi
Frankie Roberto