Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
4 months ago
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
4 months ago
Eugen Rochko
5b1eb09d54
Add annual reports for accounts ( #28693 )
4 months ago
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
4 months ago
Claire
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
4 months ago
Claire
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
4 months ago
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 months ago
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
5 months ago
Essem
6ae86f40d1
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
5 months ago
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
5 months ago
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
5 months ago
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
5 months ago
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
6 months ago
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
8 months ago
Claire
81caafbe84
Fix performances of profile directory ( #26842 )
8 months ago
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
9 months ago
Claire
cddef4c485
Fix language settings for users having selected the `kmr` language ( #26787 )
9 months ago
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
9 months ago
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
9 months ago
Claire
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
9 months ago
Claire
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
9 months ago
Claire
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
9 months ago
Claire
ee702e36e5
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
9 months ago
Claire
90ec88d58b
Add support for `indexable` attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
9 months ago
Claire
8c7f3c5332
Remove old non-unique index on preview_cards statuses join table ( #26447 )
9 months ago
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
9 months ago
Claire
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
9 months ago
Christian Schmidt
8da99ffb0d
Add alt text for preview card thumbnails ( #26184 )
10 months ago
Claire
6b896b20cc
Add primary key to preview_cards_statuses join table (includes deduplication migration) ( #25243 )
10 months ago
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
10 months ago
Eugen Rochko
7bd8ef355c
Add `published_at` attribute to preview cards ( #26153 )
10 months ago
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
10 months ago
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
10 months ago
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
Claire
e6a8faae81
Add users index on unconfirmed_email ( #25672 )
11 months ago
Claire
933ba1a3eb
Add superapp index on `oauth_applications` ( #25670 )
11 months ago
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
Eugen Rochko
ba06a2f104
Revert "Rails 7 update" ( #25667 )
11 months ago
Matt Jankowski
50c2a03695
Rails 7 update ( #24241 )
11 months ago
Matt Jankowski
c47cdf6e17
Add index to backups on `user_id` column ( #25647 )
11 months ago
Claire
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.
11 months ago
Claire
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.
11 months ago
Claire
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.
11 months ago
Claire
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
11 months ago
Eugen Rochko
4c9406bdb0
Add time zone preference ( #25342 )
11 months ago
Claire
f378f10404
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
12 months ago
Eugen Rochko
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Darius Kazemi
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>
12 months ago
Claire
fe84f7e323
Add missing primary keys to `accounts_tags` and `statuses_tags` ( #25210 )
12 months ago
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
12 months ago