8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2 years ago
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2 years ago
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2 years ago
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2 years ago
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2 years ago
66bda4713e
[Glitch] Allow `==` when null checking
...
Port c1a7e38d2b
2 years ago
612a1ee697
Fix `body_classes` test for glitch-soc
2 years ago
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.
2 years ago
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2 years ago
2a3a110f00
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2 years ago
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2 years ago
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2 years ago
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2 years ago
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
2 years ago
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
2 years ago
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2 years ago
a5bc4ea550
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2 years ago
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
2 years ago
8e514b1965
Unignore stuck Dependabot updates ( #24670 )
2 years 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>
2 years ago
1d9969fadf
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
2 years ago
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2 years ago
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
2 years ago
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2 years ago
5841f1af8c
Autofix Rubocop RSpec/MatchArray ( #24675 )
2 years ago
a3393d0d07
Autofix Rubocop RSpec/MatchArray ( #24050 )
2 years ago
91a8cd21d8
React component helper specs ( #24072 )
2 years 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>
2 years 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>
2 years 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>
2 years 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>
2 years 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>
2 years ago
90beba57d8
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
2 years 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>
2 years ago
6403d7841e
Add Dependabot ignores for stuck updates and those needing manual interventions ( #23966 )
2 years ago
93a84f4704
Add S3 region list reference to Scalingo config ( #24152 )
2 years 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>
2 years 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>
2 years 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>
2 years ago
dcdc614bd2
Remove postcss-scss devDep ( #24223 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years 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>
2 years 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>
2 years 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>
2 years 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>
2 years 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>
2 years ago
b0bf6216e6
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2 years ago
62ab7506d6
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2 years ago
301e03eb8c
Remove clustering from streaming API ( #24655 )
2 years ago
36631e40cc
Inf 123 dated nightly containers ( #24656 )
2 years ago
Eugen Rochko
Chike Nwaenie
Christian Schmidt
Claire
fusagiko / takayamaki
Matt Jankowski
Nick Schonning
dependabot[bot]
Daniel M Brasil
Plastikmensch
Matias Lago Evia
Emelia Smith
Tim Campbell