7586d4348f
Switch glitch-soc to upstream's old composer
2024-02-22 22:10:17 +01:00
10a0d76bf0
Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different handling for
the character limit.
Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different limits for
option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
f25414014a
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 20:45:40 +01:00
b0822ae9cd
Fix auto-close email being sent to users with devops permissions instead of settings permissions ( #29355 )
2024-02-22 20:45:40 +01:00
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
d908ed8e86
Remove unused dependencies ( #29289 )
2024-02-22 20:45:40 +01:00
3dae23816b
Update dependency haml_lint to v0.57.0 ( #29181 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
d10848946c
Update dependency rails to v7.1.3.2 ( #29342 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
fec49022ed
Update dependency selenium-webdriver to v4.18.1 ( #29287 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
840ce1e0cb
Update dependency webmock to v3.21.2 ( #29290 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
7cd5866ddc
Update dependency doorkeeper to v5.6.9 ( #29196 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 20:45:40 +01:00
fff378177e
Further reduce differences with upstream (mainly private mention styling) ( #2641 )
...
* Use upstream's CSS for private mentions styling
* Further reduce differences with upstream
2024-02-22 18:45:54 +01:00
604c93332f
Fix pillbar button colors ( #2639 )
2024-02-21 19:30:54 +01:00
154a3119fb
Further reduce CSS differences with upstream ( #2638 )
2024-02-21 17:50:41 +01:00
bf6e57b420
Further reduce CSS and markup differences with upstream ( #2637 )
...
* Reduce differences in `MovedNote` markup and styling
* Remove unused setting toggle meta text support
* Fix various CSS discrepancies with upstream
* Further reduce differences with upstream
2024-02-20 23:06:17 +01:00
4ad7fadb82
Fix logging error in streaming server ( #2636 )
...
Logger changed upstream causing `log.silly` to error and crash the server for local only statuses
2024-02-20 20:19:58 +01:00
5f50b634cf
Further reduce CSS and markup differences with upstream ( #2635 )
...
* Further reduce CSS differences with upstream
* Reduce differences in markup and CSS with upstream
* Redo collapsible post notifications
* Reduce CSS differences further
* Reduce differences with upstream regarding `.status` and `.status__wrapper`
* Further reduce differences with upstream
* Reduce differences with upstream in DisplayName
2024-02-20 18:49:59 +01:00
0a2b95c4f5
Adopt upstream's design for preview cards ( #2634 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
2024-02-19 22:47:01 +01:00
89ea492d70
Further reduce CSS changes with upstream ( #2632 )
2024-02-19 19:54:51 +01:00
bbecf1c56b
Further reduce differences with upstream ( #2631 )
...
* Further reduce CSS diffs with upstream
* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
2024-02-18 22:30:20 +01:00
034be5ad50
Further reduce CSS differences with upstream ( #2630 )
2024-02-18 20:45:36 +01:00
9a11b077f7
Reduce CSS and markup differences with upstream ( #2629 )
2024-02-18 19:12:23 +01:00
e078ede097
Remove status content from mobile actions modal ( #2615 )
2024-02-18 19:10:58 +01:00
8a10feb8dc
[Glitch] Fix Web UI not displaying appropriate explanation when a user hides their follows/followers
...
Port 9b06c0f24a
2024-02-17 20:15:25 +01:00
d86b642dc6
Fix dead and misapplied CSS ( #2627 )
2024-02-17 18:52:59 +01:00
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
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
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
2024-02-16 18:18:17 +01:00
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
2024-02-16 18:17:55 +01:00
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
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
2024-02-16 12:17:15 +01:00
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
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
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
2024-02-14 15:26:18 +01:00
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
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
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
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
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
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
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
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
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
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
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
Claire