a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
9 months ago
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
9 months ago
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>
9 months ago
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
9 months ago
e3c4e90646
Fix new list button being blank ( #2616 )
9 months ago
34f677cd03
th: smile sweet sadistic surprise service
...
should've just hardcoded instead but noooooooooooo
"needs to be decent"
9 months ago
7719de5665
th: etc etc host host s s
9 months ago
c249c10f74
Fix account suggestion size inconsistency with upstream
9 months ago
c379487041
th: revert more emoji-mart twemoji 14 hacks
9 months ago
d391e01b59
Revert notification bar color for now
9 months ago
3f89cec3c9
Further reduce differences with upstream
9 months ago
f6f62002c7
Remove leftovers from glitch-soc's layout option
9 months ago
189b70cd6a
Merge SCSS in a single `components.scss` file
9 months ago
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
9 months ago
a2611d782c
New Crowdin Translations (automated) ( #2588 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
08e511cecb
Fix doodle modal icons ( #2597 )
9 months ago
8fd45df06e
th: fiddle with quote style
9 months ago
98ae4ef813
th: glitch: status: fix quote icon on quotes
9 months ago
46d70b1ca6
th: glitch: fix quote-toot icon
9 months ago
aa8741fff3
th: glitch: compose: remove annoying post published messages
9 months ago
43e58d1558
th: Merge remote-tracking branch 'glitch/main'
9 months ago
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
9 months ago
c1910db65f
th: live from new york it's friday night
...
various critical fixes (pls don't report this to NVD)
9 months ago
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
9 months ago
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
9 months ago
8b87673f5e
Remove obsolete locale file ( #2596 )
9 months ago
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
9 months ago
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
10 months ago
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
10 months ago
dd7a66949a
Fix CSS loading in redirect controller
10 months ago
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
10 months ago
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
10 months ago
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
10 months ago
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
10 months ago
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
10 months ago
17ea22671d
Fix `Style/GuardClause` cop in app/controllers ( #28420 )
10 months ago
3205a654ca
Refactor conversations components in web UI ( #28833 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
10 months ago
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
10 months ago
c50274a0ac
Fix redirect confirmation for accounts ( #28902 )
10 months ago
9a8293f58d
Fix process of receiving posts with bearcaps is not working ( #26527 )
10 months ago
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
10 months ago
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
10 months ago
38f7f8b909
Tidy up association declaration in `Instance` model ( #28880 )
10 months ago
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
10 months ago
1290fede65
Fix `Rails/WhereExists` cop in app/lib ( #28862 )
10 months ago
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Kouhai
Claire
Emelia Smith
Ariadne Conill
Eugen Rochko
github-actions[bot]
JS Moore
Essem
Matt Jankowski
KMY（雪あすか）