Jeremy Kescher
46910595eb
Update README.md to reflect recent changes
...
- Emoji picker in composer is no longer a blob cat, or an emoji to begin with. So remove that point, lol.
- Update upstream image size limit (still lower than ours)
- We modified Oatstodon slightly to fix the appearance of profile fields.
- We have applied the mastodon-sakura filtering patch to our fork.
2024-02-24 18:44:27 +01:00
Jeremy Kescher
4c24022984
Fix min_options, let vanilla flavor behave properly for pollLimits
2024-02-24 18:25:47 +01:00
Jeremy Kescher
8f8cb0fad3
Merge branch 'glitch-soc' into develop
2024-02-24 17:51:18 +01:00
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
Claire
25ac55ecd8
Merge pull request #2644 from ClearlyClaire/glitch-soc/merge-dreaded-upstream-composer-change
...
Merge and port upstream's composer change
2024-02-24 13:46:26 +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
6901930c8d
Add back confirmation modal for missing media description
2024-02-23 23:04:32 +01:00
Claire
138286147f
Fix emoji being inserted in incorrect places
2024-02-23 21:45:48 +01:00
Claire
6eede9d84b
Add notification badge feature back
2024-02-23 21:05:34 +01:00
Claire
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +01:00
Claire
e333453343
Use Warning icon for CWs in app settings
2024-02-23 21:05:34 +01:00
Claire
e62cd93650
Fix composer offering to edit federation settings for an existing post
2024-02-23 21:05:34 +01:00
Claire
23dc650596
Restore preselect on reply option
2024-02-23 21:05:34 +01:00
Claire
84d05ca221
Reimplement glitchy elephant friend
2024-02-23 21:05:33 +01:00
Claire
3564a15553
Refactor composer dropdowns
2024-02-23 21:05:33 +01:00
Claire
0e77c45624
Add local-only option back as a federation setting dropdown
2024-02-23 21:05:33 +01:00
Claire
47deb680d5
Add Content-Type dropdown back
2024-02-23 21:05:33 +01:00
Claire
118bb5bc81
Add secondary post button back
2024-02-23 21:05:33 +01:00
Claire
61559a42a9
Restore glitch-soc's permalink behavior for reply indicator
2024-02-23 20:57:20 +01:00
Claire
179437ed0e
Restore access to glitch-soc app settings
2024-02-23 20:57:20 +01:00
Claire
056f9bf3c2
Add back “spoilers always on” feature
2024-02-23 20:57:18 +01:00
Claire
380f4fc95c
Reimplement sensitive checkbox
2024-02-22 23:49:06 +01:00
Claire
5fd50756b4
Restore glitch-soc's support of custom poll limits
2024-02-22 23:06:12 +01:00
Eugen Rochko
9c10aaa4d5
[Glitch] Change design of compose form in web UI
...
Port 6936e5aa69
2024-02-22 23:06:12 +01:00
Claire
7586d4348f
Switch glitch-soc to upstream's old composer
2024-02-22 22:10:17 +01:00
Claire
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
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
