44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
4fe2d7cb59
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
155fc459e3
Fixing an issue with a missing argument ( #2261 )
...
undefined
1 year ago
683ba5ecb1
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
1 year ago
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' 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
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
1 year ago
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
1 year ago
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
1 year ago
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
1 year ago
b9bc9d0bda
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
1 year ago
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' 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
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
1 year ago
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
1 year ago
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
1 year ago
bca649ba79
Change edit profile page ( #25413 )
1 year ago
39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
1 year ago
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
1 year ago
42a0898f16
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' 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
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' 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
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' 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
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' 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
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' 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
4c9406bdb0
Add time zone preference ( #25342 )
1 year ago
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
bacb674921
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
0daf78f903
Add `allow_other_host: true` to backups controller ( #25266 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2 years ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2 years ago
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
2 years ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2 years ago
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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.
2 years ago
646cde71d1
Change captcha to be presented even for invited users ( #2227 )
2 years ago
9017df7178
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2 years ago
fea0830614
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2 years ago
785e650ab4
Fix uncaught TypeError in POST `/api/v1/featured_tags` ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
45d98959ac
Fix uncaught NoMethodError in POST `/api/v1/featured_tags` ( #25063 )
2 years ago
e13d2edd47
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2 years ago
ce8b5899ae
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
2 years ago
36a77748b4
Order sessions by most-recent to least-recently updated ( #25005 )
2 years ago
45ba9ada34
Fix race condition when reblogging a status ( #25016 )
2 years ago
bec6a1cad4
Add hCaptcha support ( #25019 )
2 years ago
e60414792d
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2 years ago
433ab0c9a3
Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
Daniel M Brasil
Vivianne
Matt Jankowski
Eugen Rochko
Darius Kazemi
Frankie Roberto