14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
1 year ago
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
1 year ago
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
1 year ago
ee6682e48d
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port f9c819e8db
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
1 year ago
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
1 year ago
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
1 year ago
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
1 year ago
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
1 year ago
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
1 year ago
333c28ce6d
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
1 year ago
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
1 year ago
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
1 year ago
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
1 year ago
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
1 year ago
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
1 year ago
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
1 year ago
1dd243cc09
Add time zone preference ( #25342 )
1 year ago
bc7e7185ac
Fix performance of streaming by parsing message JSON once ( #25278 )
1 year ago
d4abb4e41f
Add Ruby & Bundler versions to Gemfile.lock ( #25317 )
1 year ago
8b5680fd9a
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
14fa204dfc
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
1 year ago
975914e0a6
Fix translations for changing theme ( #25340 )
1 year ago
68d362c0fc
Remove reference to deleted statsd config file ( #25336 )
1 year ago
c5e025a202
Update dependency webpack-bundle-analyzer to v4.9.0 ( #25327 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
5b2ff76a79
Update dependency dotenv to v16.1.3 ( #25302 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
b1f8013267
Update dependency sass-loader to v10.4.1 ( #25315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
83b03b528b
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
1 year ago
66a5173629
Add `legal` as report category ( #23941 )
1 year ago
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
1 year ago
b452f64907
Configure RenovateBot to add proper language labels ( #25316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
1 year ago
23d64073d0
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
1 year ago
dd76368f72
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
1 year ago
ef344388c5
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
26db476771
Update dependency redis to v4.6.7 ( #25300 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
8e745a234c
Fix `RSpec/DescribedClass` cop ( #25104 )
1 year ago
09b05d7e8b
Misc spec coverage for `Admin::` area controllers ( #25282 )
1 year ago
a66827421b
Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )
1 year ago
0aebcd4761
Add coverage for `DomainBlock#public_domain` method ( #25283 )
1 year ago
f9c819e8db
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
8390f2c863
Update dependency react-redux to v8.0.7 ( #25298 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
1 year ago
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
d3426d7365
Configure Renovate ( #25255 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
Claire
Eugen Rochko
alfe
S.H
Darius Kazemi
Jed Fox
Renaud Chaput
Christian Schmidt
Emelia Smith
Matt Jankowski
Daniel M Brasil
jsgoldstein
renovate[bot]
Nick Schonning