d902a707a3
Fix Rails/CompactBlank cop ( #24690 )
2 years ago
d00e45a7d3
Fix Rails/I18nLocaleAssignment cop ( #24693 )
2 years ago
af824db398
Fix Rails/InverseOf cop ( #24732 )
2 years ago
c18884de32
Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
6b95aaaa65
Remove empty HTTP error translations ( #24210 )
2 years ago
89c01383f9
fix: remove port 80 mapping in devcontainer ( #24658 )
2 years ago
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
c23d285b16
Remove the u in Favorite for non-gb english ( #24667 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
8f6e290c7a
Adds new follower/following routes ( #24601 )
2 years ago
0669822ae8
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
242d7864f1
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
56cf092058
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
fa14976a5d
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
819daeb651
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
921bef6799
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
e8fe941015
Fix `tootctl accounts approve --number N` not aproving N earliest registrations ( #24605 )
2 years ago
2e43461100
Fix Rails/Output cop ( #24687 )
2 years ago
5a2aa06a51
Fix Rails/Present cop ( #24688 )
2 years ago
bdc74086e6
Fix Rails/ContentTag cop ( #24691 )
2 years ago
6e226f5a32
Fix Rails/ActionOrder cop ( #24692 )
2 years ago
470b8abb69
Run Rubocop with lint-staged on commit ( #24644 )
2 years ago
60ac9e8634
Fix Rails/SquishedSQLHeredocs cop ( #24694 )
2 years ago
8dcfb6e0ea
Fix Rails/HttpPositionalArguments cop ( #24699 )
2 years ago
678d836c7d
Fix pop-in player placeholder layout in thread view ( #24715 )
2 years ago
cf1bc4bb93
Fix audio player width in thread view ( #24713 )
2 years ago
f22b4e556c
Add eslint-plugin-jsdoc ( #24719 )
2 years ago
bfeccf6748
Fix media description not being cleared ( #24720 )
2 years ago
274d561430
Enable local account key generation spec ( #24728 )
2 years ago
e0d075713f
Change i18n-fallbacks to English ( #24727 )
2 years ago
4cfe52635c
Add pending spec for User.those_who_can ( #24724 )
2 years ago
e79998a11a
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2 years ago
38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2 years ago
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2 years ago
edec08b970
Disable full-width media in thread view
2 years ago
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2 years ago
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2 years ago
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2 years ago
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
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