a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
2023-12-20 19:49:44 +01:00
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
2023-12-20 19:49:44 +01:00
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
2023-12-20 19:49:44 +01:00
e94fecdcc8
[Glitch] Fix the `notificationsUpdate` call
...
Port f476d9dab2
2023-12-20 19:49:44 +01:00
79678cf841
[Glitch] Fixes website not loading for unlogged users
...
Port 6712bf86cd
2023-12-20 19:49:44 +01:00
7fe5623a27
[Glitch] Use Immutable `Record` for accounts in Redux state
...
Port 3bf2a7296e
2023-12-20 19:49:44 +01:00
3b7caa00e2
[Glitch] Add Typescript types for some API objects
...
Port 57f592fed5
2023-12-20 19:49:44 +01:00
a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8ebc94dd22
2023-12-20 19:48:45 +01:00
d29b1cca2e
Fix `friends_of_friends` sometimes suggesting already-followed accounts ( #28433 )
2023-12-20 14:35:59 +00:00
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-20 09:15:30 +00:00
b7cb17fecf
Fix the poll option add button attempting to submit a form ( #2530 )
2023-12-20 08:24:28 +01:00
9bfb699c4c
[Glitch] Change search popout to not list unusable search options when logged out
...
Port 6e70819840
2023-12-19 21:25:55 +01:00
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
7db68e2dca
[Glitch] Fix upper border radius of onboarding columns
...
Port 0a6ec048a8
2023-12-19 20:26:22 +01:00
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
94c4c7f330
[Glitch] Fix open status on media modal
...
Port 922f086253
2023-12-19 20:17:45 +01:00
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
cd1e3ac2c7
Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
Upstream refactored this code, the conflict was because of an extra supported
parameter, `allow_local_only`.
Updated the controller to follow upstream's refactor, and moved the extra
parameter definition accordingly.
2023-12-19 19:51:40 +01:00
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
2023-12-19 10:55:39 +00:00
7b1d390734
Fixes dropdown target without a `buttonRef` (edit history) ( #28427 )
2023-12-19 10:47:53 +00:00
fa987db738
New Crowdin Translations (automated) ( #28423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-19 09:40:37 +00:00
3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
2023-12-19 05:08:52 +00:00
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
2023-12-18 23:19:27 +00:00
7cfc078198
Fix rails mailer preview not honouring locale ( #28418 )
2023-12-18 21:49:17 +00:00
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
2023-12-18 20:59:33 +01:00
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
2023-12-18 19:15:57 +01:00
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
60eb57ce1b
Fix HAML listing issue
2023-12-18 19:07:15 +01:00
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
2023-12-18 18:49:48 +01:00
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
2023-12-18 18:42:30 +01:00
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
2023-12-18 18:42:07 +01:00
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
2023-12-18 13:20:08 +01:00
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
2023-12-18 10:26:09 +00:00
2bd8d343cf
Fix `Style/SoleNestedConditional` and `Style/IfInsideElse` cops, regenerate haml todo ( #28384 )
2023-12-18 10:06:42 +00:00
0e5b8fc46b
Fix `Style/RedundantReturn` cop ( #28391 )
2023-12-18 09:50:51 +00:00
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-18 08:25:21 +00:00
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
2023-12-17 18:03:22 +01:00
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
2023-12-17 17:59:33 +01:00
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
2023-12-17 17:50:31 +01:00
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
f62bafc7a1
Fix HAML linting issue
2023-12-17 16:37:11 +01:00
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
2023-12-15 15:52:00 +00:00
e17faedffb
Move default `meta` options from `InitialStateSerializer` to private method (AbcSize reduction) ( #28355 )
2023-12-14 14:04:55 +00:00
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-13 09:52:37 +00:00
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
2023-12-13 07:47:32 +00:00
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
2023-12-12 14:31:37 +00:00
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-12 11:45:10 +00:00
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
2023-12-12 10:39:21 +00:00
a8a5c6514f
Fix `LinkCrawlWorker` error when encountering empty OEmbed response ( #28268 )
2023-12-12 08:29:46 +00:00
2c6369918c
Fix `Style/RedundantArgument` cop ( #28321 )
2023-12-11 14:58:29 +00:00
f3864db409
Fix notification sounds ( #28316 )
2023-12-11 14:23:30 +00:00
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-11 08:22:52 +00:00
afc8550b63
Change preview card deletes to be done using batch method ( #28183 )
2023-12-11 07:49:10 +00:00
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
df5c64fe57
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
2023-12-09 21:19:43 +01:00
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
408d4710ed
Further reduce differences with upstream
2023-12-09 20:58:50 +01:00
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
2023-12-09 20:29:15 +01:00
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179eed1de7fb7fa9f8d34620b
2023-12-09 18:33:42 +01:00
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-08 09:52:32 +00:00
3918dc68c7
Use composite primary key for `PreviewCardsStatus` model ( #28208 )
2023-12-07 14:49:05 +00:00
da3d8aff79
Error handling for attachment batch delete process ( #28184 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-07 14:40:44 +00:00
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-07 09:38:44 +00:00
7593465c23
Fix error when processing link preview with an array as `inLanguage` ( #28252 )
2023-12-07 09:05:08 +00:00
ee83d5c760
Enable the eslint `react/no-unknown-property` rule ( #28217 )
2023-12-06 13:42:12 +00:00
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-06 08:52:55 +00:00
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-05 16:07:53 +00:00
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin ( #28235 )
2023-12-05 13:59:15 +00:00
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
2023-12-04 13:30:27 +01:00
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
2023-12-04 13:30:17 +01:00
a2bcfeb887
Fix `Style/HashEachMethods` cop in HAML files ( #28178 )
2023-12-04 09:09:43 +00:00
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
2023-12-03 20:57:42 +01:00
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
2023-12-03 19:39:08 +01:00
9ac73a1fbf
[Glitch] Change `eslint` config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
2023-12-03 16:44:40 +01:00
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
2023-12-03 16:38:41 +01:00
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
2023-12-03 16:38:41 +01:00
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
2023-12-03 16:38:41 +01:00
046cb408b7
[Glitch] Fix front-end bug when processing relationship-related account actions
...
Port 287520453c
2023-12-03 13:19:10 +01:00
c3a0d5aca3
[Glitch] Fix Redux types
...
Port 0712cc2b99
2023-12-03 13:19:10 +01:00
6fb5fafd28
[Glitch] Convert `actions/account_notes` into Typescript
...
Port bd06c13204
2023-12-03 13:19:10 +01:00
ee58f680e8
[Glitch] Fix autocomplete suggestions being cut off in compose form
...
Port 6833732852
2023-12-03 11:23:12 +01:00
6269a5336f
[Glitch] Change composer highlight border size to be more noticeable
...
Port aa4c9730f6
2023-12-03 11:23:12 +01:00
204fe83fcc
[Glitch] Fix compose textarea scroll behavior
...
Port 746979f75d
2023-12-03 11:23:12 +01:00
a8f6a5b40f
Update translation strings
2023-12-03 11:23:12 +01:00
786b42e2b5
Fix SCSS and JS linting issues
2023-12-03 11:23:12 +01:00
a0943b8f6d
Remove glitch-soc's old onboarding modal
2023-12-03 11:23:12 +01:00
6dc812dd51
[Glitch] Upgrade to react-router v5 in onboarding code
...
Port 1b70d7ed7c
2023-12-03 11:23:12 +01:00
06e819537b
[Glitch] Change labels and styles on the onboarding screen in web UI
...
Port a985d587e1
2023-12-03 11:23:12 +01:00
d5bad93460
[Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI
...
Port 4a5464f360
2023-12-03 11:23:12 +01:00
c2c25122e8
[Glitch] Rewrite <Check /> as FC
...
Port 6fdbee240c
2023-12-03 11:23:12 +01:00
a1667ba796
[Glitch] Upgrade react-intl usage in onboarding code
...
Port remaining of 44cd88adc4
2023-12-03 11:23:12 +01:00
e47c582283
Fix import order
2023-12-03 11:23:12 +01:00
ba4c8a9b41
[Glitch] Use the new JSX transform in onboarding code
...
Port the remaining of 8f66126b10
2023-12-03 11:23:12 +01:00
6e4497ab2d
[Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email
...
Port 52d36f0f98
2023-12-03 11:23:12 +01:00
1cb8df655b
[Glitch] Fix Onboarding Errors
...
Port b8a2430642
2023-12-03 11:23:12 +01:00
0b1556b7f7
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-12-03 11:23:12 +01:00
542f2fb1e0
[Glitch] Add default post text to onboarding flow in web UI
...
Port 8979b70975
2023-12-03 11:23:12 +01:00
e0b401e295
[Glitch] Add more tips to onboarding flow in web UI
...
Port c35e3cb6ac
2023-12-03 11:23:12 +01:00
4537b4b961
[Glitch] Add new onboarding flow to web UI
...
Port 0461f83320
2023-12-03 11:23:12 +01:00
335cfab32f
Change account note design to match upstream's ( #2495 )
2023-12-03 11:22:38 +01:00
f1241b4a3a
Fix translation string for `status.favourite` not having been changed everywhere ( #2494 )
2023-12-03 09:51:29 +01:00
edd96ce786
Merge pull request #2492 from ClearlyClaire/glitch-soc/painful-backports
...
Port account rows design change from upstream
2023-12-03 09:51:07 +01:00
21df2a68ac
Hide followers count when hidden by instance or user
2023-12-02 17:38:07 +01:00
09062d393f
Fix more styling issues
2023-12-02 17:38:07 +01:00
28d4f3ab70
Fix account component styling wrt. upstream
2023-12-02 17:05:54 +01:00
dc917cfcdf
[Glitch] Fix account.jsx imports ( #25541 )
...
Port remaining part of e0d230fb3720e85c0e839d45a444f9
2023-12-02 16:59:40 +01:00
17372a3ec0
[Glitch] Change labels and styles on the onboarding screen in `Account` component
...
Partial port of a985d587e1
2023-12-02 16:59:40 +01:00
0421b44f22
[Glitch] Change follow button in account row to be more obvious in web UI ( #24956 )
...
Port 0ddc895282
2023-12-02 16:59:40 +01:00
f1691eca55
[Glitch] Fix overflow behavior of account rows
...
Port 5fae2de454
2023-12-02 16:59:40 +01:00
98a7b95058
[Glitch] Update inconsistent `defaultMessage` in `Account` component
...
Partial port of e58c36d308
2023-12-02 16:59:40 +01:00
b047b981cd
[Glitch] Enforce import order with ESLint
...
Port d27216dc46
2023-12-02 16:59:40 +01:00
b8cbaba283
[Glitch] Split `EmptyAccount` out of `Account` component
...
Partial port of b8a2430642
2023-12-02 16:59:40 +01:00
32ec0d2472
[Glitch] Fix verified badge in account lists potentially including rel="me" links
...
Port 55e7c08a83
2023-12-02 16:59:40 +01:00
e7ec2641a0
[Glitch] Fix linting issues with VerifiedBadge component
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
2efb22f455
[Glitch] Rewrite VerifiedBadge component as function component
...
Port 140aa6b054
2023-12-02 16:59:40 +01:00
00db5c8ade
[Glitch] Split VerifiedBadge from Account component
...
Partial port of 0461f83320
2023-12-02 16:59:40 +01:00
e0aba64a64
[Glitch] Fix regressions from change in account row design in web UI
...
Port 46483ae849
2023-12-02 16:59:40 +01:00
a262f990f8
Change design of account rows in web UI ( #24247 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
73a94c3b3f
Fix self-destruct page not using theme styles ( #2490 )
2023-12-02 14:54:35 +01:00
5b0382abc5
Remove redundant asset preload ( #2488 )
...
* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-12-02 14:54:26 +01:00
3bc437b99a
Fix `Style/RedundantParentheses` cop ( #28176 )
2023-12-01 16:00:44 +00:00
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
2023-12-01 15:53:35 +00:00
d83d01eb1e
Fix `Lint/RedundantSafeNavigation` cop ( #28172 )
2023-12-01 15:52:56 +00:00
f70f39dd04
Add explicit `dependent: nil` to associations ( #28169 )
2023-12-01 15:52:47 +00:00
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
963354978a
Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases ( #28053 )
2023-11-30 15:43:26 +00:00
35deaaf90b
Reduce AbcSize complexity in `InitialStateSerializer` ( #27782 )
2023-11-30 15:41:26 +00:00
1f1c75bba5
File cleanup/organization in `controllers/concerns` ( #27846 )
2023-11-30 14:39:41 +00:00
e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )
2023-11-30 13:59:46 +00:00
b20af17a2c
Fix onboarding step descriptions being truncated on narrow screens ( #28021 )
2023-11-30 13:47:07 +00:00
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
2023-11-30 13:47:01 +00:00
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
2023-11-30 13:30:35 +00:00
7faa27e17d
Change dismissed banners to be stored server-side ( #27055 )
2023-11-30 11:45:54 +00:00
e48ecd2929
Remove `default_scope` from `Admin::ActionLog` ( #28026 )
2023-11-29 10:39:59 +00:00
291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )
2023-11-29 10:38:05 +00:00
72b7cd349c
Extract helper methods for form label in admin/ area views ( #27575 )
2023-11-29 10:06:19 +00:00
9b47c5d53c
Extract helper methods for labels from filters/_filter_fields ( #27574 )
2023-11-29 10:02:59 +00:00
186895fc88
Refactor, lint fix, and bug fix on admin/roles/form partial ( #27558 )
2023-11-29 10:00:52 +00:00
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-29 08:34:36 +00:00
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
2023-11-28 18:37:54 +00:00
3a7f10c3f1
Converted hashtag.jsx to TypeScript ( #27872 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-28 18:20:10 +00:00
1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript ( #27895 )
2023-11-28 17:47:55 +00:00
baf3b71e3b
Extract `path_without_format` private methd in accounts controller ( #28091 )
2023-11-28 09:17:26 +00:00
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-28 08:59:48 +00:00
9072896ae5
Avoid unnecessary i-var for account rss page url generation ( #28092 )
2023-11-28 08:19:08 +00:00
dfc7154767
Remove unused `cached_filtered_status_page` method from accounts controller ( #28090 )
2023-11-28 07:43:16 +00:00
2d536bb05f
Use `admin_mailer` layout with initial salutation ( #28085 )
2023-11-28 07:41:26 +00:00
10b879bd5e
nodeinfo: add instance name and description ( #28079 )
2023-11-28 00:51:22 +00:00
f1657e6d62
Clamp dates when serializing to Elasticsearch API ( #28081 )
2023-11-27 13:25:54 +00:00
9b8ba9b350
Remove unused `plain_mailer` layout ( #28065 )
2023-11-27 10:40:03 +00:00
97e677f993
Fix not all legal images showing in file picker when uploading custom emoji ( #28076 )
2023-11-27 10:06:48 +00:00
fad9343bab
New Crowdin Translations (automated) ( #28069 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-27 10:06:35 +00:00
b3581d1e2f
Fix @rails/ujs import on public.jsx ( #2482 )
...
Related: 8a131fb7bc
2023-11-24 17:40:31 +01:00
8521238677
New Crowdin Translations (automated) ( #28060 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-24 10:25:39 +00:00
3a24754229
Change GIF max matrix size error to explicitly mention GIF files ( #27927 )
2023-11-24 09:31:28 +00:00
6e70819840
Change search popout to not list unusable search options when logged out ( #27918 )
2023-11-24 09:27:54 +00:00
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
2023-11-23 10:00:09 +00:00
c810b197ad
New Crowdin Translations (automated) ( #28050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-23 09:34:50 +00:00
4be12791e6
Remove `default_scope` from `StatusEdit` class ( #28042 )
2023-11-23 09:26:11 +00:00
d3ed03fd6b
New Crowdin Translations (automated) ( #28036 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-22 15:48:12 +00:00
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
2023-11-22 15:39:34 +00:00
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
32319187ee
Fix error when muting users from Web UI ( #28016 )
2023-11-21 11:16:16 +00:00
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
2023-11-21 10:52:20 +00:00
3c3e0c25ef
New Crowdin Translations (automated) ( #28015 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-21 10:35:02 +00:00
f00fcda785
Reduce differences with upstream in `Account` component
2023-11-20 13:24:02 +01:00
9ab1aa15e9
Change `ReplyIndicator` implementation and markup to match upstream's
2023-11-20 13:24:02 +01:00
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:28 +00:00
d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit ( #27946 )
2023-11-20 09:08:22 +00:00
00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator ( #27945 )
2023-11-20 09:07:25 +00:00
8ceae2bce6
New Crowdin Translations (automated) ( #27966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-20 08:47:34 +00:00
0e9801443f
Change to single opt-in during profile setup in onboarding in web UI ( #27876 )
2023-11-17 10:37:04 +00:00
9c68741f46
New Crowdin Translations (automated) ( #27914 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-17 09:16:12 +00:00
d3ae5b21d2
Reduce code and markup discrepancies on reply indicator
2023-11-16 18:33:16 +01:00
e023acfd00
Remove unnecessary proptype discrepancy
2023-11-16 17:57:13 +01:00
0a6ec048a8
Fix upper border radius of onboarding columns ( #27890 )
2023-11-16 13:43:02 +00:00
c94bedf4e6
Use container queries to hide profile share button ( #27889 )
2023-11-16 11:59:45 +00:00
87696ea26e
Add prominent share/copy button on profiles in web UI ( #27865 )
2023-11-16 10:23:14 +00:00
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-16 10:08:22 +00:00
36f25ea067
Fix more import discrepancies
2023-11-15 22:50:23 +01:00
4101057b9a
Fix various code discrepancies
2023-11-15 22:50:23 +01:00
09a5a78527
Fix discrepancy for `autosuggest-emoji` class
2023-11-15 22:50:23 +01:00
f69f1e9429
Fix code discrepancies with upstream
2023-11-15 21:52:19 +01:00
d358a3cc61
Merge pull request #2468 from ClearlyClaire/glitch-soc/cleanup
...
Clean up some more and reduce unwarranted differences with upstream further
2023-11-15 21:49:50 +01:00
0d877a3076
[Glitch] Change compose form checkbox to native input with `appearance: none`
...
Port d3b4d4d4f3
2023-11-15 17:20:44 +01:00
e7b3598f04
No need to have a separate localStorage key for home instance
2023-11-15 17:16:21 +01:00
0c727a6790
Fix more import style discrepancies
2023-11-15 17:16:21 +01:00
50eb673494
Fix some markup discrepancies
2023-11-15 17:16:21 +01:00
349579e318
Fix more code discrepancies
2023-11-15 17:16:21 +01:00
1023c2f90b
Fix more whitespace and comment discrepancies
2023-11-15 17:16:21 +01:00
7e5d00720b
Merge pull request #2391 from ClearlyClaire/glitch-soc/port-upstream-hashtags
...
Port upstream's hashtag handling to glitch-soc
2023-11-15 17:15:21 +01:00
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
2023-11-15 14:18:43 +00:00
fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 13:14:51 +00:00
cd3a636b7f
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb1c6
2023-11-15 12:59:06 +01:00
6a8623588a
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
2023-11-15 12:56:58 +01:00
c226d00490
Fix interaction between CWs and hashtag bars
2023-11-15 12:56:58 +01:00
7ae45676c8
Fix hashtag bar styling
2023-11-15 12:56:58 +01:00
45690b01d1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-11-15 12:56:58 +01:00
fc514fa8c6
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-11-15 12:56:58 +01:00
18462ee4b6
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
2023-11-15 12:56:58 +01:00
2ce03420d6
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-11-15 12:56:58 +01:00
fe8d9f6221
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-11-15 12:56:58 +01:00
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-11-15 12:56:58 +01:00
3b210e093a
Fix more code style discrepancies
2023-11-15 12:53:21 +01:00
542d95c2bc
Fix import style discrepancy
2023-11-15 12:53:21 +01:00
8b24a9a507
Fix missed relative import discrepancy
2023-11-15 12:53:21 +01:00
b1f0457cb8
Fix whitespace and comment discrepancies
2023-11-15 12:53:21 +01:00
08ac91c40b
[Glitch] Fix follow relationships not loading after notifications fetch
...
Port 4f7f6b3922
2023-11-15 12:53:21 +01:00
103c0ca4f7
[Glitch] Hide loading bar on status interactions
...
Port eb2425b53b
2023-11-15 12:53:21 +01:00
21653beb30
Reduce more unwarranted differences with upstream
2023-11-15 12:53:21 +01:00
7b922c2d90
Reduce unwarranted differences with upstream
...
Ports part of 0758b00bfd897199910f
2023-11-15 12:53:21 +01:00
2f61b65b1e
Remove dead code
2023-11-15 12:53:11 +01:00
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
2023-11-15 12:52:30 +01:00
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
a97b722ad5
Reduce differences with upstream due to import style ( #2465 )
...
Fix relative / VS absolute style imports, and fix whitespace discrepancies
2023-11-15 12:01:51 +01:00
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-15 09:41:24 +00:00
922f086253
Fix open status on media modal ( #27867 )
2023-11-15 09:29:10 +00:00
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01:00
2b038b4f89
Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE ( #26576 )
2023-11-14 15:33:59 +00:00
7e1a77ea51
Add base class for `api/v1/timelines/*` controllers ( #27840 )
2023-11-14 14:53:31 +00:00
d562fb8459
Specs for minimal CSP policy in `Api::` controllers ( #27845 )
2023-11-14 14:34:30 +00:00
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-14 10:53:47 +00:00
1f8173ac5a
Extract private methods in api/v1/instances/domain_blocks ( #27844 )
2023-11-14 10:31:59 +00:00
4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )
2023-11-14 00:39:54 +00:00
b7807f3d84
Use `normalizes` to prepare `Webhook#events` value ( #27605 )
2023-11-13 22:47:44 +00:00
bd6da814b5
Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element
2023-11-13 13:20:51 -08:00
bac9e0b55d
Add variable delay before link verification of remote account links ( #27774 )
2023-11-13 16:17:05 +00:00
0945e25b8f
Add `Api::V1::Statuses::BaseController` base controller class ( #27794 )
2023-11-13 14:53:22 +00:00
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-13 14:39:45 +00:00
ed79713f3a
Fix modal content not being selectable ( #27813 )
2023-11-13 13:27:50 +00:00
07a4059901
Add support for invite codes in the registration API ( #27805 )
2023-11-13 13:27:00 +00:00
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-13 13:21:02 +00:00
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-10 13:07:04 +00:00
43e2f763b2
Extract crutches_active_mentions from FeedManager ( #27785 )
2023-11-10 12:47:38 +00:00
ac69f90098
Add `Api::V1::Instances::BaseController` base controller class ( #27797 )
2023-11-10 12:46:00 +00:00
7840c6b75b
Do not try to update an undefined video element ( #27798 )
2023-11-09 22:35:53 +00:00
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
2023-11-09 13:05:57 +00:00
9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )
2023-11-09 12:58:02 +00:00
ce1bd81c85
Reduce complexity in `StatusCacheHydrator` ( #27783 )
2023-11-09 09:53:44 +00:00
13c3e59601
Use helper method to build batched status edits in `admin/statuses/show` ( #27739 )
2023-11-08 13:04:52 +00:00
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-08 12:40:09 +00:00
7d6bcc0615
Remove unmatched `rubocop:enable` declaration ( #27769 )
2023-11-08 12:02:09 +00:00
d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )
2023-11-07 23:37:58 +00:00
27cbdc6f22
Change alt text to empty string for avatars ( #21875 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-07 21:46:08 +00:00
58f01a5c9a
Add volume saving/reuse to video player ( #27488 )
2023-11-07 18:15:38 +00:00
f476d9dab2
Fix the `notificationsUpdate` call ( #27758 )
2023-11-07 14:18:59 +00:00
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
2023-11-07 13:01:09 +00:00
bbad5b6456
Remove false positive cop detection ( #27457 )
2023-11-07 10:44:15 +00:00
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-07 09:03:59 +00:00
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
2023-11-06 16:25:40 +00:00
0c4e7c06dc
Fix `Rails/FindEach` cop ( #26886 )
2023-11-06 15:53:29 +00:00
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
2023-11-06 15:51:52 +00:00
e4e752c26e
Adjust transform origin for favorite star ( #27700 )
2023-11-06 11:14:46 +00:00
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
2023-11-04 21:52:56 +00:00
3bf2a7296e
Use Immutable `Record` for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-03 10:10:13 +00:00
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError ( #27647 )
2023-11-01 07:22:02 +00:00
277e6968f5
Use helpers to check environment in frontend ( #27633 )
2023-10-31 16:05:44 +00:00
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
2023-10-31 10:55:13 +00:00
9c8891b39a
Rewrite `AutosuggestTextarea` as Functional Component ( #27618 )
2023-10-31 10:17:37 +00:00
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
2023-10-31 09:40:30 +00:00
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-31 08:43:17 +00:00
6c52f8286b
Fix posts from force-sensitized accounts being able to trend ( #27620 )
2023-10-30 22:32:25 +00:00
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-30 14:19:25 +00:00
33f8c1c5eb
Remove version check from update cache_concern.rb ( #27592 )
2023-10-30 14:04:12 +00:00
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
1cc512909c
Have `Follow` activities bypass availability ( #27586 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-27 14:55:00 +00:00
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
08bdd5751e
Fix account click on detailed status ( #27587 )
2023-10-27 14:03:21 +00:00
13d310e64d
Simplify column headers ( #27557 )
2023-10-27 13:21:07 +00:00
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
2023-10-27 09:57:16 +00:00
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
8f998cd96a
Handle featured collections without items ( #27581 )
2023-10-27 02:36:22 +00:00
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
2023-10-26 23:37:58 +00:00
12550a6a28
Use `Rails.env.local?` shorthand method to check env ( #27519 )
2023-10-26 21:20:41 +00:00
2d8f759a34
Add HTML lang attribute to preview card descriptions ( #27503 )
2023-10-26 20:34:15 +00:00
d2f52f7f64
Fix report processing notice not mentioning the report number when performing a custom action ( #27442 )
2023-10-26 17:03:31 +00:00
ba8dcb50fe
Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports ( #26088 )
2023-10-26 14:08:25 +00:00
75255c01fc
Fix error when trying to delete already-deleted file with OpenStack Swift ( #27569 )
2023-10-26 13:09:48 +00:00
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-26 11:05:47 +00:00
537442853f
Use a context to propagate column-related Props, and remove `forceUpdate` usage ( #27548 )
2023-10-26 11:00:10 +00:00
3ca974e101
Use `next` keyword in field loop in admin/accounts/index view ( #27559 )
2023-10-26 10:52:14 +00:00
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
2023-10-25 21:33:44 +00:00
36c8570e50
Fix HAML linting issue
2023-10-25 20:01:51 +02:00
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift ( #27554 )
2023-10-25 13:55:57 +00:00
a4e6fe36cb
Add missing ban icons ( #27555 )
2023-10-25 12:47:37 +00:00
70dbf84b9b
Solve simplest haml-lint `Rubocop` lints ( #27529 )
2023-10-25 12:38:01 +00:00
c926f5fd67
Fix haml-lint `UnnecessaryStringOutput` for views ( #27531 )
2023-10-25 12:01:00 +00:00
85d4846d8a
[Glitch] Fix `<ColumnBackButtonSlim>`
...
Port cb92cdf9af
2023-10-25 12:22:59 +02:00
6e9f89e5b6
Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc8a131fb7bc
2023-10-25 12:18:45 +02:00
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
2023-10-25 12:14:24 +02:00
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-25 07:36:07 +00:00
cec7f0ed72
Remove unused `#error_explanation` id from error partials ( #27536 )
2023-10-25 07:12:32 +00:00
cb92cdf9af
Fix `<ColumnBackButtonSlim>` ( #27540 )
2023-10-24 20:43:55 +00:00
f08ca3f042
Fix missing icon props ( #27539 )
2023-10-24 20:43:06 +00:00
bc3afb6311
Update `rails/ujs` delegate method usage ( #27538 )
2023-10-24 20:38:19 +00:00
b19d4eb43d
Fix HAML linting issues
2023-10-24 20:53:58 +02:00
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
2023-10-24 20:46:11 +02:00
b73e4b59fc
[Glitch] Fix history handling not properly handling states after update to react-router v5
...
Port 15182d1e5e
2023-10-24 20:34:30 +02:00
c6f990997d
[Glitch] Rewrite `emoji_unicode_mapping_light` to TS
...
Port 9482810703
2023-10-24 20:33:55 +02:00
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
8a131fb7bc
Fix `@rails/ujs` imports
2023-10-24 20:23:31 +02:00
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
69ea596e55
[Glitch] Fix explore page reloading when you navigate back to it in web UI
...
Port d9503a1965
2023-10-24 19:22:39 +02:00
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
9325cb5759
[Glitch] Convert `<Button>` to Typescript
...
Port 9d45a444f9
2023-10-24 19:03:16 +02:00
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
2023-10-24 18:46:08 +02:00
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
2023-10-24 13:24:57 +00:00
714e3ae5b5
Use Rails 7.1 `normalizes` feature ( #27521 )
2023-10-24 10:06:10 +00:00
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-24 09:51:34 +00:00
e923bb9ec9
Use `ENV.fetch` in views, fixes rubocop haml-lint issue ( #27527 )
2023-10-24 09:30:14 +00:00
9482810703
Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
2023-10-24 08:06:14 +00:00
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
8b770ce811
Add warnings to report action logs ( #27425 )
2023-10-23 14:30:46 +02:00
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
2023-10-23 14:27:57 +02:00
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
2023-10-23 11:39:53 +02:00
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-23 10:04:54 +02:00
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
9d45a444f9
Convert `<Button>` to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
Renaud Chaput
Claire
github-actions[bot]
Essem
Jeong Arm
Eugen Rochko
Matt Jankowski
Brian Holley
pajowu
Aleks Xhuvani
mogaminsk
Michael Stanclift
Jonathan de Jong
Christian Schmidt
Stanislas Signoud
たいち ひ
Steven Munn
Emelia Smith
fusagiko / takayamaki
Plastikmensch
Josh Goldberg ✨
6543
June
Kevin Bongart
ppnplus
neatchee
GitHub Actions
João Pedro Marques
Jasmin Johal
zunda
Ricardo Trindade
SouthFox
Simon Rapilly
Mark T. Tomczak