Renaud Chaput
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Claire
ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
Eugen Rochko
7b024baf50
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
Eugen Rochko
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
5def74a436
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 0842a68532
2023-06-25 17:40:01 +02:00
Eugen Rochko
6fb34258a4
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port 00ec43914a
2023-06-25 17:40:01 +02:00
Claire
7d160d2272
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port a8c1c8bd37
2023-06-25 17:40:01 +02:00
mogaminsk
222713a768
[Glitch] Fix custom signup URL may not loaded
...
Port 8d2c26834f
2023-06-25 14:27:46 +02:00
Ian
6fe345c383
[Glitch] Change emoji picker icon
...
Port 69db507924
2023-06-25 14:27:46 +02:00
たいち ひ
c71fc42f4e
[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS
...
Port 804488d38e
2023-06-25 14:27:46 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Claire
55e7c08a83
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
Eugen Rochko
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
Claire
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
Claire
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
mogaminsk
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
69db507924
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Claire
ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
Claire
ec91ea4457
Fix missing validation on default_privacy setting ( #25513 )
2023-06-20 18:32:14 +02:00
Claire
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
Claire
c78280a8ce
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
Emelia Smith
3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
Claire
dd07393e75
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
たいち ひ
804488d38e
Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )
2023-06-19 14:11:46 +02:00
Matt Jankowski
e1c9d52e91
Reduce sleep time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
Matt Jankowski
155ec185b2
Remove unused picture_hint helper method ( #25485 )
2023-06-19 09:04:15 +02:00
Daniel M Brasil
b9bc9d0bda
Fix incorrect pagination headers in /api/v2/admin/accounts ( #25477 )
2023-06-19 08:53:05 +02:00
Claire
dc68306b8e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
Claire
64f7a11658
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
Claire
3b04e39534
[Glitch] Fix non-interactive upload container being given a button role and tabIndex
...
Port c9d06d10d4
2023-06-18 14:10:49 +02:00
Claire
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
Eugen Rochko
d795c2c70c
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 39110d1d0a
2023-06-18 12:11:58 +02:00
たいち ひ
b1b95ddd1f
[Glitch] Rewrite emoji_mart_data_light as TS
...
Port 3b5e302f7f
2023-06-18 12:11:19 +02:00
alfe
9bf63257fb
[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
...
Port a86886b1fd
2023-06-18 12:10:37 +02:00
Renaud Chaput
0a212cfa7f
[Glitch] Add missing report category translation
...
Port 1cb4514d0e
2023-06-18 10:43:07 +02:00
alfe
cdec45eca9
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port dfaf59d99a
2023-06-18 10:42:04 +02:00
Eugen Rochko
f815bd5fd9
[Glitch] Change "bot" label to "automated"
...
Port 432a5d2d4b
2023-06-18 10:40:56 +02:00
Claire
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
c9d06d10d4
Fix non-interactive upload container being given a button role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Daniel M Brasil
d9c6f70cc6
Fix ArgumentError in /api/v1/admin/accounts/:id/action ( #25386 )
2023-06-14 15:21:36 +02:00
Eugen Rochko
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Claire
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
Eugen Rochko
bca649ba79
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
Eugen Rochko
39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
たいち ひ
3b5e302f7f
Rewrite emoji_mart_data_light as TS ( #25138 )
2023-06-13 19:28:31 +02:00
alfe
a86886b1fd
Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
Renaud Chaput
1cb4514d0e
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Eugen Rochko
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
Plastikmensch
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
2023-06-11 13:33:45 +02:00
alfe
dfaf59d99a
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
Eugen Rochko
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
20718a8b59
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
Claire
42a0898f16
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
Claire
34efd1a24c
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +02:00
Claire
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
Eugen Rochko
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
2023-06-10 17:10:06 +02:00
alfe
83ae40e192
[Glitch] Rewrite <LoadMore /> as FC and TS
...
Port fb5bf5cbf8
2023-06-10 16:59:25 +02:00
Claire
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
88c5ad3136
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 1483a3ddfe
2023-06-10 16:38:03 +02:00
S.H
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
2023-06-10 16:37:20 +02:00
Claire
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
2023-06-10 16:36:54 +02:00
Darius Kazemi
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
2023-06-10 16:36:15 +02:00
Claire
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
2023-06-10 16:30:36 +02:00
Jed Fox
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
2023-06-10 16:29:48 +02:00
Claire
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Renaud Chaput
9e66c07be7
[Glitch] Fix /share and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
2023-06-10 16:18:01 +02:00
Claire
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
S.H
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
2023-06-10 15:21:04 +02:00
Claire
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
2023-06-10 15:10:24 +02:00
Claire
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Renaud Chaput
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
Christian Schmidt
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
Claire
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
Renaud Chaput
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko
4c9406bdb0
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
Matt Jankowski
75e299f440
Remove unused redis_info method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
jsgoldstein
18f092d927
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
Eugen Rochko
67d17ce194
Add legal as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
Nick Schonning
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
alfe
fb5bf5cbf8
Rewrite <LoadMore /> as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
Claire
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
Eugen Rochko
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
Eugen Rochko
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
Matt Jankowski
af135bddd0
Update Admin::Metrics::Measure classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
Claire
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
Matt Jankowski
3b21c13dcc
Rails 7 compatibility fix for Admin::Metrics::Dimension classes ( #25277 )
2023-06-05 16:52:33 +02:00
S.H
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +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
5e876c2901
[Glitch] Fix null signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
y.takahashi
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
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
Matt Jankowski
0daf78f903
Add allow_other_host: true to backups controller ( #25266 )
2023-06-05 08:22:03 +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
Jed Fox
768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +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
Claire
94329f28e1
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +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
Claire
8884d1ece0
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
S.H
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
Matt Jankowski
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
Claire
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Claire
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
Claire
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +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
Matt Jankowski
00c222377d
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
Renaud Chaput
b7d995cb00
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
Claire
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +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
S.H
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +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
646cde71d1
Change captcha to be presented even for invited users ( #2227 )
2023-05-25 20:13:18 +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
Claire
1d588d58f1
Improve various queries against account domains ( #25126 )
2023-05-25 09:27:16 +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
dfa5889fc0
Change Identity to not destroy associated User on destroy ( #25098 )
2023-05-23 15:00:36 +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
Claire
9017df7178
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2023-05-23 14:27:37 +02:00
Claire
fea0830614
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2023-05-23 14:27:17 +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
Matt Jankowski
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
Matt Jankowski
0664704cd9
Fix Performance/StartWith cop ( #24818 )
2023-05-23 10:16:50 +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
Daniel M Brasil
785e650ab4
Fix uncaught TypeError in POST /api/v1/featured_tags ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-22 19:14:54 +02:00
Daniel M Brasil
45d98959ac
Fix uncaught NoMethodError in POST /api/v1/featured_tags ( #25063 )
2023-05-22 18:11:28 +02:00
Claire
2a61f14753
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2023-05-22 17:38:05 +02:00
Renaud Chaput
8d6aea3326
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
Claire
e13d2edd47
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2023-05-22 14:03:38 +02:00
Daniel M Brasil
ce8b5899ae
Fix POST /api/v1/admin/domain_allows returning 200 when no domain is specified ( #24958 )
2023-05-22 13:44:49 +02:00
Emelia Smith
19f9098551
Allow reports with long comments from remote instances, but truncate ( #25028 )
2023-05-22 13:15:21 +02:00
Nick Schonning
23a4ecf444
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
Claire
7bb8030cc1
Change OpenGraph-based embeds to allow fullscreen ( #25058 )
2023-05-22 12:25:56 +02:00
Frankie Roberto
36a77748b4
Order sessions by most-recent to least-recently updated ( #25005 )
2023-05-22 11:40:00 +02:00
Nick Schonning
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
Essem
5fd8d1e417
Fix oversight in backup service ( #25034 )
2023-05-19 11:27:10 +02:00
Claire
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
Claire
45ba9ada34
Fix race condition when reblogging a status ( #25016 )
2023-05-17 00:09:21 +02:00
Claire
5cd55d8aaf
Fix being able to vote on your own polls ( #25015 )
2023-05-17 00:08:42 +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
Claire
3ed3d54bf3
Fix reports not being closed when performing batch suspensions ( #24988 )
2023-05-16 14:56:49 +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
Daniel M Brasil
433ab0c9a3
Fix uncaught NoMethodError error in /api/v1/admin/canonical_email_blocks/test ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-12 13:46:16 +02:00
Claire
9015c2d646
Change profile updates to be sent to recently-mentioned servers ( #24852 )
2023-05-12 13:13:04 +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
Claire
6b0942d107
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2023-05-11 04:40:03 +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
たいち ひ
7c1305b3a4
Add TypeScript support for mastodon alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
たいち ひ
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
たいち ひ
a65d2d1045
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
たいち ひ
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
たいち ひ
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
Claire
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
Plastikmensch
179e38cf15
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
Claire
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire
9b59748679
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
Claire
6f64c79ca4
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
Claire
a6207d243b
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
fusagiko / takayamaki
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
Claire
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
mogaminsk
c9e040fb24
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
S.H
5811ccc611
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
zunda
c0ea33e3fc
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
Matt Jankowski
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
Nick Schonning
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
