mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,506 Commits
67 Branches
15 Tags
344 MiB
Commit Graph

21506 Commits (360590ecd8bf84294217ffb7b899cec65f6df101)

Author SHA1 Message Date
renovate[bot] 4826c1da8a
Update dependency devise to v4.9.4 (#29890) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-11 09:00:15 +00:00
Matt Jankowski 576554b19b
Use fabrication sequence in domain values (#29895) 2024-04-11 08:59:01 +00:00
renovate[bot] 96bdeeed0e
Update dependency nokogiri to v1.16.4 (#29900) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-11 08:50:34 +00:00
Claire c8e5e13c89
Merge pull request #2691 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0cea7a623b
 2024-04-10 20:51:51 +02:00
github-actions[bot] db5a5636d9
New Crowdin Translations (automated) (#29888) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-10 13:03:40 +00:00
Matt Jankowski 4565015615
Fix `Style/MapIntoArray` cop in cli progress helper (#29884) 2024-04-10 12:46:43 +00:00
Matt Jankowski b57ee5cf5b
Fix `Style/MapIntoArray` cop in context helper (#29885) 2024-04-10 12:46:39 +00:00
Matt Jankowski 4948a063d2
Use `tt` extension for form scaffold template (#29676) 2024-04-10 09:20:21 +00:00
renovate[bot] b8dca8d22a
Update dependency typescript to v5.4.4 (#29875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 14:08:32 +00:00
Matt Jankowski 285f63c02e
Use composable query in `User.active` scope (#29775) 2024-04-08 13:53:49 +00:00
Claire babbf6017d
Remove caching in `cache_collection` (#29862) 2024-04-08 13:46:13 +00:00
Claire f3430eebbb
Fix hashtag string interpolation in welcome email (#29879) 2024-04-08 13:45:25 +00:00
github-actions[bot] 13faf26315
New Crowdin Translations (automated) (#29859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-08 13:44:54 +00:00
Renaud Chaput 730e2127e1
Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) (#29869) 2024-04-08 08:17:51 +00:00
renovate[bot] a1277a9b2b
Update eslint (non-major) (#29877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:17:23 +00:00
renovate[bot] 2441fe6fd4
Update dependency stylelint-config-standard-scss to v13.1.0 (#29876) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:57 +00:00
renovate[bot] b06510d579
Update DefinitelyTyped types (non-major) (#29874) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:36 +00:00
renovate[bot] 499b184fcd
Update dependency pino to v8.20.0 (#29865) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:16:20 +00:00
renovate[bot] 79bbb2023d
Update dependency react-intl to v6.6.5 (#29864) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-08 08:15:46 +00:00
Eugen Rochko 91531e9586 [Glitch] Add ability to reorder uploaded media before posting in web UI 
Port 8e7e86ee35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 22:34:03 +02:00
Eugen Rochko fc533cfad3 [Glitch] Fix background and icon on notification requests in web UI 
Port 0cea7a623b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:51:51 +02:00
Eugen Rochko b55bbfa2b3 [Glitch] Change design of notification about lost connections in web UI 
Port 29f9dc742e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:49:57 +02:00
Eugen Rochko 1ae08ae257 [Glitch] Change out-of-band hashtags design in web UI 
Port dd061291b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:48:52 +02:00
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire a844a6a577 [Glitch] Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately 
Port dfa43707eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:39:04 +02:00
Claire c3a128f31e Remove strings already defined upstream 2024-04-06 21:25:04 +02:00
Claire afaad0755f [Glitch] Remove setting for unfollow confirmation modal, and make it unconditional 
Port 37ca59815c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 21:17:45 +02:00
Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
 2024-04-06 21:01:40 +02:00
Claire f635cde756 [Glitch] Change new modals to allow vertical scrolling 
Port de6c9e0fcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:43:43 +02:00
Claire 0f8b33238f [Glitch] Change icon of severed relationships notifications 
Port 387c78ddf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:39:07 +02:00
Renaud Chaput 576c085ea0 [Glitch] Add the role ID to the badge component 
Port ec1e770fea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:35:29 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire f14b6f3d99 [Glitch] Fix duplicate translation string for severed relationships 
Port 885d0faf83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 20:31:09 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Eugen Rochko 375af259a2 [Glitch] Change back button to always appear in advanced web UI 
Port be52633ee4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 19:55:13 +02:00
Claire 67842ffb22 Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream 2024-04-06 19:54:11 +02:00
Claire 0f966209ca [Glitch] Add notifications of severed relationships 
Port 44bf7b8128 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 19:38:57 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
Claire 9451997fa8
Refactor notifications code to reduce differences with upstream (#2692) 
* Merge back `Follow` notification component

* Merge back part of `FollowRequestContainer` notification container

* Reduce differences with upstream in the `mention` case

* Reduce differences with upstream in the `favourite` case

* Reduce differences with upstream in the `reblog` case

* Reduce differences with upstream in the `status` case

* Reduce differences with upstream in the `update` case

* Reduce differences with upstream in the `poll` case

* Merge back `AdminSignup` notification component

* Merge back `AdminReport` notification container
 2024-04-06 19:34:30 +02:00
github-actions[bot] 8a64406d34
New Crowdin Translations (automated) (#2668) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 18:18:06 +02:00
Claire e73cf356d2
Move OAuth flow tests from feature tests to system tests (#29837) 2024-04-05 16:52:05 +00:00
Matt Jankowski b61ae28f8d
Separate methods for theme style and meta color tags (#29802) 2024-04-05 09:52:43 +00:00
ache 52ab8a59c6
Forward 3035 port (#29710) 2024-04-05 09:19:43 +00:00
Matt Jankowski c0fe8a9f13
Extract shared callback behaviour to `CustomFilterCache` concern (#29695) 2024-04-05 09:17:58 +00:00
renovate[bot] 285a87a77f
Update dependency scenic to v1.8.0 (#29794) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-05 09:04:10 +00:00
Matt Jankowski 59da591d13
Improve spec for dimension/languages admin metric (#29842) 2024-04-05 08:54:11 +00:00
Renaud Chaput 6ac90d4c5d
Add tests for our number formatting function (#29852) 2024-04-05 08:06:31 +00:00
Renaud Chaput 906a399634
Fix wrong extension for a test file (#29853) 2024-04-05 07:57:44 +00:00
renovate[bot] c7378218ba
Update dependency rubocop-rspec to v2.29.1 (#29858) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-05 07:57:20 +00:00
Claire 38b9d31f63
Improve email address validation (#29838) 2024-04-05 07:48:45 +00:00