Claire
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
Darius Kazemi
bacb674921
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Eugen Rochko
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
Claire
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
Claire
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
Jed Fox
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
Renaud Chaput
b0780cfeed
Fix /share and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Claire
5fae2de454
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
S.H
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
Claire
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Renaud Chaput
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
Christian Schmidt
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Renaud Chaput
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
dependabot[bot]
89d6341c80
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00
Claire
14bb6bb29a
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
y.takahashi
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
Claire
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
2023-05-28 17:49:55 +02:00
たいち ひ
6a592083f1
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port 4197b5e4c8
2023-05-28 17:15:21 +02:00
Renaud Chaput
0009b4b574
[Glitch] Update inconsistent defaultMessage
...
Port e58c36d308
2023-05-28 17:14:31 +02:00
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Eugen Rochko
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
2023-05-28 16:59:12 +02:00
Renaud Chaput
7bec63e6e2
[Glitch] Fix null signUp URL handling from #25014
...
Port 40b948a1fb
2023-05-28 16:52:16 +02:00
たいち ひ
017fbc7a74
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 7336f3648b
2023-05-28 16:48:17 +02:00
Claire
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
Claire
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
2023-05-28 15:54:31 +02:00
Claire
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
2023-05-28 15:09:28 +02:00
Claire
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
2023-05-28 15:06:29 +02:00
Claire
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
2023-05-28 14:56:24 +02:00
Claire
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
Claire
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Claire
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
たいち ひ
60c7e559d8
[Glitch] Rewrite <TimelineHint /> as FC and TS
...
Port 9a472efe7c
2023-05-25 23:58:54 +02:00
たいち ひ
6746e5d430
[Glitch] Rewrite <Skeleton/> as FC and TS
...
Port 8066118d1f
2023-05-25 23:55:36 +02:00
Claire
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2023-05-25 23:52:04 +02:00
Claire
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
Renaud Chaput
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
Claire
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
Claire
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
Claire
ad1098970b
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
Claire
ba73f0ea3a
[Glitch] Add polling and automatic redirection to /start on email confirmation
...
Port e60414792d
2023-05-25 22:37:14 +02:00
Claire
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
Claire
b0ec3bfcf9
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port 7b54e47d03
2023-05-25 22:00:07 +02:00
Christian Schmidt
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
2023-05-25 21:57:19 +02:00
Eugen Rochko
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
2023-05-25 21:52:37 +02:00
Claire
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
2023-05-25 21:47:48 +02:00
Renaud Chaput
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
Nick Schonning
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2023-05-25 21:07:38 +02:00
Renaud Chaput
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2023-05-25 20:57:42 +02:00
fusagiko / takayamaki
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2023-05-25 20:57:07 +02:00
fusagiko / takayamaki
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2023-05-25 20:44:09 +02:00
Claire
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Claire
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire
cb6f445b90
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
Claire
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
fusagiko / takayamaki
38c6216082
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2023-05-25 15:42:37 +02:00
たいち ひ
4197b5e4c8
Fix export style of <LoadGap /> based on <Domain /> ( #25128 )
2023-05-25 13:03:37 +02:00
Renaud Chaput
e58c36d308
Update inconsistent defaultMessage ( #25114 )
2023-05-24 12:38:50 +02:00
Eugen Rochko
1caa5ff39e
Change share action from being in action bar to being in dropdown in web UI ( #25105 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-24 11:04:43 +02:00
Renaud Chaput
40b948a1fb
Fix null signUp URL handling from #25014 ( #25108 )
2023-05-24 09:49:26 +02:00
たいち ひ
7336f3648b
Rewrite <LoadGap /> as FC and TS ( #25042 )
2023-05-24 09:20:39 +02:00
Renaud Chaput
d27216dc46
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
Claire
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
Claire
100840c06e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2023-05-23 14:28:21 +02:00
Renaud Chaput
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
Renaud Chaput
8f66126b10
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
たいち ひ
9a472efe7c
Rewrite <TimelineHint /> as FC and TS ( #25091 )
2023-05-23 10:04:10 +02:00
たいち ひ
8066118d1f
Rewrite <Skeleton/> as FC and TS ( #25055 )
2023-05-23 08:58:08 +02:00
Claire
711a037660
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
Renaud Chaput
8d6aea3326
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
Nick Schonning
23a4ecf444
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
Nick Schonning
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
Claire
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Claire
bec6a1cad4
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
Claire
e60414792d
Add polling and automatic redirection to /start on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
Claire
7b54e47d03
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2023-05-16 15:36:25 +02:00
Claire
aa4c9730f6
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
Steven Munn
52d36f0f98
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )
...
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
Christian Schmidt
5241f7b2fd
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
Emelia Smith
b8a2430642
Fix Onboarding Errors ( #24883 )
2023-05-11 07:55:10 +02:00
Eugen Rochko
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
Claire
0eed06073f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
Renaud Chaput
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
Nick Schonning
b878e3d8df
Enable ESLint react/no-deprecated ( #24471 )
2023-05-10 09:05:32 +02:00
たいち ひ
2d5e257938
Rewrite logo.tsx as FC ( #24909 )
2023-05-10 08:58:21 +02:00
Renaud Chaput
6f8db56a01
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
Claire
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
Claire
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
Claire
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
Renaud Chaput
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2023-05-09 23:28:40 +02:00
Renaud Chaput
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2023-05-09 23:20:57 +02:00
Renaud Chaput
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
fusagiko / takayamaki
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2023-05-09 23:16:23 +02:00
Claire
1a664560cc
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We deleted it.
Kept it removed.
- `app/javascript/packs/public.jsx`:
Upstream changed an import, we have slightly different ones.
Ported upstream changes.
2023-05-09 23:12:48 +02:00
fusagiko / takayamaki
349cae0b57
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
fusagiko / takayamaki
ab7716cff4
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
Claire
0fff2b67de
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
Renaud Chaput
5f2071d055
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-05-09 22:56:26 +02:00
Renaud Chaput
b509b96504
[Glitch] Enforce React Rules of Hooks with eslint
...
Port d9b93bd15e
2023-05-09 22:28:53 +02:00
Renaud Chaput
108720d7b0
[Glitch] Dont use CommonJS (require, module.exports) anywhere
...
Port 955179fc55
2023-05-09 22:28:53 +02:00
Claire
c81d1b0d38
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
Upstream reworked imports, but we had many changes.
Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
たいち ひ
887112a065
[Glitch] Add TypeScript support for mastodon alias and image imports
...
Port 7c1305b3a4
2023-05-09 21:50:48 +02:00
Claire
42bdc2add9
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
Claire
8e806b6e88
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
Renaud Chaput
6415981056
[Glitch] Mark wheel events on scrollable list as passive
...
Port 89269e4b71
2023-05-09 20:42:07 +02:00
fusagiko / takayamaki
f94eb65cf9
[Glitch] Rewrite Domain component as function component
...
Port 9818f34273
2023-05-09 20:33:58 +02:00
fusagiko / takayamaki
468dfffd26
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 5bc8e2d1fd
2023-05-09 20:32:30 +02:00
たいち ひ
87a704f70b
[Glitch] Rewrite RadioButton component as FC
...
Port 76264e3fe8
2023-05-09 20:25:31 +02:00
たいち ひ
bd851d3b58
[Glitch] Rewrite Image component as function component
...
Port a65d2d1045
2023-05-09 20:24:49 +02:00
たいち ひ
1edaf58fb9
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 490ccbf40b
2023-05-09 20:24:01 +02:00
Claire
8b568755ad
Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream changed the config to properly process imports.
Glitch-soc had previously already done so.
Changed the config to better match upstream.
2023-05-09 20:12:33 +02:00
Nick Schonning
51b83ed195
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
Renaud Chaput
6aeb162927
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
Claire
e1f466fbbe
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
Renaud Chaput
224d458f7e
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
Renaud Chaput
a3a2414f0e
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
fusagiko / takayamaki
6579e3af7d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
Renaud Chaput
c8181eb0a4
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
Renaud Chaput
d9b93bd15e
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
Renaud Chaput
955179fc55
Dont use CommonJS (require, module.exports) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
Renaud Chaput
89269e4b71
Mark wheel events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
Renaud Chaput
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
2023-05-08 22:15:00 +02:00
Renaud Chaput
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2023-05-08 22:15:00 +02:00
Claire
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
Claire
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
2023-05-08 22:15:00 +02:00
Eugen Rochko
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
2023-05-08 22:15:00 +02:00
Claire
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
2023-05-08 22:15:00 +02:00
Claire
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2023-05-08 21:09:49 +02:00
Claire
d77fbbed73
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
Claire
f89f3a8566
Fix glitch-soc's thread line styling ( #2214 )
...
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2023-05-08 18:21:36 +02:00
fusagiko / takayamaki
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
Eugen Rochko
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
Claire
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
Nick Schonning
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
Christian Schmidt
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
fusagiko / takayamaki
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +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
