c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' 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
88c5ad3136
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 1483a3ddfe
1 year ago
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
1 year ago
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
1 year ago
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
1 year ago
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
1 year ago
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
1 year ago
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' 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
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
1 year ago
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' 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
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
1 year ago
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
1 year ago
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
1 year ago
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' 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
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
1 year ago
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' 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
4c9406bdb0
Add time zone preference ( #25342 )
1 year ago
16dd3f08c1
Fix performance of streaming by parsing message JSON once ( #25278 )
1 year ago
e34142782f
Add Ruby & Bundler versions to Gemfile.lock ( #25317 )
1 year ago
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
4aff1d2974
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
1 year ago
18f092d927
Fix translations for changing theme ( #25340 )
1 year ago
b85c387c5c
Remove reference to deleted statsd config file ( #25336 )
1 year ago
db047e323b
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
5265655549
Update dependency dotenv to v16.1.3 ( #25302 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
7e22287caa
Update dependency sass-loader to v10.4.1 ( #25315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
f378f10404
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
1 year ago
67d17ce194
Add `legal` as report category ( #23941 )
1 year ago
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
1 year ago
ed04c277b4
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
6c0e3f490a
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
1 year ago
b74c3cd708
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
1 year ago
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
9a653899e9
Update dependency redis to v4.6.7 ( #25300 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
c42591356d
Fix `RSpec/DescribedClass` cop ( #25104 )
1 year ago
1e243e2df7
Misc spec coverage for `Admin::` area controllers ( #25282 )
1 year ago
eb6f8181e1
Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )
1 year ago
b22bfae4f9
Add coverage for `DomainBlock#public_domain` method ( #25283 )
1 year ago
fb5bf5cbf8
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
50a8f5b8a7
Update dependency react-redux to v8.0.7 ( #25298 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
1 year ago
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
a80efb449e
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
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
d907e79140
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 00c222377d
1 year ago
af135bddd0
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
1 year ago
e428670e61
Fix CSP headers when S3_ALIAS_HOST includes a path component ( #25273 )
1 year ago
Claire
S.H
Darius Kazemi
Jed Fox
Renaud Chaput
Christian Schmidt
Eugen Rochko
Emelia Smith
Matt Jankowski
Daniel M Brasil
jsgoldstein
renovate[bot]
Nick Schonning
alfe