40ee4d55df
Merge commit 'd67c1089643a25ab617c51a0cd3787eb0d7831b7' into glitch-soc/merge-upstream
2023-08-24 21:38:59 +02:00
7c2c2918ac
[Glitch] Fix layout of the closed registrations modal
...
Port 38ec8071fa
2023-08-24 21:38:08 +02:00
2e8f2a18f9
[Glitch] Fix profile picture preview
...
Port SCSS changes from 330f7e5e7e
2023-08-24 21:36:42 +02:00
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
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
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
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
1c86cabf4b
[Glitch] Remove redundant ready() wrapper
...
Port fa6b30b2f9
2023-08-24 20:35:22 +02:00
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
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
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
2ed1a1c7e5
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port a19ce425ef
2023-08-22 18:54:22 +02:00
d67c108964
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` ( #26605 )
2023-08-22 18:51:32 +02:00
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
0b50d6b662
[Glitch] Fix unfollow icon styling in advanced column
...
Port bd7f631918
2023-08-22 18:48:23 +02:00
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
523ec5b349
Remove leftover `.orig` files that were mistakenly included ( #2379 )
2023-08-22 18:24:03 +02:00
3adf76ce89
Add Kalmyk to languages dropdown ( #26013 )
2023-08-22 17:50:04 +02:00
284f99b924
Add cherokee to languages dropdown ( #26012 )
2023-08-22 16:53:27 +02:00
b085dcc921
Update dependency mime-types to v3.5.1 ( #26595 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-22 16:47:40 +02:00
191acb2185
Update `SECURITY.md` to indicate issues can be reported on Github ( #26599 )
2023-08-22 16:47:19 +02:00
78aecc7444
Add `circular-dependency-plugin` to detect any circular deps issues ( #26600 )
2023-08-22 13:24:16 +02:00
0fc2bb4076
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 89b675cb07
2023-08-22 12:55:19 +02:00
7f1b52c55f
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
38ec8071fa
Fix layout of the closed registrations modal ( #26593 )
2023-08-22 09:11:59 +02:00
8c78a128e1
[Glitch] Fix "Create Account" button in interaction modal
...
Port 10651d8b8a
2023-08-21 21:08:56 +02:00
ccf5f88e43
Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
d4eef922aa
Bump version to v4.2.0-beta2 ( #26579 )
2023-08-21 20:18:49 +02:00
d13a03e830
Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )
2023-08-21 19:39:01 +02:00
0ce3130ef8
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
2023-08-21 16:50:22 +02:00
b8ca46f568
Add auto-refresh of accounts we get new messages/edits of ( #26510 )
2023-08-21 16:09:26 +02:00
5458629e60
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
d38310bed2
Update eslint (non-major) ( #26567 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-21 10:13:21 +02:00
a1aaba08a7
Update dependency core-js to v3.32.1 ( #26548 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-21 09:06:33 +02:00
6437d0168f
Do not start LibreTranslate and Elasticsearch on GitHub Codespaces ( #26382 )
2023-08-21 08:51:37 +02:00
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
330f7e5e7e
Fix profile picture preview ( #26538 )
2023-08-18 18:24:32 +02:00
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
f37cc8c15b
Fix already initialized constant warning ( #26542 )
2023-08-18 16:06:46 +02:00
c2ef995baa
Fix: support both DATABASE_URL and DB_PASS ( #26295 )
2023-08-18 15:05:35 +02:00
fa6b30b2f9
Remove redundant ready() wrapper ( #26533 )
2023-08-18 12:06:08 +02:00
8f40a96f28
Update dependency @material-design-icons/svg to v0.14.11 ( #26536 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-18 11:10:05 +02:00
408991045b
Update dependency puma to v6.3.1 ( #26537 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-18 08:33:33 +02:00
e4db4df28b
Fix `frame_rate` for videos where `ffprobe` reports 0/0 ( #26500 )
2023-08-18 08:32:47 +02:00
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
5dcf08d912
Update dependency pg to v8.11.3 ( #26519 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-17 16:43:37 +02:00
2e66d2562c
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
5904d363b9
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
2023-08-17 12:49:52 +02:00
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
a19ce425ef
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire