eb1cb8224a
[Glitch] Use an Immutable Record as the root state
...
Port 78ba12f0bf
2023-07-02 11:55:34 +02:00
2ba4773ebe
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 9934949fc4
2023-07-02 11:55:08 +02:00
b75aa6b819
[Glitch] Remove the search button from UI header when logged out
...
Port 285a691936
2023-07-02 11:54:47 +02:00
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
ba06a2f104
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
5b46345459
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
50c2a03695
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
4fe2d7cb59
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
2023-07-02 00:05:44 +02:00
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
155fc459e3
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
683ba5ecb1
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
78ba12f0bf
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
a209d1e683
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
4581a528f7
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
285a691936
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
c43cfd2406
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ae30a60b1f
2023-06-27 13:25:21 +02:00
4faa4eb3c4
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 65aa04647a
2023-06-27 13:21:55 +02:00
2f996375e5
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 2b78c07ef1
2023-06-27 13:21:14 +02:00
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
c7c6f02ae6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
0ccf6c0eb7
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
7a25af64dd
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
bb4756c823
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
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
ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
7b024baf50
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
5def74a436
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 0842a68532
2023-06-25 17:40:01 +02:00
6fb34258a4
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port 00ec43914a
2023-06-25 17:40:01 +02:00
7d160d2272
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port a8c1c8bd37
2023-06-25 17:40:01 +02:00
222713a768
[Glitch] Fix custom signup URL may not loaded
...
Port 8d2c26834f
2023-06-25 14:27:46 +02:00
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
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
55e7c08a83
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
69db507924
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
ec91ea4457
Fix missing validation on `default_privacy` setting ( #25513 )
2023-06-20 18:32:14 +02:00
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
c78280a8ce
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
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
e1c9d52e91
Reduce `sleep` time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
155ec185b2
Remove unused `picture_hint` helper method ( #25485 )
2023-06-19 09:04:15 +02:00
b9bc9d0bda
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
2023-06-19 08:53:05 +02:00
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
64f7a11658
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
3b04e39534
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port c9d06d10d4
2023-06-18 14:10:49 +02:00
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
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
9bf63257fb
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port a86886b1fd
2023-06-18 12:10:37 +02:00
0a212cfa7f
[Glitch] Add missing report category translation
...
Port 1cb4514d0e
2023-06-18 10:43:07 +02:00
cdec45eca9
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port dfaf59d99a
2023-06-18 10:42:04 +02:00
f815bd5fd9
[Glitch] Change "bot" label to "automated"
...
Port 432a5d2d4b
2023-06-18 10:40:56 +02:00
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
c9d06d10d4
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
d9c6f70cc6
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
2023-06-14 15:21:36 +02:00
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
bca649ba79
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
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
a86886b1fd
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
1cb4514d0e
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
2023-06-11 13:33:45 +02:00
dfaf59d99a
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
20718a8b59
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
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
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
2023-06-10 17:43:13 +02:00
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
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
2023-06-10 17:10:06 +02:00
83ae40e192
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port fb5bf5cbf8
2023-06-10 16:59:25 +02:00
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
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
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
2023-06-10 16:37:20 +02:00
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
2023-06-10 16:36:54 +02:00
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
2023-06-10 16:36:15 +02:00
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
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
2023-06-10 16:29:48 +02:00
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
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
2023-06-10 16:18:01 +02:00
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
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
2023-06-10 15:21:04 +02:00
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
2023-06-10 15:10:24 +02:00
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
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
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
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
4c9406bdb0
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
18f092d927
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
67d17ce194
Add `legal` as report category ( #23941 )
2023-06-06 23:41:59 +02:00
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
fb5bf5cbf8
Rewrite `<LoadMore />` as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
af135bddd0
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
3b21c13dcc
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
2023-06-05 16:52:33 +02:00
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
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
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
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
0daf78f903
Add `allow_other_host: true` to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
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
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
94329f28e1
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +02:00
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
5fae2de454
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
8884d1ece0
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +02:00
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
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
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
00c222377d
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
b7d995cb00
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +02:00
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
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +02:00
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
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
0009b4b574
[Glitch] Update inconsistent `defaultMessage`
...
Port e58c36d308
2023-05-28 17:14:31 +02:00
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
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
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
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
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
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
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
2023-05-28 15:09:28 +02:00
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
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
2023-05-28 14:56:24 +02:00
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
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
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2023-05-25 23:52:04 +02:00
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
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
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
2023-05-25 22:37:14 +02:00
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
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
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
2023-05-25 21:57:19 +02:00
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
2023-05-25 21:52:37 +02:00
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
2023-05-25 21:47:48 +02:00
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2023-05-25 21:07:38 +02:00
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2023-05-25 20:57:42 +02:00
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2023-05-25 20:57:07 +02:00
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2023-05-25 20:44:09 +02:00
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
646cde71d1
Change captcha to be presented even for invited users ( #2227 )
2023-05-25 20:13:18 +02:00
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
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
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
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
1d588d58f1
Improve various queries against account domains ( #25126 )
2023-05-25 09:27:16 +02:00
e58c36d308
Update inconsistent `defaultMessage` ( #25114 )
2023-05-24 12:38:50 +02:00
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
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
d27216dc46
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
dfa5889fc0
Change Identity to not destroy associated User on destroy ( #25098 )
2023-05-23 15:00:36 +02:00
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
9017df7178
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2023-05-23 14:27:37 +02:00
fea0830614
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2023-05-23 14:27:17 +02:00
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
8f66126b10
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
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
711a037660
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
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
45d98959ac
Fix uncaught NoMethodError in POST `/api/v1/featured_tags` ( #25063 )
2023-05-22 18:11:28 +02:00
2a61f14753
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2023-05-22 17:38:05 +02:00
8d6aea3326
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
e13d2edd47
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2023-05-22 14:03:38 +02:00
ce8b5899ae
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
2023-05-22 13:44:49 +02:00
19f9098551
Allow reports with long comments from remote instances, but truncate ( #25028 )
2023-05-22 13:15:21 +02:00
23a4ecf444
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
7bb8030cc1
Change OpenGraph-based embeds to allow fullscreen ( #25058 )
2023-05-22 12:25:56 +02:00
36a77748b4
Order sessions by most-recent to least-recently updated ( #25005 )
2023-05-22 11:40:00 +02:00
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
5fd8d1e417
Fix oversight in backup service ( #25034 )
2023-05-19 11:27:10 +02:00
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
45ba9ada34
Fix race condition when reblogging a status ( #25016 )
2023-05-17 00:09:21 +02:00
5cd55d8aaf
Fix being able to vote on your own polls ( #25015 )
2023-05-17 00:08:42 +02:00
bec6a1cad4
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
e60414792d
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
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
aa4c9730f6
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
3ed3d54bf3
Fix reports not being closed when performing batch suspensions ( #24988 )
2023-05-16 14:56:49 +02:00
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
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
9015c2d646
Change profile updates to be sent to recently-mentioned servers ( #24852 )
2023-05-12 13:13:04 +02:00
5241f7b2fd
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
b8a2430642
Fix Onboarding Errors ( #24883 )
2023-05-11 07:55:10 +02:00
6b0942d107
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2023-05-11 04:40:03 +02:00
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
0eed06073f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
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
6f8db56a01
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2023-05-09 23:28:40 +02:00
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2023-05-09 23:20:57 +02:00
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2023-05-09 23:16:23 +02:00
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
349cae0b57
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
ab7716cff4
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
0fff2b67de
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
5f2071d055
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-05-09 22:56:26 +02:00
b509b96504
[Glitch] Enforce React Rules of Hooks with eslint
...
Port d9b93bd15e
2023-05-09 22:28:53 +02:00
108720d7b0
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 955179fc55
2023-05-09 22:28:53 +02:00
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
42bdc2add9
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
8e806b6e88
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
6415981056
[Glitch] Mark `wheel` events on scrollable list as passive
...
Port 89269e4b71
2023-05-09 20:42:07 +02:00
f94eb65cf9
[Glitch] Rewrite Domain component as function component
...
Port 9818f34273
2023-05-09 20:33:58 +02:00
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
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
51b83ed195
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
6aeb162927
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
e1f466fbbe
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
224d458f7e
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
a3a2414f0e
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
6579e3af7d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
c8181eb0a4
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
d9b93bd15e
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
955179fc55
Dont use CommonJS (`require`, `module.exports`) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
89269e4b71
Mark `wheel` events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
2023-05-08 22:15:00 +02:00
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
2023-05-08 22:15:00 +02:00
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2023-05-08 22:15:00 +02:00
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2023-05-08 22:15:00 +02:00
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2023-05-08 22:15:00 +02:00
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
2023-05-08 22:15:00 +02:00
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
2023-05-08 22:15:00 +02:00
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
2023-05-08 22:15:00 +02:00
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2023-05-08 21:09:49 +02:00
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2023-05-08 21:09:49 +02:00
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2023-05-08 21:09:49 +02:00
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
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
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
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
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
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
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
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
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
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
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
9b59748679
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
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
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
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
c9e040fb24
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
5811ccc611
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
c0ea33e3fc
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
c3c7d59072
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2023-05-04 10:13:00 +02:00
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
27bafabb64
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
d5a185d721
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
08fb9d300a
Spec coverage for settings/preferences/* controllers ( #24825 )
2023-05-04 05:44:27 +02:00
2c6c398c60
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
a2a22bad23
Fix various edge cases with local moves ( #24812 )
2023-05-03 19:19:25 +02:00
1e75eb690d
Fix own posts not getting delivered to own lists ( #24810 )
2023-05-03 19:17:40 +02:00
45579a26cf
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
0999cb4601
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
c98b012583
Change Move handler to also move list memberships ( #24808 )
2023-05-03 14:03:38 +02:00
9a52a7f7a0
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
e38b391940
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
8b636a29c6
Improve automatic post cleanup worker performances ( #24785 )
2023-05-03 10:31:40 +02:00
a0c9f2447e
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
9c1929efad
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
d37c0a1060
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
668a19a2f3
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
8227af8dcc
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
b5c4b47746
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
38b2974a83
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
f1c1dd0118
Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
a7df578f97
ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )
2023-05-02 18:10:39 +02:00
bae694108a
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
9189e90ff2
Add fallback redirection when getting a webfinger query `LOCAL_DOMAIN@LOCAL_DOMAIN` ( #23600 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-05-02 17:42:42 +02:00
5e060e1f44
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
a89b02af92
Check domain suspensions before trying to fetch resources ( #24535 )
2023-05-02 15:22:19 +02:00
b233da5996
Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )
2023-05-02 15:09:43 +02:00
8131a5b330
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
6693a4fe7c
Change lists to be able to include accounts with pending follow requests ( #19727 )
2023-05-02 14:40:36 +02:00
598e63dad2
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
88d33f361f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
f50105779b
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
5a5975d7f7
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
32a030dd74
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
fc56eda94b
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
15fd712464
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
81f75b1e0e
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
d902a707a3
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
af824db398
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
fa14976a5d
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-04-30 15:45:02 +09:00
bdc74086e6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
6e226f5a32
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
678d836c7d
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
cf1bc4bb93
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
f22b4e556c
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
bfeccf6748
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
e79998a11a
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2023-04-29 18:54:13 +02:00
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2023-04-29 12:21:44 +02:00
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2023-04-29 12:17:06 +02:00
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2023-04-29 11:34:44 +02:00
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2023-04-29 11:28:24 +02:00
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2023-04-29 11:14:43 +02:00
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2023-04-29 11:12:35 +02:00
66bda4713e
[Glitch] Allow `==` when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
2a3a110f00
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
a5bc4ea550
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2023-04-28 07:50:31 +02:00
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2023-04-26 21:30:41 +02:00
91a8cd21d8
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
b0bf6216e6
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
62ab7506d6
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +02:00
1527b02c6d
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
1419f90ef2
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +02:00
678480d4d3
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
aea7866161
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
276c39361b
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
2023-04-25 16:51:38 +02:00
6084461cd0
Change unauthenticated responses to be cached in REST API ( #24348 )
2023-04-25 15:41:34 +02:00
c35e3cb6ac
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
8099ba04be
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2023-04-25 06:33:21 +02:00
e9a79d46cd
Fix crash when SSO_ACCOUNT_SETTINGS is not defined ( #24628 )
2023-04-24 20:26:04 +02:00
804aa8d501
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
2daa5a1549
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
290e4aba31
Add lines to threads in web UI ( #24549 )
2023-04-24 08:07:03 +02:00
5141697323
Remove `tai` locale ( #23880 )
2023-04-23 22:49:07 +02:00
ef3675d688
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
0a5f0a8b20
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
e1b4eeb636
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2023-04-23 22:33:08 +02:00
e713c545b8
Use CSS to trim long card descriptions ( #24265 )
2023-04-23 22:32:47 +02:00
58a1b2e330
Fix caching logic with regards to Accept-Language, Cookie, and Signature ( #24604 )
2023-04-23 22:27:24 +02:00
5dc3173ef8
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly ( #24607 )
2023-04-23 22:25:40 +02:00
0461f83320
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
5b58ebb04f
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
9d75b03ba4
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
9ef32ea570
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port ab740f464a
2023-04-22 11:28:23 +02:00
799e9917e4
[Glitch] Rewrite GIFV component with React hooks
...
Port cf3fa1e814
2023-04-22 11:22:49 +02:00
6ea9137233
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 955ec252a4
2023-04-22 10:47:44 +02:00
bc7b3399fb
[Glitch] Fix crash when trying to open the filter modal
...
Port bc4745f482
2023-04-22 10:20:50 +02:00
2f3dffb057
[Glitch] Add progress indicator to sign-up flow
...
Port e5c0b16735
2023-04-22 10:18:20 +02:00
a21a875dba
[Glitch] Fix status title for statuses without text
...
Port f05fb51ecb
2023-04-22 10:16:20 +02:00
f2797276b2
[Glitch] typo: collapsable -> collapsible
...
Port d02aa274be
2023-04-22 10:13:58 +02:00
abfdafef1e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
501d6197c4
Change automatic post deletion thresholds and load detection ( #24614 )
2023-04-21 18:14:19 +02:00
fbb4de3dbc
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
b0eba1a060
Minor clean up and optimization of the automatic post deletion code ( #24613 )
2023-04-21 16:53:50 +02:00
37886c28da
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
c1a7e38d2b
Allow `==` when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
e98c86050a
Refactor `Cache-Control` and `Vary` definitions ( #24347 )
2023-04-19 16:07:29 +02:00
4db8230194
Add trend management to admin API ( #24257 )
2023-04-18 11:33:30 +02:00
bc75e62ca6
Change moderation search an account using the username with @ ( #24242 )
2023-04-17 14:16:36 +02:00
ab740f464a
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
85b1b45820
Fix crash in NotifyService when trying to send an email notification for polls ( #24558 )
2023-04-17 13:13:36 +02:00
4601e0dcbb
Add user handle to notification mail recipient address ( #24240 )
...
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
2023-04-17 11:06:06 +02:00
bc4745f482
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
9f8d34620b
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
34f8e696e2
[Glitch] Change all components to use the same error page in web UI
...
Port cee357d538
2023-04-16 18:20:51 +02:00
a3c05640f7
[Glitch] Add “In Memoriam” banner back to profiles
...
Port 86ad43173f
2023-04-16 18:02:16 +02:00
cb0562f32c
[Glitch] Fix tab arrows on RTL layouts
...
Port af49d93fd6
2023-04-16 17:58:32 +02:00
f9a9f9344b
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
f28942cef9
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port babd86e59445848d6547
2023-04-16 17:45:18 +02:00
0cbd579ef0
New Crowdin updates ( #2172 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
2023-04-16 17:25:43 +02:00
cf3fa1e814
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
e5c0b16735
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
955ec252a4
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
f05fb51ecb
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
d02aa274be
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
bed63f6dae
Fix default content type setting not applying ( #2176 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +02:00
af49d93fd6
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
8f0b0435ab
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
86ad43173f
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
c5eba06d8c
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
f53d009778
Refactor `Status._insert_record` slightly and tighten the test around reblogs of discarded statuses ( #24516 )
2023-04-12 12:47:05 +02:00
cee357d538
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
aca2cd1528
fixed typo in a constant name ( #24511 )
2023-04-12 10:06:57 +02:00
63a39ae2fa
Run `yarn manage:translations`
2023-04-09 15:56:31 +02:00
c11e69f33a
Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`
2023-04-09 15:53:45 +02:00
bfe46d08f9
[Glitch] Ensure tabIndex is number instead of string
...
Port ec0c104bf2
2023-04-09 14:47:29 +02:00
53cdcce3d1
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port 9ef9974ff2
2023-04-09 12:10:01 +02:00
b756e49cf1
[Glitch] Enable Stylelint property-no-unknown
...
Port cd14f712ad
2023-04-09 12:05:55 +02:00
7b04c2fb71
[Glitch] Fix tooltip for dates without time
...
Port aa136cf2fa
2023-04-09 12:04:17 +02:00
5b88b7e81a
[Glitch] Remove Array.prototype.includes polyfill
...
Port c0886dee14
2023-04-09 12:03:11 +02:00
df6602ede1
[Glitch] Fix account header image missing in low-res
...
Port d7b8c6db7e
2023-04-09 12:01:55 +02:00
74c61b05ae
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port ffd5b2eea4
2023-04-09 12:01:11 +02:00
791e712a80
[Glitch] Update display_media typing to string
...
Port 17b2fd2177
2023-04-09 12:00:26 +02:00
f3f7ef2d13
[Glitch] Set marginRight as string
...
Port 927b2fd138
2023-04-09 11:59:42 +02:00
358e4067bb
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port ab3f23da91
2023-04-09 11:58:45 +02:00
0f62451424
[Glitch] HTML string attributes set as booleans
...
Port a425915ce7
2023-04-09 11:56:02 +02:00
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
10469a0b85
Move locale-data back to `app/javascript/mastodon/locales/locale-data` ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
99e3e152cd
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
c3a8f6a0a3
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
aa136cf2fa
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
9ef9974ff2
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
d193bc8c5c
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
c0886dee14
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
d7b8c6db7e
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
9d08b81193
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
ffd5b2eea4
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
17b2fd2177
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
927b2fd138
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
ab3f23da91
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
cd14f712ad
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
45848d6547
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
ec0c104bf2
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
a425915ce7
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2023-04-04 12:51:24 +02:00
d13ef49b15
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
0e919397db
Fix unescaped user input in LDAP query ( #24379 )
2023-04-04 12:42:38 +02:00
fa98363a27
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
8e19c44b2c
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
d29cf8a044
[Glitch] Add colour to follow button when hashtag is being followed
...
Port 77bd32a26a
2023-04-03 18:07:34 +02:00
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
77bd32a26a
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
373e4a8ff0
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
4520e6473a
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
7b15f4006a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
2b11376411
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
46483ae849
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
d5ad8b6422
Fix Redis client and type errors introduced in #24285 ( #24342 )
2023-04-01 08:28:35 +02:00
d874a7a10f
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port 74f56c64fc
2023-03-31 22:50:57 +02:00
a8f0592b72
[Glitch] Move marky to devDependency
...
Port ddb769f0b8
2023-03-31 22:50:57 +02:00
3dcba94e68
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
280fa3b2c0
Fix invalid/expired invites being processed on sign-up ( #24337 )
2023-03-31 21:42:28 +02:00
01d6f7529f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
7646ad8a2b
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
b4f38edf74
Wrong type for user setting when default is defined by lambda ( #24321 )
2023-03-31 07:33:17 +02:00
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
74f56c64fc
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
9c84563008
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
eb38e9df31
Requeue expiration notification ( #24311 )
2023-03-29 10:52:40 +02:00
e084b5b82d
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
ddb769f0b8
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
cf12621e37
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
babd86e594
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
88fc04d3d7
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
2023-03-27 08:51:57 +02:00
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
2023-03-26 15:49:49 +02:00
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
63a6808ee1
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
0663803348
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
e633b26f4f
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
e63524f457
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
ef127c964a
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
2626097869
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
8f97ffe91e
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
bd047acc35
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
630436ab2d
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2023-03-16 04:33:38 +01:00
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2023-03-15 09:33:14 +01:00
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
9875be09fe
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
1d0ad558ff
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2023-03-15 03:45:15 +01:00
d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
a52ccd7ad9
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
684a970b3c
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
dfa1be4ab4
Remove unused TOCGenerator ( #23986 )
2023-03-06 17:33:58 +01:00
8770473dbb
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
21db91a0a8
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
86f8aa2db2
Fix unconfirmed accounts being registered as active users ( #23803 )
2023-03-06 16:00:08 +01:00
c4cf92094e
Do not strip tags from `Setting.site_short_description` ( #23975 )
2023-03-06 15:37:19 +01:00
7f3b0dedeb
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
1317553f3a
[Glitch] Only offer translation for supported languages
...
Port 5a8c651e8f
2023-03-05 21:19:04 +01:00
9a1bd1c3e9
[Glitch] Switched bookmark and favourites around
...
Port a1347f456e
2023-03-05 21:07:55 +01:00
03ac84b0f4
[Glitch] Fix duplicate “Publish” button on mobile
...
Port b55fc883b6
2023-03-05 21:07:10 +01:00
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
bb4e211c86
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
0e476f3c4f
[Glitch] Add `lang` attribute to media and poll options
...
Port d3eefead30
2023-03-05 17:52:53 +01:00
82a6cf4012
Enable Rubocop for app/views ( #23874 )
2023-03-05 00:33:52 +01:00
cb868228bd
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
7f4412eeeb
User mailer spec coverage improvements ( #23905 )
2023-03-04 17:16:11 +01:00
c40d5e5a8f
Misc coverage improvements for validators ( #23928 )
2023-03-04 17:00:00 +01:00
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
b00f945d92
Remove implied StandardError rescue ( #23942 )
2023-03-03 22:49:16 +01:00
050f1669c6
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2023-03-03 21:13:55 +01:00
ddde4e0d95
Change `ActivityPub::DeliveryWorker` retries to be spread out more ( #21956 )
2023-03-03 21:08:22 +01:00
5a8c651e8f
Only offer translation for supported languages ( #23879 )
2023-03-03 21:06:31 +01:00
6b16b77ab0
Fix external authentication not running onboarding code for new users ( #23458 )
2023-03-03 20:45:55 +01:00
d6679d1751
Add mail headers to avoid auto-replies ( #23597 )
2023-03-03 20:44:46 +01:00
f94aa70b81
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2023-03-03 20:44:02 +01:00
a1347f456e
Switched bookmark and favourites around ( #23701 )
2023-03-03 20:37:49 +01:00
f8bb4d0d6b
Fix server error when failing to follow back followers from `/relationships` ( #23787 )
2023-03-03 20:36:18 +01:00
b55fc883b6
Fix duplicate “Publish” button on mobile ( #23804 )
2023-03-03 20:25:36 +01:00
c2a046ded1
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2023-03-03 20:25:15 +01:00
3a6451c867
Add support for incoming rich text ( #23913 )
2023-03-03 20:19:29 +01:00
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
af578e8ce0
Fix deprecation warning about merging conditions ( #23618 )
2023-03-02 16:21:04 +01:00
b6602f68eb
Spec coverage for HomeHelper ( #23907 )
2023-03-02 10:04:14 +01:00
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
56489cdc4f
Autofix Rubocop Style/HashConversion ( #23852 )
2023-02-28 22:59:19 +09:00
cc3633539e
Remove unused admin/announcements helper ( #23899 )
2023-02-28 11:56:50 +01:00
055ed5a616
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2023-02-27 19:03:35 +01:00
4bb39ac3c3
Fix single-record invalid condition on PollVote ( #23810 )
2023-02-27 09:31:15 +01:00
d3eefead30
Add `lang` attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
b632c5a55a
[Glitch] Add `lang` attribute to preview card
...
Port 8000a8f230
2023-02-25 14:43:57 +01:00
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2023-02-25 14:43:24 +01:00
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2023-02-25 14:40:29 +01:00
31455f05fb
[Glitch] Add `lang` tag to native language names in language picker
...
Port 7207a98d39
2023-02-25 14:37:05 +01:00
81ef21a0c8
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
859eb01aac
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
4ed09276d5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
730bb3e211
Remove unused HTML Validator ( #23866 )
2023-02-24 20:06:32 +01:00
8000a8f230
Add `lang` attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
20b80c62ff
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2023-02-23 16:52:40 +01:00
f4f91bc295
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
f682478de8
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2023-02-22 11:53:13 +01:00
4ff44be134
Autofix Rubocop Rails/Blank ( #23765 )
2023-02-22 09:57:56 +09:00
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2023-02-22 09:54:36 +09:00
7adde24a95
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
7207a98d39
Add `lang` tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
434770f580
Autofix Rubocop Rails/FindById ( #23762 )
2023-02-21 10:21:48 +09:00
9909b4b653
Autofix Rubocop Rails/WhereEquals ( #23759 )
2023-02-21 03:20:56 +09:00
d3b4d4d4f3
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2023-02-20 11:32:27 +01:00
59c8d43d94
Autofix Rubocop Style/RescueStandardError ( #23745 )
2023-02-20 11:01:20 +01:00
62c4aecf8f
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
af4c95100c
Autofix Rubocop Style/FormatString ( #23743 )
2023-02-20 07:58:33 +01:00
717683d1c3
Autofix Rubocop remaining Layout rules ( #23679 )
2023-02-20 06:58:28 +01:00
d2dcb6c45a
Autofix Rubocop Style/UnpackFirst ( #23741 )
2023-02-20 06:51:43 +01:00
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2023-02-20 05:00:48 +01:00
63e6353886
Autofix Rubocop Rails/EnumHash ( #23737 )
2023-02-20 05:00:36 +01:00
44a7d87cb1
Rename JSX files with proper `.jsx` extension ( #23733 )
2023-02-20 03:20:59 +01:00
Renaud Chaput