53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
2023-04-29 11:12:35 +02:00
e45bb3f893
[Glitch] Allow `==` when null checking
...
Port f14395c2cf
2023-04-29 11:09:46 +02:00
3644df3837
Fix `body_classes` test for glitch-soc
2023-04-29 11:08:38 +02:00
498de92bc8
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
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
febcc47cb3
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
75a3da1abf
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
3acc54f7bf
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
4438c74c20
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
7aed94ab13
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2023-04-28 07:50:31 +02:00
3104805285
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
b2aaf92409
Unignore stuck Dependabot updates ( #24670 )
2023-04-27 12:12:56 +02:00
99ffa91a65
Bump tesseract.js from 2.1.1 to 2.1.5 ( #19084 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-27 11:26:13 +02:00
84c6f7a1a6
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
2023-04-27 10:15:45 +02:00
519ae8c0c6
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
2023-04-26 21:30:41 +02:00
b36ccb2fac
Autofix Rubocop RSpec/MatchArray ( #24675 )
2023-04-26 21:29:36 +02:00
16cc6bc400
Autofix Rubocop RSpec/MatchArray ( #24050 )
2023-04-26 20:21:54 +02:00
dcb91de3ba
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
1e785f3506
Bump pg from 1.4.6 to 1.5.2 ( #24671 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:46:01 +02:00
d66dd79ea7
Bump rack from 2.2.6.4 to 2.2.7 ( #24672 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:45:49 +02:00
8cc47acb35
Bump sass from 1.62.0 to 1.62.1 ( #24668 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:43:52 +02:00
c852321fa0
Bump lint-staged from 13.2.1 to 13.2.2 ( #24669 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:43:37 +02:00
5d9c2d4baa
Bump glob from 10.0.0 to 10.2.2 ( #24632 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:36:58 +02:00
28d554cc49
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
2023-04-26 17:25:07 +02:00
75ec0f4951
Bump brakeman from 5.4.0 to 5.4.1 ( #24006 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:10:21 +02:00
1c8979d118
Add Dependabot ignores for stuck updates and those needing manual interventions ( #23966 )
2023-04-26 17:09:26 +02:00
b016ffaaf5
Add S3 region list reference to Scalingo config ( #24152 )
2023-04-26 16:46:19 +02:00
e01a12bb66
Bump sass from 1.61.0 to 1.62.0 ( #24574 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 16:30:43 +02:00
2f9393dcab
Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 ( #24633 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 23:10:54 +09:00
b65a3ad58b
Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 ( #24638 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 22:35:24 +09:00
69e69c019f
Remove postcss-scss devDep ( #24223 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-26 22:33:31 +09:00
776a75a146
Bump json-schema from 3.0.0 to 4.0.0 ( #24642 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:57:08 +02:00
1729ab0614
Bump postcss from 8.4.22 to 8.4.23 ( #24629 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:41:20 +02:00
541aea1721
Bump prettier from 2.8.7 to 2.8.8 ( #24631 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:41:09 +02:00
ed0fee9be3
Bump chewy from 7.3.0 to 7.3.2 ( #24637 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:34:46 +02:00
c27c58b22c
Bump axios from 1.3.5 to 1.3.6 ( #24640 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:34:16 +02:00
e82696a4b9
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
8c30221a41
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +02:00
dca2892276
Remove clustering from streaming API ( #24655 )
2023-04-26 11:37:51 +02:00
6241dd3984
Inf 123 dated nightly containers ( #24656 )
2023-04-25 23:11:31 +02:00
3141130720
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
0cfbe4c4af
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +02:00
c6305b9817
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
10259df1be
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
Claire