tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,231 Commits 10 Branches 0 Tags
34efd1a24c76abd085abe3f0a024fbe931dd3a99
Commit Graph

6255 Commits

Author SHA1 Message Date
Renaud Chaput 9a52a7f7a0 Remove MastodonMap TS type (#24807) 2023-05-03 13:32:11 +02:00
fusagiko / takayamaki e38b391940 Add type annotation for some js files (#24787) 2023-05-03 11:43:29 +02:00
Claire 9c1929efad Fix incorrect import of redux store (#24805) 2023-05-03 10:29:45 +02:00
Claire d37c0a1060 Fix incorrect box shadow on avatar in thread view (#24800) 2023-05-03 09:11:20 +02:00
fusagiko / takayamaki 8227af8dcc use configureStore of redux-toolkit instead of createStore of redux (#24790) 2023-05-02 20:39:06 +02:00
Eugen Rochko 8131a5b330 Add ALT badges to media that has alternative text in web UI (#24782) 2023-05-02 14:47:04 +02:00
Claire 598e63dad2 Change media elements to use aspect-ratio rather than compute height themselves (#24686) 2023-05-02 13:58:48 +02:00
fusagiko / takayamaki f50105779b Add type annotation for Blurhash component (#24750) 2023-05-02 12:54:00 +02:00
fusagiko / takayamaki 5a5975d7f7 Add type annotation for IconButton component (#24753) 2023-05-02 12:53:32 +02:00
Nick Schonning fc56eda94b Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-05-01 18:23:57 +09:00
fusagiko / takayamaki 15fd712464 Add type annotation for RelativeTimestamp component (#24749) 2023-05-01 00:51:31 +02:00
fusagiko / takayamaki 81f75b1e0e Rewrite Icon and IconWithBadge with typescript (#24747) 2023-05-01 00:51:00 +02:00
Eugen Rochko 0a08e9d3d3 New Crowdin updates (#24678) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-30 17:02:11 +09:00
Claire 678d836c7d Fix pop-in player placeholder layout in thread view (#24715) 2023-04-30 06:42:43 +02:00
Claire cf1bc4bb93 Fix audio player width in thread view (#24713) 2023-04-30 06:42:22 +02:00
Nick Schonning f22b4e556c Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
Christian Schmidt bfeccf6748 Fix media description not being cleared (#24720) 2023-04-30 02:29:24 +02:00
Claire e79998a11a Restore translations from not-yet-ported onboarding changes as glitch-soc translations 2023-04-29 19:38:08 +02:00
Eugen Rochko 38eeed6cbf [Glitch] Change logo version in header based on screen size in web UI 
Port 6028d047b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 18:54:13 +02:00
Nick Schonning 1033598416 [Glitch] Enable formatjs/prefer-pound-in-plural 
Port 2daa5a1549 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 18:38:23 +02:00
Claire edec08b970 Disable full-width media in thread view 2023-04-29 12:43:01 +02:00
Claire cb97a92954 [Glitch] Fix thread lines in right-to-left locales (#24714) 
Port 105f8687e4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 12:21:44 +02:00
Claire 103b6de8b2 [Glitch] Fix sass warning about deprecated slash as division (#24653) 
Port 1527b02c6d to glitch-soc

Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 12:17:06 +02:00
Eugen Rochko 7b01b7c3bf [Glitch] Add lines to threads in web UI 
Port 290e4aba31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 12:08:13 +02:00
Eugen Rochko 8015297f9e [Glitch] Change label from "For you" to "People" on explore screen in web UI 
Port 7cf963eec2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:34:44 +02:00
Chike Nwaenie 374a109546 [Glitch] Change styling of the recommended accounts to allow bio to be more visible 
Port e1b4eeb636 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:28:24 +02:00
Christian Schmidt 0091b28ffe [Glitch] Use CSS to trim long card descriptions 
Port e713c545b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:26:58 +02:00
Claire 11b34a903a [Glitch] Fix infinite loop in emoji replacement code 
Port fbb4de3dbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:14:43 +02:00
Claire 0a813d96db [Glitch] Fix characters being emojified even when using Variation Selector 15 (text) 
Port 37886c28da to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:12:35 +02:00
fusagiko / takayamaki 66bda4713e [Glitch] Allow == when null checking 
Port c1a7e38d2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 11:09:46 +02:00
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
Claire 105f8687e4 Fix thread lines in right-to-left locales (#24714) 2023-04-28 13:12:35 +02:00
Claire 2a3a110f00 Fix wrong classes audio and video instead of audio-player and video-player in CSS (#24711) 2023-04-28 11:15:43 +02:00
Eugen Rochko 8979b70975 Add default post text to onboarding flow in web UI (#24705) 2023-04-28 10:05:34 +02:00
Eugen Rochko 6028d047b9 Change logo version in header based on screen size in web UI (#24707) 2023-04-28 10:00:33 +02:00
Eugen Rochko 7cf963eec2 Change label from "For you" to "People" on explore screen in web UI (#24706) 2023-04-28 08:54:20 +02:00
Claire a5bc4ea550 Fix refering to unused preview-card CSS class instead of status-card (#24696) 2023-04-28 07:50:31 +02:00
Claire d8a06c1375 Fix preview cards layout in thread view (#24677) 2023-04-27 01:45:19 +02:00
Eugen Rochko d4511f2a76 New Crowdin updates (#24617) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-27 04:55:06 +09:00
Plastikmensch 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
Claire 1527b02c6d Fix sass warning about deprecated slash as division (#24653) 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2023-04-25 22:15:00 +02:00
Plastikmensch 678480d4d3 Fix small mistakes in RTL layout (#2182) 
Borders in blockquotes in reply-indicator weren't colored properly.

avatar margin when viewing edited toots dropdown was applied to wrong side.

Conversations had padding applied to the wrong side.

Padding for notifcation cleaner checkboxes was applied to wrong side.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-04-25 20:33:27 +02:00
Plastikmensch aea7866161 Change drawer--header to drawer__header (#2189) 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-04-25 20:29:04 +02:00
Eugen Rochko c35e3cb6ac Add more tips to onboarding flow in web UI (#24646) 2023-04-25 11:12:37 +02:00
Eugen Rochko 8099ba04be Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
Eugen Rochko 804aa8d501 Fix cutting off first letter of hashtag links sometimes in web UI (#24623) 2023-04-24 09:53:54 +02:00
Nick Schonning 2daa5a1549 Enable formatjs/prefer-pound-in-plural (#24622) 2023-04-24 08:07:19 +02:00
Eugen Rochko 290e4aba31 Add lines to threads in web UI (#24549) 2023-04-24 08:07:03 +02:00
Nick Schonning ef3675d688 Remove empty Kushubian (csb) local files (#24151) 2023-04-23 22:43:12 +02:00
Chike Nwaenie e1b4eeb636 Change styling of the recommended accounts to allow bio to be more visible (#24480) 2023-04-23 22:33:08 +02:00