mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity
21,024 Commits 58 Branches 15 Tags 569 MiB
Commit Graph

21024 Commits

Author SHA1 Message Date
Claire 20615a516d Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream 2024-02-24 13:53:59 +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
Paolo Melchiorre aca691726b
Fix #21492 Add missing WebP hint in avatar/header localizations (#22395) 2024-02-23 22:10:46 +00: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 cfa71a4d16
Fix admin account created by `mastodon:setup` not being auto-approved (#29379) 2024-02-23 19:04:57 +00:00
Claire 25ffe0af45
Fix pixel alignment for some composer icons (#29372) 2024-02-23 15:32:13 +00:00
github-actions[bot] bba4118ddd
New Crowdin Translations (automated) (#29369) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-23 15:21:02 +00:00
Matt Jankowski b0064ddda7
Add basic coverage for `MoveService` class (#29301) 2024-02-23 09:59:29 +00:00
renovate[bot] baa23738a8
Update dependency webmock to v3.22.0 (#29313) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-23 09:57:26 +00: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 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-22 23:06:12 +01:00
Matt Jankowski 45f71e3954
Update `@rails/ujs` to version 7.1.3-2 (#29359) 2024-02-22 21:35:14 +00:00
renovate[bot] 82e2370f5f
Update dependency cssnano to v6.0.4 (#29367) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-22 21:34:08 +00:00
Claire 9d8dfeb5fb
Fix processing of `Link` objects in `Image` objects (#29335) 2024-02-22 22:27:24 +01:00
Matt Jankowski a6ed148769
Use heredoc on the `HTML` blocks in verify link spec (#29365) 2024-02-22 21:26:48 +00: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 5152dd869e
Fix link verifications when page size exceeds 1MB (#29358) 2024-02-22 17:31:50 +00:00
Claire a9496882fc
Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355) 2024-02-22 14:52:14 +00:00
Claire b71904816a
Change registrations to be disabled by default for new servers (#29280) 2024-02-22 13:28:19 +00:00
Emelia Smith 491dd97642
Streaming: refactor to custom Error classes (#28632) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-22 13:20:20 +00:00
renovate[bot] ebe2086087
Update dependency haml_lint to v0.57.0 (#29181) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-22 11:26:48 +00:00
Matt Jankowski e9b0f0c314
Add basic coverage for `RemoveDomainsFromFollowersService` class (#29327) 2024-02-22 10:53:38 +00:00
Matt Jankowski 7c7dfe7de3
Add basic coverage for `RemoveFeaturedTagService` class (#29328) 2024-02-22 10:51:04 +00:00
Matt Jankowski 6342ddd698
Add basic coverage for `UnfavouriteService` class (#29329) 2024-02-22 10:48:42 +00:00