Commit graph

39755 commits

Author SHA1 Message Date
renovate[bot]
deccd70910 Update dependency redis to v4.6.8 (#26630)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:59:13 +02:00
Matt Jankowski
9974163776
Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
Matt Jankowski
5e0894ff13 Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
renovate[bot]
e3fd071973
Update dependency rspec-sidekiq to v4 (#26627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:03:40 +02:00
renovate[bot]
87a88eefa8 Update dependency rspec-sidekiq to v4 (#26627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:03:40 +02:00
Claire
8eb09466aa
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 1cb978bcc3
2023-08-23 16:56:19 +02:00
Claire
972c8ab3de Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 8f40a96f28
2023-08-23 16:56:19 +02:00
Antonin Del Fabbro
9a8190da4a
Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Antonin Del Fabbro
b271c3da75 Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Daniel M Brasil
f337008819
Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public (#26239) 2023-08-23 15:50:23 +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
jsgoldstein
b91724fb9d
Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
jsgoldstein
032dfdfb70 Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
renovate[bot]
34f5b90dc7
Update dependency sass to v1.66.1 (#26534)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:56 +02:00
renovate[bot]
d0181fc9e6 Update dependency sass to v1.66.1 (#26534)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:56 +02:00
renovate[bot]
060b554a9d
Update dependency oj to v3.16.0 (#26520)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:38 +02:00
renovate[bot]
97b2bf351d Update dependency oj to v3.16.0 (#26520)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:38 +02:00
renovate[bot]
de8c2427a5
Update dependency immutable to v4.3.3 (#26622)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:21 +02:00
renovate[bot]
f6ce219c9d Update dependency immutable to v4.3.3 (#26622)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:21 +02:00
Claire
613cfd625c
Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Claire
77280a5b1d Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt
152b10b624
Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Christian Schmidt
6a4160cb5f Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput
44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
Renaud Chaput
3fa794b94b Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
jsgoldstein
85057865b4
Update Account Search to prioritize username over display name (#26623) 2023-08-23 15:40:09 +02:00
jsgoldstein
dca16db19d Update Account Search to prioritize username over display name (#26623) 2023-08-23 15:40:09 +02:00
yufushiro
3aac12981c
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-23 08:44:56 +02:00
yufushiro
09dbff98df Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-23 08:44:56 +02:00
Robert R George
cf6f70799b
Add support for federating memorial attribute (#26583) 2023-08-23 08:27:24 +02:00
Robert R George
a4bc8b58f9 Add support for federating memorial attribute (#26583) 2023-08-23 08:27:24 +02:00
renovate[bot]
ea1a221e2d
Update dependency react-textarea-autosize to v8.5.3 (#26607)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 08:26:30 +02:00
renovate[bot]
7c4e4be3c6 Update dependency react-textarea-autosize to v8.5.3 (#26607)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 08:26:30 +02:00
renovate[bot]
74b8b8ea14
Update dependency rails to v7.0.7.2 (#26612)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 08:22:48 +02:00
renovate[bot]
f0f912e274 Update dependency rails to v7.0.7.2 (#26612)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 08:22:48 +02:00
Renaud Chaput
58acaa9ae6
Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Renaud Chaput
585e53784e Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Claire
452f15be78 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
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
c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:54:22 +02:00
Claire
2ed1a1c7e5 [Glitch] Fix “legal” report category not showing up in moderation interface
Port a19ce425ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:54:22 +02:00
Claire
bd023a2637
Fix admin dashboard check when using Elasticsearch with ES_PREFIX (#26605) 2023-08-22 18:51:32 +02:00
Claire
d67c108964 Fix admin dashboard check when using Elasticsearch with ES_PREFIX (#26605) 2023-08-22 18:51:32 +02:00
Claire
10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire
c52397dea3 Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire
245fe855be [Glitch] Fix unfollow icon styling in advanced column
Port d9c21293aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:48:23 +02:00
Claire
0b50d6b662 [Glitch] Fix unfollow icon styling in advanced column
Port bd7f631918 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:48:23 +02:00
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.
2023-08-22 18:31:28 +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
128daefc7a
Remove leftover .orig files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00