tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,739 Commits 10 Branches 0 Tags
dev-glitch
Commit Graph

18739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Plastikmensch
a0047184d7 Add eslint rule to forbid vanilla imports in glitch (#2293) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:23 +02:00
Plastikmensch
470ded3687 Fix notifications not loading when slow mode active (#2292) 
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.

This change has been missed in e91bf82083

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-13 21:36:15 +02:00
Claire
3952d17518 Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-13 21:35:07 +02:00
Claire
e271d018b7 Fix home timeline's regexp field 2023-07-13 19:33:58 +02:00
Claire
71db616fed Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973) 2023-07-13 17:59:15 +02:00
Stanislas Signoud
5fad7bd58a Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire
41f65edb21 Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Matt Jankowski
644c5fddd8 Refactor Status.tagged_with_all for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Claire
98e5589ed4 [Glitch] Fix follow link style in embeds 
Port 5a3f174d56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:52:36 +02:00
Renaud Chaput
18f55567b0 [Glitch] Upgrade to typescript-eslint v6 
Port a7253075d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:51:24 +02:00
Claire
3be4f4266d Fix incorrect types in DisplayName 2023-07-13 14:51:24 +02:00
Claire
25571b18ed Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
Renaud Chaput
447ab7ab24 [Glitch] Convert Home timeline components to Typescript 
Port a75138d073 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-13 14:21:08 +02:00
Claire
177497b367 Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
Claire
0870c7c95e [Glitch] Upgrade to Prettier 3 
Port 73b64b8917 to glitch-soc
 2023-07-13 14:01:40 +02:00
Claire
95a1fde6b6 Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
 2023-07-13 13:49:58 +02:00
Claire
2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
 2023-07-13 13:35:15 +02:00
Renaud Chaput
70cc7bdbba Remove some recently-updated packages from Renovabot ignore config (#25960) 2023-07-13 13:34:38 +02:00
Claire
5a3f174d56 Fix follow link style in embeds (#25965) 2023-07-13 12:58:56 +02:00
renovate[bot]
ba0649f042 Update dependency postcss to v8.4.25 (#25961) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-13 12:20:03 +02:00
renovate[bot]
a4e6ff0d53 Update dependency react-textarea-autosize to v8.5.2 (#25962) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-13 12:19:54 +02:00
Renaud Chaput
a7253075d1 Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
renovate[bot]
3ed9b55cb3 Update dependency rubocop-rails to v2.20.1 (#25493) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-07-13 11:44:02 +02:00
Renaud Chaput
a75138d073 Convert Home timeline components to Typescript (#25583) 2023-07-13 11:28:55 +02:00
Renaud Chaput
73b64b8917 Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
renovate[bot]
0d7340380c Update dependency glob to v10.3.3 (#25959) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-13 11:20:20 +02:00
renovate[bot]
6be9f95a22 Update dependency core-js to v3.31.1 (#25958) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-13 11:17:46 +02:00
Michael Stanclift
063482a63f Fix trending publishers table not rendering correctly on narrow screens (#25945) 2023-07-13 11:12:51 +02:00
Nick Schonning
1a6c2e450a Update rubocop to v1.54.1 (#25627) 2023-07-13 11:11:55 +02:00
renovate[bot]
e7b0d1e23c Update dependency chewy to v7.3.3 (#25940) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-13 11:07:26 +02:00
Matt Jankowski
ce43ed144c Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Claire
bb98d970e3 Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-12 22:17:29 +02:00
Claire
c2bfbf53a1 Fix various CSS issues 2023-07-12 19:13:31 +02:00
Eugen Rochko
8d0c69529a Change markers API to use a replica (#25851) 2023-07-12 18:57:40 +02:00
Eugen Rochko
fdc3ff7c2d Change notifications API to use a replica (#25874) 2023-07-12 17:06:00 +02:00
Claire
9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
 2023-07-12 16:03:05 +02:00
Stanislas Signoud
ec95f62cb4 [Glitch] Fix sounds not being loaded from assets host 
Port 1392f31ed8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 16:00:20 +02:00
Claire
2aadebc769 Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Trevor Wolf
15f6fa8d47 [Glitch] fix buttons showing inconsistent styles 
Port ea10febd25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:50:56 +02:00
Claire
c3af91ce48 [Glitch] Fix filters not applying to explore tab 
Port af54bf52c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:48:13 +02:00
Claire
c699dc0908 [Glitch] Add forward_to_domains parameter to POST /api/v1/reports 
Port c27b82a437 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:47:43 +02:00
Claire
075887e1d6 Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Eugen Rochko
71f8c45c18 [Glitch] Change label and design of sensitive and unavailable media in web UI 
Port 338a0e70cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:43:10 +02:00
Claire
dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Eugen Rochko
c250b37f0a [Glitch] Fix explore page being inaccessible when opted-out of trends in web UI 
Port ceeb2b8c41 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:34:12 +02:00
Claire
82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
fusagiko / takayamaki
9e311f95aa [Glitch] simplify counters 
Port e0d230fb37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:18:41 +02:00
alfe
5b9e43187c [Glitch] Rewrite <ShortNumber /> as FC and TS 
Port 20e85c0e83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:17:18 +02:00
Renaud Chaput
55ea79165a [Glitch] Convert <DismissableBanner> to Typescript 
Port 4534498a8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:09:14 +02:00