Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
renovate[bot]
17e3a12d3d
[Glitch] Update typescript-eslint monorepo to v8 (major)
...
Port a27f7f4e56
2024-09-12 17:32:41 +02:00
Jeremy Kescher
08e538f8a4
Merge branch 'glitch' into develop
2024-08-16 16:05:14 +02:00
Renaud Chaput
09929a42f7
[Glitch] Fix log out from user menu not working on Safari
...
Port c3e1d86d58
2024-08-14 21:24:50 +02:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Renaud Chaput
87b9b23025
[Glitch] Use integers and not numbers in notification policy API counters
...
Port b4d991adaa
2024-05-01 17:12:57 +02:00
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
2024-03-14 20:01:30 +01:00
Matt Jankowski
00d72866a3
[Glitch] Use vanilla JS to get Rails CSRF values
...
Port 00d94f3ffa
2024-03-13 19:17:59 +01:00
Eugen Rochko
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
2024-03-13 18:38:46 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
2024-01-17 22:37:29 +01:00
Claire
82d28ac956
Merge pull request #2567 from ClearlyClaire/glitch-soc/ports/convert-utils-hashtags-typescript
...
Convert utils and hashtags to Typescript
2024-01-15 12:41:22 +01:00
Claire
50188ad211
[Glitch] Use helpers to check environment in frontend ( #2571 )
...
Port 277e6968f5
2024-01-15 12:16:05 +01:00
Josh Goldberg ✨
695dcc6ca8
[Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
...
Port 1142f4c79e
2024-01-14 19:22:39 +01:00
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
2024-01-02 12:16:35 +01:00
Claire
8b24a9a507
Fix missed relative import discrepancy
2023-11-15 12:53:21 +01:00
Claire
b1f0457cb8
Fix whitespace and comment discrepancies
2023-11-15 12:53:21 +01:00
Claire
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
Renaud Chaput
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
Plastikmensch
ebfa184e74
Port search popout changes from upstream ( #2333 )
...
* [Glitch] Change search pop-out in web UI
Port 2b113764116028d047b9e38b39194051b83ed19573b64b8917
2023-07-30 18:42:35 +02:00
Renaud Chaput
18f55567b0
[Glitch] Upgrade to typescript-eslint v6
...
Port a7253075d1
2023-07-13 14:51:24 +02:00
Claire
0870c7c95e
[Glitch] Upgrade to Prettier 3
...
Port 73b64b8917
2023-07-13 14:01:40 +02:00
Local User
0527458f38
Merge branch 'upstream/main' into develop
2023-07-07 01:25:26 +02:00
dependabot[bot]
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
Claire
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
Jeremy Kescher
4920ccb302
Merge remote-tracking branch 'upstream/main' into develop
2023-05-27 12:23:36 +02:00
Claire
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
Renaud Chaput
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
Renaud Chaput
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
Claire
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
Jeremy Kescher
9fe04326ea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# config/routes.rb
# db/schema.rb
# lib/mastodon/version.rb
2023-05-09 23:26:00 +02:00
fusagiko / takayamaki
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2023-05-08 22:15:00 +02:00
Jeremy Kescher
f1a71785b9
Merge remote-tracking branch 'upstream/main' into develop
2023-05-08 18:40:08 +02:00
Nick Schonning
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
Claire
16c5354b8c
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
Jeremy Kescher
9eb149477a
Merge remote-tracking branch 'upstream/main' into develop
2023-05-06 00:39:56 +02:00
fusagiko / takayamaki
66bda4713e
[Glitch] Allow == when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
2023-03-05 12:34:16 +01:00
Renaud Chaput
81ef21a0c8
[Glitch] Rename JSX files with proper .jsx extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
Jeremy Kescher
0e634397c3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2023-02-21 00:40:08 +01:00
Nick Schonning
6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2023-02-19 10:53:18 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Nick Schonning
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2023-02-18 16:02:12 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
2023-02-17 00:26:21 +01:00
Claire
3c451cf88f
[Glitch] Fix useless regular-expression character escape detected by CodeQL
2023-02-03 21:14:41 +01:00
Claire
155424e52f
[Glitch] Run eslint --fix
...
I don't like it changing files this way, but it's basically what
c49213f0ea
2023-02-03 20:52:07 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +01:00
Eugen Rochko
2d731dbde6
[Glitch] Add ability to view previous edits of a status in admin UI
...
Port f8ca3bb2a1
2022-10-28 19:24:02 +02:00
Jeremy Kescher
b153ef2672
Merge remote-tracking branch 'upstream/main' into develop
2022-10-12 07:25:19 +02:00
Claire
b728b25c10
Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji
2022-10-11 12:43:19 +02:00
