Jeremy Kescher
78b0f1c6cb
Bump version
2024-02-24 14:06:52 +01:00
Jeremy Kescher
6e635a4283
Clarify English locale
2024-02-24 14:05:49 +01:00
Jeremy Kescher
9bdde6d6ea
Remove old, contradicting "develop" notice now that CatCatNya~ is running on main, and all forks should only ever be based on main
2024-02-24 14:01:37 +01:00
Jeremy Kescher
c3adcec8fb
Fix profile fields styling in Oatstodon flavor
2024-02-24 11:41:15 +01:00
Jeremy Kescher
206de12616
Bump Catstodon version
2024-02-24 11:17:01 +01:00
Essem
a39c911251
Fix newline split
2024-02-24 11:14:32 +01:00
Essem
eda4ee9136
Remove duplicate "others" settings page
2024-02-24 11:14:32 +01:00
丈槍由紀
026da980e7
Fix blurhash for GlitchSoc
2024-02-24 11:14:32 +01:00
noellabo
d518f06eae
Add reject blurhash to Admin setting
2024-02-24 11:14:32 +01:00
noellabo
833b6e40b8
Add reject pattern to Admin setting
2024-02-24 11:14:31 +01:00
丈槍由紀
e9f439a625
Enable rejection of Create Activities if the status includes unusable hashtags
2024-02-24 11:14:31 +01:00
Jeremy Kescher
a4e12a484d
Merge branch 'glitch-soc' into develop
2024-02-24 11:11:24 +01:00
Jeremy Kescher
004b22602b
Merge branch 'emoji-reactions-base' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/styles/components.scss
2024-02-24 11:08:13 +01:00
Claire
f25414014a
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 20:45:40 +01:00
Claire
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
Claire
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
Wojciech Maj
d908ed8e86
Remove unused dependencies ( #29289 )
2024-02-22 20:45:40 +01:00
renovate[bot]
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
renovate[bot]
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
renovate[bot]
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
renovate[bot]
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
renovate[bot]
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
Claire
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
Claire
604c93332f
Fix pillbar button colors ( #2639 )
2024-02-21 19:30:54 +01:00
Claire
154a3119fb
Further reduce CSS differences with upstream ( #2638 )
2024-02-21 17:50:41 +01:00
Claire
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
Emelia Smith
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
Claire
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
Claire
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
Claire
89ea492d70
Further reduce CSS changes with upstream ( #2632 )
2024-02-19 19:54:51 +01:00
Claire
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
Claire
034be5ad50
Further reduce CSS differences with upstream ( #2630 )
2024-02-18 20:45:36 +01:00
Claire
9a11b077f7
Reduce CSS and markup differences with upstream ( #2629 )
2024-02-18 19:12:23 +01:00
Danko Aleksejevs
e078ede097
Remove status content from mobile actions modal ( #2615 )
2024-02-18 19:10:58 +01:00
Claire
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
Jeremy Kescher
c2721d5129
Bump Catstodon revision to 1.0.2
2024-02-17 18:56:19 +01:00
丈槍由紀
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
