about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2023-04-09[Glitch] Fix tooltip for dates without timeChristian Schmidt
Port aa136cf2fa177af1fea59279cb8bab0b2a042b2b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] Remove Array.prototype.includes polyfillNick Schonning
Port c0886dee1480cecedb7e8b152c848f061ab7f81e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] Fix account header image missing in low-resChristian Schmidt
Port d7b8c6db7ec4d9b3fe39cbf8f1b32d152e70b8f1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] Fix height of announcements not being updated when using reduced ↵Christian Schmidt
animations Port ffd5b2eea4503c2ee389c7aa5dff9c51dbf9f846 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] Update display_media typing to stringNick Schonning
Port 17b2fd217730e6fd598aa6664373d8d7779c28c1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] Set marginRight as stringNick Schonning
Port 927b2fd1386bce6fda1d2ff53ceadd82289d77ce to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] SUBMIT doesn't exist on XMLHttpRequestNick Schonning
Port ab3f23da916c8578148fe92fe008da19b8a7ed02 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09[Glitch] HTML string attributes set as booleansNick Schonning
Port a425915ce7d1148e9505c87889936c4c497061dd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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-09Fix most rubocop issues (#2165)Claire
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues
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-08Fix crash in NotifyService when trying to send an email notification for ↵Claire
post edits (#24460)
2023-04-07Fix glitch-soc HAML linting issues (#2166)Claire
2023-04-07Fix tooltip for dates without time (#24244)Christian Schmidt
2023-04-07Fix loading spinner + infinite scroll for private mentions (#24446)Christian Schmidt
2023-04-07Remove unused methods in 2FA OTP Auth Controller (#24220)Matt Jankowski
2023-04-07Remove Array.prototype.includes polyfill (#24234)Nick Schonning
2023-04-07Fix account header image missing in low-res (#24433)Christian Schmidt
2023-04-06New Crowdin updates (#24378)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-05New Crowdin updates (#2126)Claire
* New translations en.json (Esperanto) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * Fix Crowdin YAML export issue * Fix i18n YAML normalization
2023-04-05Fix user archive takeouts when using OpenStack Swift (#24431)Claire
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-05Enable Stylelint property-no-unknown (#24404)Nick Schonning
2023-04-04Fix styling regressions from RTL layout refactor (#24415)Claire
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-04[Glitch] Fix inconsistent radius in drawerRubicon Rowe
Port fa98363a2789f23e110312f23bf4c00234dcd59a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-04-04Fix unescaped user input in LDAP query (#24379)Claire
2023-04-04Fix inconsistent radius in drawer (#24407)Rubicon Rowe
2023-04-04Align typings with installed versions (#24410)Nick Schonning
2023-04-03[Glitch] Add colour to follow button when hashtag is being followedChristian Schmidt
Port 77bd32a26abbf8b49caf35dcdf170e312e48a277 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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-04-01Fix Redis client and type errors introduced in #24285 (#24342)Vyr Cossont
2023-03-31[Glitch] Fix: set multiColumn value for /explore StatusesTdxdxoz
Port 74f56c64fc0aa0dce0dc2c267aa8a212569e9673 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31[Glitch] Move marky to devDependencyNick Schonning
Port ddb769f0b84d4bcff22472f236a4ec74c631d0a6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31Migrate glitch-soc's exclusive user settingsClaire
2023-03-31Fix invalid/expired invites being processed on sign-up (#24337)Claire
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-31Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)Nick Schonning
generated by cgit-pink (git 2.37.1) at 2024-12-28 10:57:47 +0000