53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
2 years ago
e45bb3f893
[Glitch] Allow `==` when null checking
...
Port f14395c2cf
2 years ago
3644df3837
Fix `body_classes` test for glitch-soc
2 years ago
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.
2 years ago
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
2 years ago
febcc47cb3
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2 years ago
75a3da1abf
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2 years ago
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2 years ago
3acc54f7bf
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2 years ago
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2 years ago
4438c74c20
Remove display name input from sign-up form ( #24704 )
2 years ago
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2 years ago
7aed94ab13
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2 years ago
3104805285
Remove duplicate react helper method definitions ( #24700 )
2 years ago
b2aaf92409
Unignore stuck Dependabot updates ( #24670 )
2 years ago
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>
2 years ago
84c6f7a1a6
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
2 years ago
519ae8c0c6
Drop EOL Ruby 2.7 ( #24237 )
2 years ago
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
2 years ago
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
2 years ago
b36ccb2fac
Autofix Rubocop RSpec/MatchArray ( #24675 )
2 years ago
16cc6bc400
Autofix Rubocop RSpec/MatchArray ( #24050 )
2 years ago
dcb91de3ba
React component helper specs ( #24072 )
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
28d554cc49
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
2 years ago
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>
2 years ago
1c8979d118
Add Dependabot ignores for stuck updates and those needing manual interventions ( #23966 )
2 years ago
b016ffaaf5
Add S3 region list reference to Scalingo config ( #24152 )
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
69e69c019f
Remove postcss-scss devDep ( #24223 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
e82696a4b9
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2 years ago
8c30221a41
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2 years ago
dca2892276
Remove clustering from streaming API ( #24655 )
2 years ago
6241dd3984
Inf 123 dated nightly containers ( #24656 )
2 years ago
3141130720
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2 years ago
0cfbe4c4af
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2 years ago
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>
2 years ago
10259df1be
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
Claire
fusagiko / takayamaki
Eugen Rochko
Matt Jankowski
Nick Schonning
dependabot[bot]
Daniel M Brasil
Plastikmensch
Matias Lago Evia
Emelia Smith
Tim Campbell