2a78b65bfd
Fix Rails/I18nLocaleAssignment cop ( #24693 )
2 years ago
e9e394fe57
Fix Rails/InverseOf cop ( #24732 )
2 years ago
59b1332f1d
Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
040763ae9a
Remove empty HTTP error translations ( #24210 )
2 years ago
3a6007c484
fix: remove port 80 mapping in devcontainer ( #24658 )
2 years ago
b9f44a797a
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
8c1fb86333
Remove the u in Favorite for non-gb english ( #24667 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
d00c43b9c1
Adds new follower/following routes ( #24601 )
2 years ago
a42b2eca0d
Bump eslint from 8.38.0 to 8.39.0 ( #24636 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
9ed1da3e63
Bump @types/jest from 29.4.2 to 29.5.1 ( #24630 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
847a925f77
Bump @types/yargs from 17.0.22 to 17.0.24 ( #24388 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
c943082b1b
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
28be2cd75e
Bump @types/lodash from 4.14.191 to 4.14.194 ( #24576 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
4040db68e3
Bump stylelint from 15.3.0 to 15.6.0 ( #24635 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
2ec45549cf
Fix `tootctl accounts approve --number N` not aproving N earliest registrations ( #24605 )
2 years ago
8a813615b0
Fix Rails/Output cop ( #24687 )
2 years ago
78f29479ab
Fix Rails/Present cop ( #24688 )
2 years ago
ba0a49b7f6
Fix Rails/ContentTag cop ( #24691 )
2 years ago
390aa577e7
Fix Rails/ActionOrder cop ( #24692 )
2 years ago
0a20a1fc1b
Run Rubocop with lint-staged on commit ( #24644 )
2 years ago
16e08228df
Fix Rails/SquishedSQLHeredocs cop ( #24694 )
2 years ago
807ada7b39
Fix Rails/HttpPositionalArguments cop ( #24699 )
2 years ago
9dfb594a45
Fix pop-in player placeholder layout in thread view ( #24715 )
2 years ago
9cf043f63a
Fix audio player width in thread view ( #24713 )
2 years ago
0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
2 years ago
6ccea199ca
Fix media description not being cleared ( #24720 )
2 years ago
7a395989b7
Enable local account key generation spec ( #24728 )
2 years ago
8b7b9ca887
Change i18n-fallbacks to English ( #24727 )
2 years ago
f9fcde8205
Add pending spec for User.those_who_can ( #24724 )
2 years ago
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2 years ago
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
2 years ago
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
2 years ago
a1a60257c5
Disable full-width media in thread view
2 years ago
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
2 years ago
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
2 years ago
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
2 years ago
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
2 years ago
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
2 years ago
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
2 years ago
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
2 years ago
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
Matt Jankowski
Claire
Nick Schonning
Josh McKinney
Eugen Rochko
Mark Roszko
João Pedro Marques
dependabot[bot]
Daniel M Brasil
Christian Schmidt
mogaminsk
Chike Nwaenie
fusagiko / takayamaki