treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
21,458 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

21458 Commits (2d43547934d17d88e1e055c2a84673c20c7e6fde)

Author SHA1 Message Date
renovate[bot] 307efe41c6
Update dependency axios to v1.6.8 (#29613) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 09:15:03 +00:00
Matt Jankowski 92855948a0
Remove unused `show_landing_strip?` helper method (#29618) 2024-03-18 08:55:54 +00:00
Matt Jankowski ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods (#29620) 2024-03-18 08:54:46 +00:00
renovate[bot] 97a229d5f4
Update dependency nokogiri to v1.16.3 (#29622) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:53:29 +00:00
renovate[bot] a0fcac9652
Update dependency postcss to v8.4.36 (#29628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:49:34 +00:00
renovate[bot] 2f653174b1
Update libretranslate/libretranslate Docker tag to v1.5.6 (#29629) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:49:18 +00:00
renovate[bot] cf7d412367
Update peter-evans/create-pull-request action to v6.0.2 (#29630) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:48:37 +00:00
renovate[bot] 5d3d525d0e
Update DefinitelyTyped types (non-major) (#29631) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-18 08:48:13 +00:00
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-18 08:47:48 +00:00
Claire ada2ac411a
Merge pull request #2681 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d702a03a0c
 2024-03-16 22:34:16 +01:00
Claire 82c2af0356
Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607) 2024-03-16 16:38:20 +00:00
Claire 726e7ad024
Fix extra separator besides favourite count on private posts (#29605) 2024-03-16 01:11:59 +00:00
Claire c511e52d1e [Glitch] Add “Learn more” on block modal to inform of federation caveats 
Port d702a03a0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 22:58:16 +01:00
Eugen Rochko 80fda17868 [Glitch] Change mute, block and domain block confirmations in web UI 
Port ec19d0a14b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 22:58:01 +01:00
Claire 3beba00c4e [Glitch] Change Explore icon to compass in advanced interface 
Port be7a68b095 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 22:50:15 +01:00
Claire b8f476256e Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream 2024-03-15 22:48:04 +01:00
Renaud Chaput 7fe848b161 [Glitch] Convert `packs/public.jsx` to Typescript 
Port c76ae7a5c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 22:43:36 +01:00
Claire 1b06e4e1b7 Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
 2024-03-15 22:37:55 +01:00
Claire 6ee7a64465
Reduce differences with upstream in “public” pack (#2680) 
* Reduce differences with upstream

* Further reduce pack differences with upstream
 2024-03-15 22:21:57 +01:00
Claire 2cdac2bc38
Merge pull request #2679 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 407287573c
 2024-03-15 21:38:07 +01:00
Claire d702a03a0c
Add “Learn more” on block modal to inform of federation caveats (#29614) 2024-03-15 19:09:21 +00:00
Eugen Rochko a32f992182 [Glitch] Add domain information to profiles in web UI 
Port 407287573c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 18:51:41 +01:00
Claire 2c622497c2 Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream 2024-03-15 18:48:39 +01:00
Eugen Rochko ec19d0a14b
Change mute, block and domain block confirmations in web UI (#29576) 2024-03-15 17:36:41 +00:00
Claire ed1af46108
Merge pull request #2677 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2024-03-15 18:23:54 +01:00
Claire be7a68b095
Change Explore icon to compass in advanced interface (#29610) 2024-03-15 16:06:48 +00:00
Matt Jankowski 4f4132f1a1
Add diagnostic message for failure during CLI search deploy (#29462) 2024-03-15 14:26:23 +00:00
Renaud Chaput c76ae7a5c0
Convert `packs/public.jsx` to Typescript (#29501) 2024-03-15 13:16:45 +00:00
Eugen Rochko 407287573c
Add domain information to profiles in web UI (#29602) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-15 13:08:38 +00:00
Claire 2d4ff8f6ed Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream split some `simple_form` arguments across multiple lines.
  One of the arguments in glitch-soc was different.
  Split as upstream's did, keeping our different limit argument.
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream split some `simple_form` arguments across multiple lines.
  Glitch-soc had a different field because of the different theming
  system.
  Kept glitch-soc's definition of that form field.
 2024-03-15 12:43:59 +01:00
renovate[bot] 52200b6bbf
Update dependency sass to v1.72.0 (#29586) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-15 11:41:55 +00:00
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
Matt Jankowski f445d33fd6
Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
Matt Jankowski 7720c684c5
Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560) 2024-03-15 10:40:21 +00:00
Matt Jankowski 2e91a9bd34
Add `include_pagination_headers` matcher to check `Link` header in api specs (#29596) 2024-03-15 10:17:45 +00:00
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-15 10:02:10 +00:00
Matt Jankowski e75b55a6d7
Extract target account on list method in bulk import row service spec (#29601) 2024-03-15 09:31:25 +00:00
Matt Jankowski 838b0bdf2d
Remove unused `Account::Interactions#endorsed?` method (#29463) 2024-03-15 09:00:26 +00:00
Matt Jankowski d39d625561
Use inclusive range in `ActivityTracker#get` (#29413) 2024-03-14 21:21:01 +00:00
Claire b834f41ec1
Merge pull request #2676 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to df6086d402
 2024-03-14 21:39:48 +01:00
Eugen Rochko 000a900d3b [Glitch] Fix back button appearing in column header unexpectedly in web UI 
Port 30483d618f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Claire 84c7b272e1 [Glitch] Fix accounts not getting imported into redux store for some filtered notification types 
Port 95a5713ff7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Eugen Rochko 4b2a935c4a [Glitch] Change design of metadata underneath posts in web UI 
Port 4991198b70 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:43:38 +01:00
Eugen Rochko 042d17ddf1 [Glitch] Fix wrong background color on search results in web UI 
Port 1e1d97a787 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:30:46 +01:00
mogaminsk 88f477749c [Glitch] Use sender's `username` to column title in notification request if it's `display_name` is not set 
Port 3156d04ec1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-14 17:29:38 +01:00
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Claire 31b93a5441
Merge pull request #2674 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 24319836de
 2024-03-14 17:25:25 +01:00
Matt Jankowski df6086d402
Extract file size sql calc from media storage cli (#29577) 2024-03-14 15:22:52 +00:00
Matt Jankowski 6c3e718b86
Remove setting of `sensitive` value (default false, not null) in Status model (#29589) 2024-03-14 13:56:59 +00:00
Matt Jankowski 974c7672e5
Extract shared behavior methods in oauth feature spec (#28360) 2024-03-14 13:42:59 +00:00