丈槍由紀
60a3ad4916
Fix formatting of the filtering settings
2024-02-17 18:55:57 +01:00
丈槍由紀
d9eb7ee676
Add Reject Pattern to Other Page on GlitchSoc
2024-02-17 18:55:57 +01:00
noellabo
5255bd08e0
Add reject pattern to Admin setting (Ported to Glitch Soc)
...
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
2024-02-17 18:55:57 +01:00
Jeremy Kescher
e60d3df9bb
Merge branch 'glitch-soc' into develop
2024-02-17 18:53:31 +01:00
Claire
d86b642dc6
Fix dead and misapplied CSS ( #2627 )
2024-02-17 18:52:59 +01:00
Claire
41c85e3b6d
Change list title input design to fit upstream ( #2626 )
...
* Change settings input field design to match upstream's
* Fix light theme discrepancies
* Restore regexp inputs as glitch-soc-specific styles
2024-02-17 18:52:37 +01:00
Jeremy Kescher
05a5c20681
Merge branch 'glitch-soc' into develop
2024-02-17 18:16:14 +01:00
Claire
5c0a64a975
Merge pull request #2625 from ClearlyClaire/glitch-soc/ports/copy-button-on-profile
...
Add prominent share/copy button on profiles in web UI
2024-02-17 09:39:46 +01:00
Claire
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
2024-02-16 18:18:17 +01:00
Eugen Rochko
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
2024-02-16 18:17:55 +01:00
Claire
c0279385d7
Adopt upstream's design for account profiles ( #2622 )
...
* Mostly adopt upstream's design for account profiles
* Reduce some margins
2024-02-16 17:57:43 +01:00
Jeremy Kescher
e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR
2024-02-16 15:12:22 +01:00
Jeremy Kescher
55aef6a70c
Fix scss styles being in an old state
2024-02-16 15:03:21 +01:00
Jeremy Kescher
6d6a5561f8
Catstodon rev reset due to upstream version bump
2024-02-16 14:49:21 +01:00
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
2024-02-16 14:48:08 +01:00
Claire
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
2024-02-16 12:17:15 +01:00
Claire
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
renovate[bot]
63080e10a9
Update dependency pg to v1.5.5 ( #29230 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-16 10:06:25 +01:00
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
Jeremy Kescher
f044841a6e
Catstodon rev +1.0.18
2024-02-14 18:03:42 +01:00
Jeremy Kescher
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
2024-02-14 18:02:38 +01:00
Claire
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
Claire
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
2024-02-14 15:26:18 +01:00
Claire
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
Emelia Smith
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
Claire
3c3ef8b9d3
Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default ( #29199 )
2024-02-14 13:42:15 +01:00
Emelia Smith
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
Emelia Smith
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
renovate[bot]
7100106f3f
Update dependency sidekiq-unique-jobs to v7.1.33 ( #29175 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
04da8f887b
Update dependency pghero to v3.4.1 ( #29144 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
d9d0a6ef33
Update dependency irb to v1.11.2 ( #29135 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
renovate[bot]
93b365bfc0
Update dependency webmock to v3.20.0 ( #29120 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 20:03:00 +01:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
Claire
084d051e6c
Merge pull request #2608 from ClearlyClaire/glitch-soc/refactor/monolithic-components-css
...
Merge SCSS in a single `components.scss` file
2024-02-12 22:18:55 +01:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
Jeremy Kescher
924912bf9b
Catstodon rev +1.0.17
2024-02-11 17:26:45 +01:00
Essem
4cbaf46950
Hydrate reactions on streaming API
2024-02-11 17:25:53 +01:00
Essem
d61b323c84
Purge status reactions on account delete
2024-02-09 17:57:22 +01:00
Claire
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
Claire
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
Claire
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
Claire
189b70cd6a
Merge SCSS in a single components.scss file
2024-02-08 18:50:38 +01:00
Jeremy Kescher
e4a333c6ae
Adjust initial_state_serializer to state of updated emoji reactions PR
2024-02-07 16:46:08 +01:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
Claire
8c76a208ed
Merge pull request #2607 from ClearlyClaire/glitch-soc/cherry-pick-upstream
...
Cherry-pick upstream changes
2024-02-06 21:56:01 +01:00
Eugen Rochko
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-06 21:00:33 +01:00
Claire
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 21:00:09 +01:00
renovate[bot]
5ea36a3606
Update dependency brakeman to v6.1.2 ( #29062 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
renovate[bot]
b27cad27c2
Update dependency bootsnap to '~> 1.18.0' ( #29019 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
renovate[bot]
63f1f1465a
Update dependency tzinfo-data to v1.2024.1 ( #29052 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 20:59:51 +01:00
