Commit Graph

21647 Commits (main)
 

Author SHA1 Message Date
Jeremy Kescher a53f2cf970
Merge branch 'glitch-soc' into develop 1 week ago
Essem 327da54e23
Use a consumer for identity 1 week ago
Claire ada2ac411a
Merge pull request #2681 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to d702a03a0c
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
Claire b8f476256e Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream 2 weeks ago
Renaud Chaput 7fe848b161 [Glitch] Convert `packs/public.jsx` to Typescript
Port c76ae7a5c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 weeks ago
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.
2 weeks ago
Claire 6ee7a64465
Reduce differences with upstream in “public” pack (#2680)
* Reduce differences with upstream

* Further reduce pack differences with upstream
2 weeks ago
Claire 2cdac2bc38
Merge pull request #2679 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 407287573c
2 weeks ago
Claire d702a03a0c
Add “Learn more” on block modal to inform of federation caveats (#29614) 2 weeks ago
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>
2 weeks ago
Claire 2c622497c2 Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream 2 weeks ago
Eugen Rochko ec19d0a14b
Change mute, block and domain block confirmations in web UI (#29576) 2 weeks ago
Claire ed1af46108
Merge pull request #2677 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2 weeks ago
Claire be7a68b095
Change Explore icon to compass in advanced interface (#29610) 2 weeks ago
Matt Jankowski 4f4132f1a1
Add diagnostic message for failure during CLI search deploy (#29462) 2 weeks ago
Renaud Chaput c76ae7a5c0
Convert `packs/public.jsx` to Typescript (#29501) 2 weeks ago
Eugen Rochko 407287573c
Add domain information to profiles in web UI (#29602)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 weeks ago
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.
2 weeks ago
renovate[bot] 52200b6bbf
Update dependency sass to v1.72.0 (#29586)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 weeks ago
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2 weeks ago
Matt Jankowski f445d33fd6
Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2 weeks ago
Matt Jankowski 7720c684c5
Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560) 2 weeks ago
Matt Jankowski 2e91a9bd34
Add `include_pagination_headers` matcher to check `Link` header in api specs (#29596) 2 weeks ago
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603)
Co-authored-by: GitHub Actions <noreply@github.com>
2 weeks ago
Matt Jankowski e75b55a6d7
Extract target account on list method in bulk import row service spec (#29601) 2 weeks ago
Matt Jankowski 838b0bdf2d
Remove unused `Account::Interactions#endorsed?` method (#29463) 2 weeks ago
Matt Jankowski d39d625561
Use inclusive range in `ActivityTracker#get` (#29413) 2 weeks ago
Jeremy Kescher 21a23b58ab
Merge branch 'glitch-soc' into develop 2 weeks ago
Claire b834f41ec1
Merge pull request #2676 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to df6086d402
2 weeks ago
Jeremy Kescher caccc2e0f4
Merge branch 'glitch-soc' into develop
# Conflicts:
#	README.md
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/reducers/compose.js
#	app/javascript/flavours/glitch/styles/components.scss
#	app/javascript/mastodon/reducers/compose.js
#	app/models/notification.rb
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
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>
2 weeks ago
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2 weeks ago
Claire 31b93a5441
Merge pull request #2674 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 24319836de
2 weeks ago
Matt Jankowski df6086d402
Extract file size sql calc from media storage cli (#29577) 2 weeks ago
Matt Jankowski 6c3e718b86
Remove setting of `sensitive` value (default false, not null) in Status model (#29589) 2 weeks ago
Matt Jankowski 974c7672e5
Extract shared behavior methods in oauth feature spec (#28360) 2 weeks ago
Matt Jankowski 14aa7f1e15
Use `Account.activitypub` generated scope (#28157) 2 weeks ago
Matt Jankowski 049d9171eb
Use `with_options` for shared option in `accounts#show` routing block (#28914) 2 weeks ago
Eugen Rochko 30483d618f
Fix back button appearing in column header unexpectedly in web UI (#29551) 2 weeks ago
Claire 95a5713ff7
Fix accounts not getting imported into redux store for some filtered notification types (#29588) 2 weeks ago
Matt Jankowski 0bc17a3d48
Use enum-generated `public_visibility` scope on Status (#28156) 2 weeks ago
Matt Jankowski 19cbadfbd6
Use enum-generated scope for `IpBlock` in CLI (#28144) 2 weeks ago
Matt Jankowski 681a89f684
Readability clean up in `ImportVacuum` spec (#28955) 2 weeks ago