7cc2c1be29
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port cea9db5a0b
1 year ago
eb1cb8224a
[Glitch] Use an Immutable Record as the root state
...
Port 78ba12f0bf
1 year ago
2ba4773ebe
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 9934949fc4
1 year ago
b75aa6b819
[Glitch] Remove the search button from UI header when logged out
...
Port 285a691936
1 year ago
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
5b46345459
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
1 year ago
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
1 year ago
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
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
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
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
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
1 year ago
69db507924
Change emoji picker icon ( #25479 )
1 year ago
804488d38e
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
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
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
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
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
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
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
67d17ce194
Add `legal` as report category ( #23941 )
1 year ago
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
1 year ago
fb5bf5cbf8
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
1 year ago
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
1 year ago
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
1 year ago
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
1 year ago
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
1 year ago
bacb674921
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
1 year ago
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
1 year ago
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
1 year ago
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
5fae2de454
Fix overflow behavior of account rows ( #25131 )
1 year ago
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
44cd88adc4
Upgrade react-intl ( #24906 )
1 year ago
89d6341c80
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
1 year ago
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
1 year ago
5ed48e6878
Fix extraneous newlines
1 year ago
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
1 year ago
6a592083f1
[Glitch] Fix export style of `<LoadGap />` based on `<Domain />`
...
Port 4197b5e4c8
1 year ago
0009b4b574
[Glitch] Update inconsistent `defaultMessage`
...
Port e58c36d308
1 year ago
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
1 year ago
7bec63e6e2
[Glitch] Fix `null` signUp URL handling from #25014
...
Port 40b948a1fb
1 year ago
017fbc7a74
[Glitch] Rewrite `<LoadGap />` as FC and TS
...
Port 7336f3648b
1 year ago
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
1 year ago
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
1 year ago
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
1 year ago
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
1 year ago
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
1 year ago
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
1 year ago
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
1 year ago
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
1 year ago
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
2 years ago
60c7e559d8
[Glitch] Rewrite `<TimelineHint />` as FC and TS
...
Port 9a472efe7c
2 years ago
6746e5d430
[Glitch] Rewrite `<Skeleton/>` as FC and TS
...
Port 8066118d1f
2 years ago
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2 years ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2 years ago
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2 years ago
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2 years ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2 years ago
ad1098970b
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2 years ago
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
2 years ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2 years ago
b0ec3bfcf9
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port 7b54e47d03
2 years ago
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
2 years ago
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
2 years ago
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
2 years ago
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2 years ago
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2 years ago
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2 years ago
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2 years ago
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2 years ago
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2 years ago
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2 years ago
cb6f445b90
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2 years ago
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2 years ago
38c6216082
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2 years ago
4197b5e4c8
Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )
2 years ago
e58c36d308
Update inconsistent `defaultMessage` ( #25114 )
2 years ago
1caa5ff39e
Change share action from being in action bar to being in dropdown in web UI ( #25105 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
40b948a1fb
Fix `null` signUp URL handling from #25014 ( #25108 )
2 years ago
Claire
Renaud Chaput
mogaminsk
Eugen Rochko
Ian
たいち ひ
alfe
Plastikmensch
alfe
S.H
Darius Kazemi
Jed Fox
Christian Schmidt
dependabot[bot]
y.takahashi
fusagiko / takayamaki
Nick Schonning