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.
1 year ago
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
1 year ago
2a3a110f00
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
1 year ago
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
1 year ago
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
1 year ago
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
1 year ago
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
1 year ago
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
1 year ago
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
1 year ago
a5bc4ea550
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
1 year ago
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
1 year ago
8e514b1965
Unignore stuck Dependabot updates ( #24670 )
1 year ago
d9e9579832
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>
1 year ago
1d9969fadf
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
1 year ago
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
1 year ago
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
1 year ago
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
1 year ago
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
1 year ago
5841f1af8c
Autofix Rubocop RSpec/MatchArray ( #24675 )
1 year ago
a3393d0d07
Autofix Rubocop RSpec/MatchArray ( #24050 )
1 year ago
91a8cd21d8
React component helper specs ( #24072 )
1 year ago
3029aeb838
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>
1 year ago
185a71f281
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>
1 year ago
b839babb39
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>
1 year ago
785b0349eb
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>
1 year ago
872c4e1ef2
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>
1 year ago
90beba57d8
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
1 year ago
c7cd891e86
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>
1 year ago
6403d7841e
Add Dependabot ignores for stuck updates and those needing manual interventions ( #23966 )
1 year ago
93a84f4704
Add S3 region list reference to Scalingo config ( #24152 )
1 year ago
2f5608e9e5
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>
1 year ago
5f624954be
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>
1 year ago
9650a5738a
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>
1 year ago
dcdc614bd2
Remove postcss-scss devDep ( #24223 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
1 year ago
b31ee9ab38
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>
1 year ago
1820b55a11
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>
1 year ago
0c66358601
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>
1 year ago
855cf7802d
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>
1 year ago
fba60094a2
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>
1 year ago
b0bf6216e6
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
1 year ago
62ab7506d6
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
1 year ago
301e03eb8c
Remove clustering from streaming API ( #24655 )
1 year ago
36631e40cc
Inf 123 dated nightly containers ( #24656 )
1 year ago
1527b02c6d
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
1 year ago
1419f90ef2
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
1 year ago
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>
1 year ago
aea7866161
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
276c39361b
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
1 year ago
6084461cd0
Change unauthenticated responses to be cached in REST API ( #24348 )
1 year ago
c35e3cb6ac
Add more tips to onboarding flow in web UI ( #24646 )
1 year ago
Claire
Eugen Rochko
Matt Jankowski
Nick Schonning
dependabot[bot]
Daniel M Brasil
Plastikmensch
Matias Lago Evia
Emelia Smith
Tim Campbell