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

19061 Commits (9bb5ff5a6200419c0e677a0f9e5f5c833e0aa34a)

Author SHA1 Message Date
Claire 9bb5ff5a62 Merge commit 'a8a25dcbdb63efb3191dbb3720c385209ffe4f34' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Jeong Arm 26c903c35b Fix Version metadata have trailing dot (#2403) 2023-09-13 08:47:39 +02:00
Plastikmensch 06221b90d2 Fix wrong gradient color on collapsed private mentions (#2402) 
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-13 08:44:40 +02:00
Claire a8a25dcbdb Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
Claire abe414aeed Merge pull request #2397 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-09-05 20:52:53 +02:00
Claire 3582239913 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
Claire 529ee44ff6 Fix video player not being displayed in reports interface (#26801) 2023-09-05 20:05:58 +02:00
Michael Stanclift 773e2d44f2 Migrate Dockerfile to Bookworm (#26802) 2023-09-05 18:19:59 +02:00
Claire 96f51d6c1f Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793) 2023-09-05 15:37:23 +02:00
Claire 8fae0c2c3b Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-09-05 10:05:52 +02:00
Claire 64f446b164 Merge commit '7b181d2005dcd8fa52f4482359f0178a2d148d0b' into glitch-soc/merge-upstream 2023-09-05 08:14:52 +02:00
Claire 7b181d2005 Bump version to v4.2.0-beta3 (#26753) 2023-09-04 21:20:20 +02:00
Stanislas Signoud 21b72ec665 [Glitch] Fix light mode colors for advanced interface banner 
Port cfd21eee96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 18:31:00 +02:00
Claire ef01aa71a9 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
renovate[bot] 4533426018 Update babel monorepo to v7.22.15 (#26790) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 17:56:47 +02:00
Claire 49c9861551 Fix language settings for users having selected the `kmr` language (#26787) 2023-09-04 17:56:31 +02:00
Eugen Rochko a93f7392fd Add `in:library` syntax to search (#26760) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 17:20:35 +02:00
gunchleoc 3ae5f35833 Remove kmr from language selection (#26014) 2023-09-04 13:21:43 +02:00
renovate[bot] 1d954462bb Update dependency stylelint-config-standard-scss to v11 (#26780) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:02:36 +02:00
renovate[bot] 536958f489 Update dependency rubocop to v1.56.2 (#26568) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:00:55 +02:00
Eugen Rochko 2c3f3e0390 Fix `#hashtag` matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
Stanislas Signoud cfd21eee96 Fix light mode colors for advanced interface banner (#26759) 2023-09-04 10:14:01 +02:00
Christian Schmidt e51426c1dc Fix invalid Content-Type header for WebP images (#26773) 2023-09-04 09:46:33 +02:00
renovate[bot] f16b40332c Update DefinitelyTyped types (non-major) (#26785) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:26:33 +02:00
Eugen Rochko 22d4942395 Fix `before:`, `after:` and `during:` failing when time zone not set (#26782) 2023-09-04 09:09:25 +02:00
renovate[bot] e7b2092c4c Update dependency typescript to v5.2.2 (#26786) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:08:53 +02:00
Plastikmensch d245d6380b Add `recent` to search props (#2394) 
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-03 08:46:30 +02:00
Claire 2514c0efa1 Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes into glitch-soc
 2023-09-03 08:46:08 +02:00
Claire f15e8e3e0d [Glitch] Add admin notifications for new Mastodon versions 
Port front-end changes from 97238e3496 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:20:06 +02:00
Claire 78a851ae0a Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire fa329286d0 [Glitch] Add `authorized_fetch` server setting in addition to env var 
Port SCSS changes from 7d3930a520 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:01:37 +02:00
Eugen Rochko 70c734d65a Fix wrong color on active icons with counters in web UI (#26767) 2023-09-02 14:46:26 +02:00
Claire 63969b15b3 Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire f3f3294db5 Fix test failures due to different default settings in glitch-soc 2023-09-02 14:24:47 +02:00
Claire e070644a5d [Glitch] Fix search popout including full-text search instructions when full-text search is disabled 
Port 20913b52bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:56:20 +02:00
Santiago Kozak 64e558cbbf [Glitch] Allow filter form in profiles directory to wrap 
Port 1b9fe4882f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:55:53 +02:00
Stanislas Signoud f7e8c8033f [Glitch] Add an explanation banner on switching to single column mode 
Port 2c0eaf50f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:54:33 +02:00
Claire 432bd89f72 Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
 2023-09-02 13:50:16 +02:00
Claire 513d22e1d6 [Glitch] Fix sign up steps progress layout in right-to-left locales 
Port 4452d8dad5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:50 +02:00
Tim Rogers e21ef86a9b [Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts 
Port 378b3dcddf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:15 +02:00
Tim Rogers 97d464e5d3 [Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts 
Port 1b52b02c1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:39:02 +02:00
Claire d38116d584 Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire 5d5d0c06d8 Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 2023-09-02 13:31:15 +02:00
Claire c499c4a019 Merge commit 'd2ee5b19004995d385e344c5b3216e29c8337094' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
 2023-09-02 13:18:16 +02:00
Claire 1ef0758cf0 Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Eugen Rochko dab6bbdd54 [Glitch] Add search options to search popout in web UI 
Port 9ab2c6b479 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 12:09:07 +02:00
Claire a9fb03b6c0 Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire ed5d57dac3 Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
 2023-09-02 11:56:09 +02:00
Claire f188aa636c [Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex` 
Port d8276ad1b4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 11:49:35 +02:00
Claire 52ce0a1c1d Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00