monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,700 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

20700 Commits

Author SHA1 Message Date
Claire 9903e6beab Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
  `spec/controllers/api/v1/timelines` has been renamed, but we had an extra
  spec here for a glitch-soc-only endpoint.
  Kept glitch-soc's file unchanged (will port to a request spec later).
 2024-02-24 14:05:26 +01:00
Claire c297d999ba Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream 2024-02-24 14:02:01 +01:00
Claire 47b5105e5d Remove `max_toot_chars` from initial-state 
This is still in `/api/v1/instance` for compatibility with other clients
 2024-02-24 13:58:00 +01:00
Claire 6da69967d0 [Glitch] Change compose form to use server-provided post character limit 
Port 805dba7f8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 13:56:12 +01:00
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
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 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
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
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-17 20:15:25 +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