djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 06:33:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,565 Commits 69 Branches 22 Tags 412 MiB
Commit Graph

13032 Commits

Author SHA1 Message Date
Eugen Rochko
91531e9586 [Glitch] Add ability to reorder uploaded media before posting in web UI 
Port 8e7e86ee354fca36b989b6de40904f38e6db103b 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 0cea7a623be470c51d7a162265f44f5a3e149275 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 29f9dc742eaca1898455e37e01fff087e4bf42a6 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 dd061291b1e89b6c67e6dff06ad087abdf7821dc 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 dfa43707eb88276b8268e49c7853d226006bf140 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 37ca59815cd3a3b2662e20f0c28185eb0d604dd4 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 de6c9e0fcd9d9768b3696b27122334aaf955c231 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 387c78ddf9c7654090b7b529ccebfb96f5cab534 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 ec1e770feaef81574482b841bc04a286f9dc7249 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 885d0faf83d55f2f67ad76f7f34c51afcd72efe5 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 be52633ee4ce4a14b48f82156cf64c0a3eb9835b 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 44bf7b812894f9c8d67cbfbb1a23b0091aa601c5 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
Matt Jankowski
b61ae28f8d
Separate methods for theme style and meta color tags (#29802) 2024-04-05 09:52:43 +00:00
Matt Jankowski
c0fe8a9f13
Extract shared callback behaviour to CustomFilterCache concern (#29695) 2024-04-05 09:17:58 +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
Claire
38b9d31f63
Improve email address validation (#29838) 2024-04-05 07:48:45 +00:00
Matt Jankowski
601834d746
Use partial collection render for welcome mailer features (#29843) 2024-04-04 16:13:10 +00:00
Michael Stanclift
1c87cb8019
Add purple border to active compose field search inputs (#29839) 2024-04-04 11:51:06 +00:00
Matt Jankowski
966d7f5bf9
Add missing snowflake range correction (#29841) 2024-04-04 11:33:17 +00:00
Jeong Arm
4045c069f8
Use public_visibility (#29847) 2024-04-04 07:31:30 +00:00
nicolas
c6da3ee828
Makes the star icon rotate around its actual centre axis (#29844) 2024-04-03 21:10:02 +00:00
Matt Jankowski
cde3206478
Simplify feature loop in welcome mailer (#29760) 2024-04-03 20:10:59 +00:00
renovate[bot]
37d984b8bf
Update eslint (non-major) (#29820) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-03 18:05:39 +00:00
Michael Stanclift
e284417349
Fix blue border on emoji/language search in Safari & Chrome (#29832) 2024-04-03 15:19:10 +00:00
Michael Stanclift
5d67247061
Fix language and emoji search field background colors on light theme (#29828) 2024-04-03 14:22:50 +00:00
github-actions[bot]
56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-03 09:04:29 +00:00
Matt Jankowski
edde54e991
Update stoplight to version 4.1.0 (#28366) 2024-04-02 15:47:40 +00:00
Matt Jankowski
921c4c1273
Match comment style of FeedManager list/tags checks (#29639) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-04-02 14:07:31 +00:00
Claire
0b9d4103cb
Fix contrast in notification request badge (#29826) 2024-04-02 14:05:46 +00:00
Matt Jankowski
34489591ec
Add max_pinned_statuses to instances serializer and api response (#29441) 2024-04-02 13:54:11 +00:00
Matt Jankowski
f56309f5f0
Add by_latest_used scope, move admin area recent IPs to partial (#29497) 2024-04-02 13:51:34 +00:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters (#29810) 2024-04-02 10:06:26 +00:00
Renaud Chaput
e47a3d00fe
Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
Renaud Chaput
07635228e2
Fix Redux Middleware types (#29800) 2024-04-02 09:56:03 +00:00
github-actions[bot]
c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-02 09:26:06 +00:00
Michael Stanclift
fa9574086d
Fix search box color on light theme (#29808) 2024-04-02 09:15:31 +00:00
Michael Stanclift
90eb4a5d01
Fix light theme header on mobile (#29809) 2024-03-29 21:03:30 +00:00
Michael Stanclift
430da03160
Fix background tint in single column light theme (#29803) 2024-03-29 17:16:51 +00:00
Renaud Chaput
69e5771881
Handle createAppAsyncThunk rejected actions in the errors middleware (#29791) 2024-03-29 13:57:39 +00:00
github-actions[bot]
f96648d41c
New Crowdin Translations (automated) (#29796) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-29 13:35:50 +00:00