tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,725 Commits 10 Branches 0 Tags
103b6de8b2a16962facb6b55896a78994bda5b24
Commit Graph
3017 Commits
Author SHA1 Message Date
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
 2023-04-29 10:44:56 +02:00
Eugen RochkoandGitHub 8979b70975 Add default post text to onboarding flow in web UI (#24705) 2023-04-28 10:05:34 +02:00
Eugen RochkoandGitHub 6028d047b9 Change logo version in header based on screen size in web UI (#24707) 2023-04-28 10:00:33 +02:00
Eugen RochkoandGitHub 7cf963eec2 Change label from "For you" to "People" on explore screen in web UI (#24706) 2023-04-28 08:54:20 +02:00
Eugen RochkoGitHubYamagishi Kazutoshi
 		d4511f2a76 New Crowdin updates (#24617) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-27 04:55:06 +09:00
PlastikmenschandGitHub 1565af1caf [Glitch] [Proposal] Make able to write React in Typescript (#2190) 
Port 4520e6473a to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-04-26 21:30:41 +02:00
Eugen RochkoandGitHub c35e3cb6ac Add more tips to onboarding flow in web UI (#24646) 2023-04-25 11:12:37 +02:00
Eugen RochkoandGitHub 8099ba04be Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
Eugen RochkoandGitHub 804aa8d501 Fix cutting off first letter of hashtag links sometimes in web UI (#24623) 2023-04-24 09:53:54 +02:00
Nick SchonningandGitHub 2daa5a1549 Enable formatjs/prefer-pound-in-plural (#24622) 2023-04-24 08:07:19 +02:00
Eugen RochkoandGitHub 290e4aba31 Add lines to threads in web UI (#24549) 2023-04-24 08:07:03 +02:00
Nick SchonningandGitHub ef3675d688 Remove empty Kushubian (csb) local files (#24151) 2023-04-23 22:43:12 +02:00
Christian SchmidtandGitHub e713c545b8 Use CSS to trim long card descriptions (#24265) 2023-04-23 22:32:47 +02:00
Eugen RochkoandGitHub 0461f83320 Add new onboarding flow to web UI (#24619) 2023-04-23 22:24:53 +02:00
Eugen RochkoGitHubYamagishi Kazutoshi
 		9d75b03ba4 New Crowdin updates (#24517) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-22 19:37:41 +09:00
Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream 
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-22 10:06:11 +02:00
ClaireandGitHub fbb4de3dbc Fix infinite loop in emoji replacement code (#24615) 2023-04-21 18:08:28 +02:00
ClaireandGitHub 37886c28da Fix characters being emojified even when using Variation Selector 15 (text) (#20949) 2023-04-20 16:43:55 +02:00
fusagiko / takayamakiandGitHub c1a7e38d2b Allow == when null checking (#24593) 2023-04-19 17:46:46 +02:00
fusagiko / takayamakiandGitHub ab740f464a Rewrite AnimatedNumber component with React hooks (#24559) 2023-04-17 13:25:15 +02:00
ClaireandGitHub bc4745f482 Fix crash when trying to open the filter modal (#24556) 2023-04-17 10:15:21 +02:00
fusagiko / takayamakiandGitHub 9f8d34620b Rewrite AvatarOverlay component with React hooks (#24543) 2023-04-17 07:07:27 +02:00
Claire f9a9f9344b Merge branch 'main' into glitch-soc/merge-upstream 2023-04-16 17:52:44 +02:00
fusagiko / takayamakiandGitHub cf3fa1e814 Rewrite GIFV component with React hooks (#24552) 2023-04-16 16:09:04 +02:00
Eugen RochkoandGitHub 955ec252a4 Add client-side validation for taken username in sign-up form (#24546) 2023-04-16 02:10:48 +02:00
Ivan RodriguezandGitHub f05fb51ecb Fix status title for statuses without text (#24359) 2023-04-14 17:29:09 +02:00
Nick SchonningandGitHub d02aa274be typo: collapsable -> collapsible (#24521) 2023-04-14 11:01:23 +02:00
ClaireandGitHub 8f0b0435ab Fix missing translation strings in en.json and defaultMessages.json (#24518) 2023-04-12 15:24:45 +02:00
ClaireandGitHub 86ad43173f Add “In Memoriam” banner back to profiles (#23614) 2023-04-12 14:50:02 +02:00
Eugen RochkoGitHubYamagishi Kazutoshi
 		c5eba06d8c New Crowdin updates (#24447) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-12 20:21:32 +09:00
Eugen RochkoandGitHub cee357d538 Change all components to use the same error page in web UI (#24512) 2023-04-12 12:44:58 +02:00
Claire c11e69f33a Move glitch-soc-only translation strings out of app/javascript/mastodono/locales 2023-04-09 15:53:45 +02:00
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream 
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-09 11:45:08 +02:00
ClaireandGitHub 10469a0b85 Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169) 
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
 2023-04-08 14:11:40 +02:00
Christian SchmidtandGitHub 9ef9974ff2 Fix loading spinner + infinite scroll for private mentions (#24446) 2023-04-07 15:44:31 +02:00
Nick SchonningandGitHub c0886dee14 Remove Array.prototype.includes polyfill (#24234) 2023-04-07 13:03:42 +02:00
Eugen RochkoGitHubYamagishi Kazutoshi
 		c9f3438efe New Crowdin updates (#24378) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-06 23:24:31 +09:00
Christian SchmidtandGitHub ffd5b2eea4 Fix height of announcements not being updated when using reduced animations (#24354) 2023-04-05 14:58:10 +02:00
Nick SchonningandGitHub 17b2fd2177 Update display_media typing to string (#24416) 2023-04-05 13:20:21 +02:00
Nick SchonningandGitHub 927b2fd138 Set marginRight as string (#24422) 2023-04-05 10:57:36 +02:00
Nick SchonningandGitHub ab3f23da91 SUBMIT doesn't exist on XMLHttpRequest (#24423) 2023-04-05 10:56:55 +02:00
Nick SchonningandGitHub ec0c104bf2 Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
Nick SchonningandGitHub a425915ce7 HTML string attributes set as booleans (#24408) 2023-04-04 16:33:33 +02:00
Claire d13ef49b15 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
Nick SchonningandGitHub 8e19c44b2c Align typings with installed versions (#24410) 2023-04-04 10:48:26 +02:00
Claire 4d5b4dacd6 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00
Christian SchmidtandGitHub 77bd32a26a Add colour to follow button when hashtag is being followed (#24361) 2023-04-03 16:25:15 +02:00
Eugen RochkoGitHubYamagishi Kazutoshi
 		4909c2e718 New Crowdin updates (#24276) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-03 14:44:43 +02:00
Nick SchonningandGitHub 373e4a8ff0 Move ESLint configs to overrides (#24370) 2023-04-03 12:41:10 +02:00
fusagiko / takayamakiGitHubberlysiafusagiko / takayamaki
 		4520e6473a [Proposal] Make able to write React in Typescript (#16210) 
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
 2023-04-03 03:31:39 +02:00