50c2a03695
Rails 7 update ( #24241 )
1 year ago
4fe2d7cb59
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
1 year ago
155fc459e3
Fixing an issue with a missing argument ( #2261 )
...
undefined
1 year ago
683ba5ecb1
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
1 year ago
78ba12f0bf
Use an Immutable Record as the root state ( #25584 )
1 year ago
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
1 year ago
a209d1e683
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
1 year ago
4581a528f7
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
285a691936
Remove the search button from UI header when logged out ( #25631 )
1 year ago
c43cfd2406
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ae30a60b1f
1 year ago
4faa4eb3c4
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 65aa04647a
1 year ago
2f996375e5
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 2b78c07ef1
1 year ago
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
c7c6f02ae6
Fix suspending an already-limited domain ( #25603 )
1 year ago
0ccf6c0eb7
Fix batch attachment deletion leaving empty directories ( #25587 )
1 year ago
7a25af64dd
Remove media attachment only when file was exist ( #25586 )
1 year ago
bb4756c823
Change files to be deleted in batches instead of one-by-one ( #23302 )
1 year ago
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
1 year ago
7b024baf50
Change header backgrounds to use fewer different colors in web UI ( #25577 )
1 year ago
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
1 year ago
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
1 year ago
5def74a436
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 0842a68532
1 year ago
6fb34258a4
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port 00ec43914a
1 year ago
7d160d2272
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port a8c1c8bd37
1 year ago
222713a768
[Glitch] Fix custom signup URL may not loaded
...
Port 8d2c26834f
1 year ago
6fe345c383
[Glitch] Change emoji picker icon
...
Port 69db507924
1 year ago
c71fc42f4e
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 804488d38e
1 year ago
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
1 year ago
55e7c08a83
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
1 year ago
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
1 year ago
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
1 year ago
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
1 year ago
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
1 year ago
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
1 year ago
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
1 year ago
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
1 year ago
69db507924
Change emoji picker icon ( #25479 )
1 year ago
ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
1 year ago
ec91ea4457
Fix missing validation on `default_privacy` setting ( #25513 )
1 year ago
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
1 year ago
c78280a8ce
Add translate="no" to outgoing mentions and links ( #25524 )
1 year ago
3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
1 year ago
dd07393e75
Fix user settings not getting validated ( #25508 )
1 year ago
804488d38e
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
1 year ago
e1c9d52e91
Reduce `sleep` time in request pool spec ( #25470 )
1 year ago
155ec185b2
Remove unused `picture_hint` helper method ( #25485 )
1 year ago
b9bc9d0bda
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
1 year ago
dc68306b8e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
1 year ago
64f7a11658
Fix cross-origin loading of locales ( #25498 )
1 year ago
3b04e39534
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port c9d06d10d4
1 year ago
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
1 year ago
d795c2c70c
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 39110d1d0a
1 year ago
b1b95ddd1f
[Glitch] Rewrite `emoji_mart_data_light` as TS
...
Port 3b5e302f7f
1 year ago
9bf63257fb
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port a86886b1fd
1 year ago
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
c9d06d10d4
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
1 year ago
d9c6f70cc6
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
1 year ago
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
1 year ago
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
1 year ago
bca649ba79
Change edit profile page ( #25413 )
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
1cb4514d0e
Add missing report category translation ( #25400 )
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
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
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
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
Matt Jankowski
Daniel M Brasil
Claire
Vivianne
Renaud Chaput
jsgoldstein
Eugen Rochko
S.H
mogaminsk
Ian
たいち ひ
Emelia Smith
alfe
Plastikmensch
alfe
Darius Kazemi
Jed Fox
Christian Schmidt