tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,876 Commits 10 Branches 0 Tags
bbd0e9caa67e2cc0b7b34bbc04885cef751d8d6f
Commit Graph

6083 Commits

Author SHA1 Message Date
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
Christian Schmidt
e713c545b8 Use CSS to trim long card descriptions (#24265) 2023-04-23 22:32:47 +02:00
Eugen Rochko
0461f83320 Add new onboarding flow to web UI (#24619) 2023-04-23 22:24:53 +02:00
Claire
5b58ebb04f Fix JS crashing if initial-state is not set (#2193) 
Fixes issues with the JS for at least sign-up pages not working
 2023-04-22 19:13:20 +02:00
Eugen Rochko
9d75b03ba4 New Crowdin updates (#24517) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-22 19:37:41 +09:00
fusagiko / takayamaki
9ef32ea570 [Glitch] Rewrite AnimatedNumber component with React hooks 
Port ab740f464a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 11:28:23 +02:00
fusagiko / takayamaki
799e9917e4 [Glitch] Rewrite GIFV component with React hooks 
Port cf3fa1e814 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 11:22:49 +02:00
Eugen Rochko
6ea9137233 [Glitch] Add client-side validation for taken username in sign-up form 
Port 955ec252a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:47:44 +02:00
Claire
bc7b3399fb [Glitch] Fix crash when trying to open the filter modal 
Port bc4745f482 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:20:50 +02:00
Eugen Rochko
2f3dffb057 [Glitch] Add progress indicator to sign-up flow 
Port e5c0b16735 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:18:20 +02:00
Ivan Rodriguez
a21a875dba [Glitch] Fix status title for statuses without text 
Port f05fb51ecb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:16:20 +02:00
Nick Schonning
f2797276b2 [Glitch] typo: collapsable -> collapsible 
Port d02aa274be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-22 10:13:58 +02: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
Claire
fbb4de3dbc Fix infinite loop in emoji replacement code (#24615) 2023-04-21 18:08:28 +02:00
Claire
37886c28da Fix characters being emojified even when using Variation Selector 15 (text) (#20949) 2023-04-20 16:43:55 +02:00
fusagiko / takayamaki
c1a7e38d2b Allow == when null checking (#24593) 2023-04-19 17:46:46 +02:00
fusagiko / takayamaki
ab740f464a Rewrite AnimatedNumber component with React hooks (#24559) 2023-04-17 13:25:15 +02:00
Claire
bc4745f482 Fix crash when trying to open the filter modal (#24556) 2023-04-17 10:15:21 +02:00
fusagiko / takayamaki
9f8d34620b Rewrite AvatarOverlay component with React hooks (#24543) 2023-04-17 07:07:27 +02:00
Eugen Rochko
34f8e696e2 [Glitch] Change all components to use the same error page in web UI 
Port cee357d538 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-16 18:20:51 +02:00
Claire
a3c05640f7 [Glitch] Add “In Memoriam” banner back to profiles 
Port 86ad43173f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-16 18:02:16 +02:00
Claire
cb0562f32c [Glitch] Fix tab arrows on RTL layouts 
Port af49d93fd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-16 17:58:32 +02:00
Claire
f9a9f9344b Merge branch 'main' into glitch-soc/merge-upstream 2023-04-16 17:52:44 +02:00