about summary refs log tree commit diff
path: root/app/javascript/mastodon
AgeCommit message (Collapse)Author
2023-04-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
2023-04-17Rewrite AnimatedNumber component with React hooks (#24559)fusagiko / takayamaki
2023-04-17Fix crash when trying to open the filter modal (#24556)Claire
2023-04-17Rewrite AvatarOverlay component with React hooks (#24543)fusagiko / takayamaki
2023-04-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-16Rewrite GIFV component with React hooks (#24552)fusagiko / takayamaki
2023-04-16Add client-side validation for taken username in sign-up form (#24546)Eugen Rochko
2023-04-14Fix status title for statuses without text (#24359)Ivan Rodriguez
2023-04-14typo: collapsable -> collapsible (#24521)Nick Schonning
2023-04-12Fix missing translation strings in en.json and defaultMessages.json (#24518)Claire
2023-04-12Add “In Memoriam” banner back to profiles (#23614)Claire
2023-04-12New Crowdin updates (#24447)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12Change all components to use the same error page in web UI (#24512)Eugen Rochko
2023-04-09Move glitch-soc-only translation strings out of ↵Claire
`app/javascript/mastodono/locales`
2023-04-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
2023-04-08Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169)Claire
This reduces differences with upstream and fixes a bunch of locale-data files having been forgotten.
2023-04-07Fix loading spinner + infinite scroll for private mentions (#24446)Christian Schmidt
2023-04-07Remove Array.prototype.includes polyfill (#24234)Nick Schonning
2023-04-06New Crowdin updates (#24378)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-05Fix height of announcements not being updated when using reduced animations ↵Christian Schmidt
(#24354)
2023-04-05Update display_media typing to string (#24416)Nick Schonning
2023-04-05Set marginRight as string (#24422)Nick Schonning
2023-04-05SUBMIT doesn't exist on XMLHttpRequest (#24423)Nick Schonning
2023-04-04Ensure tabIndex is number instead of string (#24409)Nick Schonning
2023-04-04HTML string attributes set as booleans (#24408)Nick Schonning
2023-04-04Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-04Align typings with installed versions (#24410)Nick Schonning
2023-04-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-03Add colour to follow button when hashtag is being followed (#24361)Christian Schmidt
2023-04-03New Crowdin updates (#24276)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03Move ESLint configs to overrides (#24370)Nick Schonning
2023-04-03[Proposal] Make able to write React in Typescript (#16210)fusagiko / takayamaki
Co-authored-by: berlysia <berlysia@gmail.com> Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-01Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-01Change search pop-out in web UI (#24305)Eugen Rochko
2023-04-01Fix regressions from change in account row design in web UI (#24343)Eugen Rochko
2023-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
2023-03-30Change "direct message" nomenclature to "private mention" in web UI (#24248)Eugen Rochko
2023-03-30Fix: set multiColumn value for /explore Statuses (#24314)Tdxdxoz
2023-03-27Move marky to devDependency (#24258)Nick Schonning
2023-03-27New Crowdin updates (#24130)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-26Merge branch 'main' into glitch-soc/mainClaire
2023-03-25Change media upload limits and remove client-side resizing (#23726)Eugen Rochko
2023-03-25Change design of account rows in web UI (#24247)Eugen Rochko
2023-03-24Add missing parenthesis (#24238)Yamagishi Kazutoshi
2023-03-24Remove legacy decorators syntax (#18357)Yamagishi Kazutoshi
2023-03-23Remove isNaN polyfill (#24224)Nick Schonning
2023-03-23Fix broken links in account gallery (#24218)Christian Schmidt
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
2023-03-16New Crowdin updates (#23904)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
generated by cgit-pink (git 2.37.1) at 2025-03-09 17:37:13 +0000