Claire 3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' 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

..

actions

Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream

2023-09-02 11:56:09 +02:00

components

Add data-nosnippet attribute to remote posts and local posts with noindex (#26648)

2023-08-25 11:31:20 +02:00

containers

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

features

Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream

2023-08-24 21:56:00 +02:00

locales

Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream

2023-09-02 11:56:09 +02:00

polyfills

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00

reducers

Wrong count in response when removing favourite/reblog (#24365)

2023-07-19 09:02:30 +02:00

selectors

Add toast with option to open post after publishing in web UI (#25564)

2023-07-08 20:01:08 +02:00

service_worker

Upgrade react-intl (#24906)

2023-05-31 23:43:39 +02:00

store

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00

utils

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00

api.js

Enforce import order with ESLint (#25096)

2023-05-23 17:15:17 +02:00

blurhash.ts

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00

common.js

Dont use CommonJS (require, module.exports) anywhere (#24913)

2023-05-09 03:08:47 +02:00

compare_id.ts

Use Prettier for ESLint formatting TypeScript (#23631)

2023-05-09 19:02:12 +02:00

initial_state.js

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

is_mobile.ts

Change links in multi-column mode so tabs are open in single-column mode (#25893)

2023-07-13 17:18:09 +02:00

load_keyboard_extensions.js

fix: support KaiOS arrow navigation on public pages (#12251)

2019-11-04 13:03:09 +01:00

main.jsx

Enforce import order with ESLint (#25096)

2023-05-23 17:15:17 +02:00

performance.js

Dont use CommonJS (require, module.exports) anywhere (#24913)

2023-05-09 03:08:47 +02:00

permissions.ts

Use Prettier for ESLint formatting TypeScript (#23631)

2023-05-09 19:02:12 +02:00

ready.js

Disable push notification when not logged in (#19272)

2022-10-03 18:15:47 +02:00

scroll.ts

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00

settings.js

Add dismissable hints to various timelines in web UI (#19315)

2022-10-09 06:08:37 +02:00

stream.js

Add eslint-plugin-jsdoc (#24719)

2023-04-30 02:29:54 +02:00

test_setup.js

Replace to testing-library from enzyme (#14152)

2020-06-29 13:58:07 +02:00

uuid.ts

Upgrade to typescript-eslint v6 (#25904)

2023-07-13 11:49:16 +02:00