807ada7b39
Fix Rails/HttpPositionalArguments cop ( #24699 )
1 year ago
9dfb594a45
Fix pop-in player placeholder layout in thread view ( #24715 )
1 year ago
9cf043f63a
Fix audio player width in thread view ( #24713 )
1 year ago
0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
1 year ago
6ccea199ca
Fix media description not being cleared ( #24720 )
1 year ago
7a395989b7
Enable local account key generation spec ( #24728 )
1 year ago
8b7b9ca887
Change i18n-fallbacks to English ( #24727 )
1 year ago
f9fcde8205
Add pending spec for User.those_who_can ( #24724 )
1 year ago
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
1 year ago
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
1 year ago
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
1 year ago
a1a60257c5
Disable full-width media in thread view
1 year ago
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
1 year ago
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
1 year ago
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
1 year ago
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
1 year ago
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
1 year ago
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
1 year ago
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
1 year ago
53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
1 year ago
e45bb3f893
[Glitch] Allow `==` when null checking
...
Port f14395c2cf
1 year ago
3644df3837
Fix `body_classes` test for glitch-soc
1 year 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.
1 year ago
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
1 year ago
febcc47cb3
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
1 year ago
75a3da1abf
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
1 year ago
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
1 year ago
3acc54f7bf
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
1 year ago
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
1 year ago
4438c74c20
Remove display name input from sign-up form ( #24704 )
1 year ago
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
1 year ago
7aed94ab13
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
1 year ago
3104805285
Remove duplicate react helper method definitions ( #24700 )
1 year ago
b2aaf92409
Unignore stuck Dependabot updates ( #24670 )
1 year 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>
1 year ago
84c6f7a1a6
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
1 year ago
519ae8c0c6
Drop EOL Ruby 2.7 ( #24237 )
1 year ago
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
1 year ago
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
1 year ago
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
1 year ago
b36ccb2fac
Autofix Rubocop RSpec/MatchArray ( #24675 )
1 year ago
16cc6bc400
Autofix Rubocop RSpec/MatchArray ( #24050 )
1 year ago
dcb91de3ba
React component helper specs ( #24072 )
1 year 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>
1 year 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>
1 year 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>
1 year 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>
1 year 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>
1 year ago
28d554cc49
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
1 year 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>
1 year ago
Matt Jankowski
Claire
Nick Schonning
Christian Schmidt
mogaminsk
Eugen Rochko
Chike Nwaenie
fusagiko / takayamaki
dependabot[bot]
Daniel M Brasil
Plastikmensch