0a212cfa7f
[Glitch] Add missing report category translation
...
Port 1cb4514d0e
1 year ago
cdec45eca9
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port dfaf59d99a
1 year ago
f815bd5fd9
[Glitch] Change "bot" label to "automated"
...
Port 432a5d2d4b
1 year ago
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
1 year ago
39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
1 year ago
3b5e302f7f
Rewrite `emoji_mart_data_light` as TS ( #25138 )
1 year ago
a86886b1fd
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
1 year ago
72590e601a
Update Rubocop 1.52.1 ( #25376 )
1 year ago
1cb4514d0e
Add missing report category translation ( #25400 )
1 year ago
10746af82f
Remove unused shared examples for scoped settings ( #25389 )
1 year ago
25c66fa640
Enable paperclip for account attachment examples ( #25381 )
1 year ago
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
1 year ago
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
1 year ago
af97a6ac5a
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
dfaf59d99a
Rewrite <LoadPending /> as FC and TS ( #25363 )
1 year ago
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
1 year ago
20718a8b59
Fix some translation strings inconsistencies
1 year ago
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.
1 year ago
62c996b52d
Reduce `RSpec/MultipleExpectations` cop max to 8 ( #25313 )
1 year ago
b5675e265e
Add coverage for `CLI::Feeds` command ( #25319 )
1 year ago
07933db788
Add coverage for `CLI::Cache` command ( #25238 )
1 year ago
215081240f
Add logging of websocket send errors ( #25280 )
1 year ago
b19a695608
migrate test for `GET /api/v1/accounts/{account_id}` to request spec ( #25322 )
1 year ago
99216e34e5
Migrate to request specs in `/api/v1/admin/canonical_email_blocks` ( #25330 )
1 year ago
b4e19f9610
Migrate to request specs in `/api/v1/admin/ip_blocks` ( #25331 )
1 year ago
4301d8cbb3
Migrate to request specs in `/api/v1/admin/domain_allows` ( #25333 )
1 year ago
841c220c40
Migrate to request specs in `/api/v1/admin/domain_blocks` ( #25335 )
1 year ago
0e200d4e2f
Migrate to request specs in `/api/v1/admin/reports` ( #25355 )
1 year ago
3a2a15c6ea
Use `build` where possible in fabricators ( #25360 )
1 year ago
c94bb9ba9a
Disable paperclip processing in specs ( #25359 )
1 year ago
c81f59583c
Fix logging of messages that are binary before closing their connection ( #25361 )
1 year ago
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
1 year ago
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.
1 year ago
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
1 year ago
83ae40e192
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port fb5bf5cbf8
1 year ago
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
Renaud Chaput
alfe
Eugen Rochko
Claire
たいち ひ
Nick Schonning
Matt Jankowski
Plastikmensch
Emelia Smith
fusagiko / takayamaki
Daniel M Brasil
alfe
S.H
Darius Kazemi
Jed Fox