Claire
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
Claire
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
Claire
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
Christian Schmidt
1c86cabf4b
[Glitch] Remove redundant ready() wrapper
...
Port fa6b30b2f9
2023-08-24 20:35:22 +02:00
Claire
481a54ffdf
Merge commit 'fa6b30b2f9bd6cc12ec0a0278d27d748091208cd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream refactored slightly (but touching almost all the lines in the code),
glitch-soc had moved a few of the code to another file.
Refactored as upstream did.
2023-08-24 20:34:14 +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
2ed1a1c7e5
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port a19ce425ef
2023-08-22 18:54:22 +02:00
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
0b50d6b662
[Glitch] Fix unfollow icon styling in advanced column
...
Port bd7f631918
2023-08-22 18:48:23 +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
523ec5b349
Remove leftover .orig files that were mistakenly included ( #2379 )
2023-08-22 18:24:03 +02:00
Nick Schonning
7f1b52c55f
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
Claire
38ec8071fa
Fix layout of the closed registrations modal ( #26593 )
2023-08-22 09:11:59 +02:00
mogaminsk
8c78a128e1
[Glitch] Fix "Create Account" button in interaction modal
...
Port 10651d8b8a
2023-08-21 21:08:56 +02:00
Claire
ccf5f88e43
Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
Renaud Chaput
d13a03e830
Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )
2023-08-21 19:39:01 +02:00
Claire
0ce3130ef8
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
2023-08-21 16:50:22 +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
5458629e60
Refactor Api::V1::ProfilesController into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
Daniel M Brasil
89d2b28e0b
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-21 08:44:35 +02:00
Christian Schmidt
330f7e5e7e
Fix profile picture preview ( #26538 )
2023-08-18 18:24:32 +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
Christian Schmidt
fa6b30b2f9
Remove redundant ready() wrapper ( #26533 )
2023-08-18 12:06:08 +02:00
Nicolai Søborg
e4db4df28b
Fix frame_rate for videos where ffprobe reports 0/0 ( #26500 )
2023-08-18 08:32:47 +02:00
Renaud Chaput
f4a6879caf
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
2023-08-18 08:18:40 +02:00
Claire
2e66d2562c
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
Claire
5904d363b9
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
2023-08-17 12:49:52 +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
805e0eff77
Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )
2023-08-16 11:47:59 +02:00
Santiago Kozak
030dd2c9de
Fix hashtag bar display when status is in a thread ( #26497 )
2023-08-16 09:06:04 +02:00
Claire
321e7aa07f
Add display of out-of-band hashtags in the web interface ( #26492 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 23:42:30 +02:00
Claire
bd7f631918
Fix unfollow icon styling in advanced column ( #26482 )
2023-08-14 19:02:47 +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
6c6f3c9148
Add ES_PRESET option to customize numbers of shards and replicas ( #26483 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 17:46:16 +02:00
github-actions[bot]
30f84f10b1
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-14 14:54:31 +02:00
mogaminsk
10651d8b8a
Fix "Create Account" button in interaction modal ( #26459 )
2023-08-14 12:04:04 +02:00
Claire
c6ec56e0b2
[Glitch] Fix reply not preserving the language from the replied-to post
...
Port a9219018a7
2023-08-13 19:24:50 +02:00
Claire
436d049fa8
Merge commit '60438e609795bbd99bf38adb739d46155de8daa3' into glitch-soc/merge-upstream
2023-08-13 19:23:22 +02:00
Claire
fa3a993c54
[Glitch] Change the hashtag column to not display the hashtag header on pinned columns
...
Port f08d97c0c2
2023-08-13 19:13:11 +02:00
Claire
f19168ec19
[Glitch] Fix interaction modal layout
...
Port cae84de47b
2023-08-13 19:12:42 +02:00
Eugen Rochko
b4dcac1315
[Glitch] Change header of hashtag timelines in web UI
...
Port 2ddf268e73
2023-08-13 19:11:52 +02:00
Claire
03858547bd
[Glitch] Fix report modal secondary buttons style
...
Port 1037c413cf
2023-08-13 19:08:08 +02:00
Claire
9d885a93fc
[Glitch] Fix confirmation when closing media edition modal with unsaved changes
...
Port aac7e9fd9d
2023-08-13 19:06:02 +02:00
Trevor Wolf
9d80be79a2
[Glitch] Fix light theme select option for hashtags
...
Port 395dc4524f
2023-08-13 19:05:24 +02:00
Eugen Rochko
3037873bbc
[Glitch] Change design of hidden media overlay (again) in web UI
...
Port 6ff571563c
2023-08-13 19:04:07 +02:00
Eugen Rochko
254da0e834
[Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI
...
Port 1a2f3b8a9b
2023-08-13 19:02:17 +02:00
CSDUMMI
a86876f676
[Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
...
Port 1ebdd46242
2023-08-13 19:00:25 +02:00
