kouhai dev
7c7355a964
th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed)
2023-08-26 22:00:56 -07:00
d033fab0ed
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-26 22:53:46 +02:00
9bc91160b2
[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
...
Port b63ddc70d6
2023-08-24 22:00:27 +02:00
a7a9e2854d
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port 6db702fa24
2023-08-24 22:00:00 +02:00
592a675a33
Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
2023-08-24 21:56:00 +02:00
6f5721e5c9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port b271c3da75
2023-08-24 21:51:13 +02:00
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
63ba01fb2d
[Glitch] Fix some React warnings
...
Port 6a4160cb5f
2023-08-24 21:49:26 +02:00
2a8e55b0ee
Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
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
a4f3a67bd8
Change admin e-mail notification settins to be their own settings group ( #26596 )
2023-08-24 14:43:00 +02:00
b63ddc70d6
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )
...
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
2023-08-24 14:10:48 +02:00
6db702fa24
Fix selecting domains to forward reports to not passing the information correctly ( #26636 )
2023-08-24 14:06:27 +02:00
5e0894ff13
Consolidate inclusion of `admin` js pack link ( #26628 )
2023-08-24 09:56:23 +02:00
b271c3da75
Change opacity of the delete icon in the search field to be more visible ( #26449 )
2023-08-23 15:51:07 +02:00
2e58f75da6
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
2023-08-23 15:50:23 +02:00
77280a5b1d
Change hashtag bar tags to be de-emphasized ( #26606 )
2023-08-23 15:44:52 +02:00
6a4160cb5f
Fix some React warnings ( #26609 )
2023-08-23 15:43:41 +02:00
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
dca16db19d
Update Account Search to prioritize username over display name ( #26623 )
2023-08-23 15:40:09 +02:00
a4bc8b58f9
Add support for federating `memorial` attribute ( #26583 )
2023-08-23 08:27:24 +02:00
585e53784e
Better hashtag normalization when processing a post ( #26614 )
2023-08-23 08:18:07 +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
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
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
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
kouhai dev
github-actions[bot]