monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,337 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

19337 Commits

Author SHA1 Message Date
Claire 80f89f9cf2 Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/admin.html.haml`:
  Upstream moved `javascript_pack_tag` calls around, but we don't use them in
  the same way in glitch-soc due to the different theming system.
  Kept glitch-soc's files unchanged.
 2023-08-24 21:52:19 +02:00
Antonin Del Fabbro 406f3942a9 [Glitch] Change opacity of the delete icon in the search field to be more visible 
Port 9a8190da4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:51:13 +02:00
Claire 32e67e78a3 Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Christian Schmidt def58f8ac3 [Glitch] Fix some React warnings 
Port 152b10b624 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire d65aa507ca Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream 2023-08-24 21:38:59 +02:00
Claire bdce78187c [Glitch] Fix layout of the closed registrations modal 
Port fe31571965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:38:08 +02:00
Christian Schmidt 9b094f3653 [Glitch] Fix profile picture preview 
Port SCSS changes from bb23116e8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:36:42 +02:00
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
 2023-08-24 21:26:27 +02:00
Claire 389b7d23db
Fix changelog wording and missing items (#26638) 2023-08-24 21:07:39 +02:00
Claire 88ff45a3b2 Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
 2023-08-24 21:01:19 +02:00
Claire 1b5d3fdc5e Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
Christian Schmidt e67c28a5fe [Glitch] Remove redundant ready() wrapper 
Port bb51c0676d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 20:35:22 +02:00
Claire 7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
 2023-08-24 20:34:14 +02:00
jsgoldstein 30c191aaa0
Add new public status index (#26344) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 16:40:04 +02:00
Claire 96bcee66fb
Change nightlies versioning from `v4.2.0+2023-08-23` to `v4.2.0-nightly.2023-08-23` (#26626) 2023-08-24 14:43:44 +02:00
Claire 163b004bb1
Change admin e-mail notification settins to be their own settings group (#26596) 2023-08-24 14:43:00 +02:00
Claire e90649b064
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633) 
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
 2023-08-24 14:10:48 +02:00
Claire b2ac93dd73
Fix selecting domains to forward reports to not passing the information correctly (#26636) 2023-08-24 14:06:27 +02:00
Jaehong Kang 2dbbeedc94
Fix: Workaround to load MASTODON_VERSION_* in Docker. (#26591) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 13:07:27 +02:00
renovate[bot] 24ea6f851f
Update dependency redis to v4.6.8 (#26630) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 09:59:13 +02:00
Matt Jankowski 9974163776
Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
renovate[bot] e3fd071973
Update dependency rspec-sidekiq to v4 (#26627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 09:03:40 +02:00
Claire 8eb09466aa
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1cb978bcc3
 2023-08-23 16:56:19 +02:00
Antonin Del Fabbro 9a8190da4a
Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Daniel M Brasil f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239) 2023-08-23 15:50:23 +02:00
jsgoldstein b91724fb9d
Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
renovate[bot] 34f5b90dc7
Update dependency sass to v1.66.1 (#26534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:56 +02:00
renovate[bot] 060b554a9d
Update dependency oj to v3.16.0 (#26520) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:38 +02:00
renovate[bot] de8c2427a5
Update dependency immutable to v4.3.3 (#26622) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:21 +02:00
Claire 613cfd625c
Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt 152b10b624
Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput 44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
jsgoldstein 85057865b4
Update Account Search to prioritize username over display name (#26623) 2023-08-23 15:40:09 +02:00
yufushiro 3aac12981c
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-23 08:44:56 +02:00
Robert R George cf6f70799b
Add support for federating `memorial` attribute (#26583) 2023-08-23 08:27:24 +02:00
renovate[bot] ea1a221e2d
Update dependency react-textarea-autosize to v8.5.3 (#26607) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 08:26:30 +02:00
renovate[bot] 74b8b8ea14
Update dependency rails to v7.0.7.2 (#26612) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 08:22:48 +02:00
Renaud Chaput 58acaa9ae6
Better hashtag normalization when processing a post (#26614) 2023-08-23 08:18:07 +02:00
Claire 452f15be78 Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
Claire c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface 
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:54:22 +02:00
Claire bd023a2637
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` (#26605) 2023-08-22 18:51:32 +02:00
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire 245fe855be [Glitch] Fix unfollow icon styling in advanced column 
Port d9c21293aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:48:23 +02:00
Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Claire 128daefc7a
Remove leftover `.orig` files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
gunchleoc 25dc01660d
Add Kalmyk to languages dropdown (#26013) 2023-08-22 17:50:04 +02:00
gunchleoc c01ecd0879
Add cherokee to languages dropdown (#26012) 2023-08-22 16:53:27 +02:00
renovate[bot] dc09c10fa8
Update dependency mime-types to v3.5.1 (#26595) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-22 16:47:40 +02:00