fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
2023-06-11 13:33:45 +02:00
af97a6ac5a
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-06-11 09:58:55 +02:00
20718a8b59
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
42a0898f16
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
3a2a15c6ea
Use `build` where possible in fabricators ( #25360 )
2023-06-10 18:29:01 +02:00
c94bb9ba9a
Disable paperclip processing in specs ( #25359 )
2023-06-10 18:27:35 +02:00
c81f59583c
Fix logging of messages that are binary before closing their connection ( #25361 )
2023-06-10 18:24:37 +02:00
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
2023-06-10 17:43:13 +02:00
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' 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.
2023-06-10 17:18:36 +02:00
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
2023-06-10 17:10:06 +02:00
83ae40e192
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port fb5bf5cbf8
2023-06-10 16:59:25 +02:00
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.
2023-06-10 16:48:01 +02:00
88c5ad3136
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 1483a3ddfe
2023-06-10 16:38:03 +02:00
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
2023-06-10 16:37:20 +02:00
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
2023-06-10 16:36:54 +02:00
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
2023-06-10 16:36:15 +02:00
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
2023-06-10 16:30:36 +02:00
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
2023-06-10 16:29:48 +02:00
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.
2023-06-10 16:22:14 +02:00
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
2023-06-10 16:18:01 +02:00
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.
2023-06-10 15:32:29 +02:00
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
2023-06-10 15:21:04 +02:00
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
2023-06-10 15:10:24 +02:00
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
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`.
2023-06-10 14:38:04 +02:00
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
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.
2023-06-10 12:38:33 +02:00
4c9406bdb0
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
16dd3f08c1
Fix performance of streaming by parsing message JSON once ( #25278 )
2023-06-09 19:29:16 +02:00
e34142782f
Add Ruby & Bundler versions to Gemfile.lock ( #25317 )
2023-06-09 16:34:36 +02:00
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
4aff1d2974
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
2023-06-09 14:00:14 +02:00
18f092d927
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
b85c387c5c
Remove reference to deleted statsd config file ( #25336 )
2023-06-07 22:46:53 +02:00
db047e323b
Update dependency webpack-bundle-analyzer to v4.9.0 ( #25327 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 12:05:05 +02:00
5265655549
Update dependency dotenv to v16.1.3 ( #25302 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 11:46:40 +02:00
7e22287caa
Update dependency sass-loader to v10.4.1 ( #25315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 11:44:09 +02:00
f378f10404
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
2023-06-07 01:53:50 +02:00
67d17ce194
Add `legal` as report category ( #23941 )
2023-06-06 23:41:59 +02:00
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
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>
2023-06-06 18:53:43 +02:00
6c0e3f490a
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
2023-06-06 15:51:42 +02:00
b74c3cd708
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
2023-06-06 14:51:03 +02:00
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
9a653899e9
Update dependency redis to v4.6.7 ( #25300 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-06 14:16:41 +02:00
c42591356d
Fix `RSpec/DescribedClass` cop ( #25104 )
2023-06-06 13:58:33 +02:00
1e243e2df7
Misc spec coverage for `Admin::` area controllers ( #25282 )
2023-06-06 13:57:00 +02:00
Plastikmensch