d65aa507ca
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
2023-08-24 21:38:59 +02:00
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
2023-08-24 21:38:08 +02:00
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
2023-08-24 21:36:42 +02:00
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' 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
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' 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
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
2023-08-24 20:35:22 +02:00
7b09f585fa
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' 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
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
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
c053bfc45a
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port 0446394465
2023-08-22 18:54:22 +02:00
bd023a2637
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` ( #26605 )
2023-08-22 18:51:32 +02:00
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
245fe855be
[Glitch] Fix unfollow icon styling in advanced column
...
Port d9c21293aa
2023-08-22 18:48:23 +02:00
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
128daefc7a
Remove leftover `.orig` files that were mistakenly included ( #2379 )
2023-08-22 18:24:03 +02:00
25dc01660d
Add Kalmyk to languages dropdown ( #26013 )
2023-08-22 17:50:04 +02:00
c01ecd0879
Add cherokee to languages dropdown ( #26012 )
2023-08-22 16:53:27 +02:00
dc09c10fa8
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
3249c06c73
Update `SECURITY.md` to indicate issues can be reported on Github ( #26599 )
2023-08-22 16:47:19 +02:00
bb2db2aec0
Add `circular-dependency-plugin` to detect any circular deps issues ( #26600 )
2023-08-22 13:24:16 +02:00
4f1d22628d
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3a8370e1f4
2023-08-22 12:55:19 +02:00
b970ed6098
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
fe31571965
Fix layout of the closed registrations modal ( #26593 )
2023-08-22 09:11:59 +02:00
724d773844
[Glitch] Fix "Create Account" button in interaction modal
...
Port a664e15702
2023-08-21 21:08:56 +02:00
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
facfec1ba3
Bump version to v4.2.0-beta2 ( #26579 )
2023-08-21 20:18:49 +02:00
061fd66ee6
Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )
2023-08-21 19:39:01 +02:00
ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
2023-08-21 16:50:22 +02:00
9ed0c91a37
Add auto-refresh of accounts we get new messages/edits of ( #26510 )
2023-08-21 16:09:26 +02:00
191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
1cdcd9dc08
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
d3b4422b94
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
872fe2d62d
Do not start LibreTranslate and Elasticsearch on GitHub Codespaces ( #26382 )
2023-08-21 08:51:37 +02:00
d24a87ce4f
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
bb23116e8d
Fix profile picture preview ( #26538 )
2023-08-18 18:24:32 +02:00
ee702e36e5
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
e7bea8f004
Fix already initialized constant warning ( #26542 )
2023-08-18 16:06:46 +02:00
6375e390af
Fix: support both DATABASE_URL and DB_PASS ( #26295 )
2023-08-18 15:05:35 +02:00
bb51c0676d
Remove redundant ready() wrapper ( #26533 )
2023-08-18 12:06:08 +02:00
1cb978bcc3
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
581ebf2bb5
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
13ffe91c81
Fix `frame_rate` for videos where `ffprobe` reports 0/0 ( #26500 )
2023-08-18 08:32:47 +02:00
b95867ad1f
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
b5acf13886
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
60b9fa641d
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
2023-08-17 12:49:52 +02:00
cc4560d95b
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
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire