Claire
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Eugen Rochko
3bb91e79f0
Change score half-life for trending posts from 2 hours to 1 hour ( #26915 )
2023-09-14 09:20:14 +02:00
Robert R George
6fb81e40fd
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
Claire
d45dd56874
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
aaa4b77b04
Simplify Account.by_recent_status and Account.by_recent_sign_in scopes ( #26840 )
2023-09-07 15:38:11 +02:00
Colette Kerr
e8427d32cb
Change DCT method used for JPEG encoding to float ( #26675 )
2023-09-07 05:26:25 +02:00
Claire
bd83df7fd1
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
3582239913
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-05 20:34:17 +02:00
Claire
96f51d6c1f
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
2023-09-05 15:37:23 +02:00
Claire
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
63969b15b3
Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
432bd89f72
Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
d38116d584
Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
1ef0758cf0
Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Claire
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
ed5d57dac3
Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Eugen Rochko
1b7b338d0a
Fix some video encoding failing due to uneven dimensions ( #26766 )
2023-09-02 09:02:44 +02:00
Claire
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
7d3930a520
Add authorized_fetch server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +02:00
Eugen Rochko
703178c117
Fix videos not playing in some browsers due to unsupported color space ( #26745 )
2023-08-31 17:21:06 +02:00
Claire
e5da7a6c53
Change private statuses index to index without crutches ( #26713 )
2023-08-29 17:51:13 +02:00
Eugen Rochko
92c9bf731d
Change video compression parameters ( #26631 )
2023-08-28 19:40:08 +02:00
Claire
c46d297740
Fix incorrect call to PublicStatusesIndex.import ( #26697 )
2023-08-28 15:04:57 +02:00
Eugen Rochko
4456f65da4
Fix unnecessary condition causing seqscan when indexing ( #26689 )
2023-08-27 22:37:35 +02:00
Claire
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Claire
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
jsgoldstein
e82d84469e
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 16:40:04 +02:00
Daniel M Brasil
2e58f75da6
Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public ( #26239 )
2023-08-23 15:50:23 +02:00
Claire
4e353aa9be
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
2023-08-22 19:50:37 +02:00
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
b6ca020d02
Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' 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.
2023-08-22 18:31:28 +02:00
Claire
b8ca46f568
Add auto-refresh of accounts we get new messages/edits of ( #26510 )
2023-08-21 16:09:26 +02:00
Claire
b4a95b46cd
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-18 18:20:55 +02:00
Claire
2e66d2562c
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
Claire
4b4228c0cd
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach ( #26508 )
2023-08-17 09:13:26 +02:00
Claire
a19ce425ef
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire
3c50a91087
Add support for indexable attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Claire
738b024d0c
Add privacy tab in profile settings ( #26484 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:52:45 +02:00
Claire
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
Claire
32faa7213f
Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Claire
dd4eab6536
Change DB_REPLICA_* environment variables to REPLICA_DB_* ( #26386 )
2023-08-08 13:59:40 +02:00
Claire
38c3530cd7
Fix missing cached preview cards attributes ( #26343 )
2023-08-04 16:13:47 +02:00
Claire
a62fed3220
Fix incorrect model annotation for List#exclusive ( #26313 )
2023-08-04 09:00:31 +02:00
Claire
aa0777aefc
Rename “read” database to “replica” for consistency ( #26326 )
2023-08-03 16:17:09 +02:00
Christian Schmidt
ecb00fa5ac
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Christian Schmidt
8674743cc0
Fix AVIF attachments ( #26264 )
2023-08-01 19:34:11 +02:00