stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,571 Commits 75 Branches 3 Tags
2eec4da8fcd4d2a6318d142e387d4b38894e190e
Commit Graph

575 Commits

Author SHA1 Message Date
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Claire
d8b0beb70d Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream 2025-06-24 21:44:33 +02:00
diondiondion
8ba1487f30 fix: Fix inaccessible "Clear search" button (#35152) 2025-06-24 14:36:05 +00:00
diondiondion
644da36336 feat: More obvious loading state when submitting a post (#35153) 2025-06-24 14:08:48 +00:00
diondiondion
d28a4428b5 refactor: Use new main menu as "Getting started" column in Advanced Web UI (#35117) 2025-06-23 09:59:47 +00:00
Claire
0bb83dfe7d Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream 2025-06-16 21:07:55 +02:00
diondiondion
69f298731e fix: Fix glitchy iOS media attachment drag interactions (#35057) 2025-06-16 15:37:04 +00:00
Claire
86a7a1ef3b Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream 2025-06-11 22:52:21 +02:00
Echo
3aed93711c Make React Spring respect animation preferences (#35018) 2025-06-11 16:51:55 +00:00
Eugen Rochko
f53bb4cd7d Add "More" to the sidebar menu with links to mutes, blocks, and so on (#34987) 2025-06-11 16:12:04 +00:00
Eugen Rochko
a13b33d851 Change navigation layout on small screens in web UI (#34910) 2025-06-11 11:55:43 +00:00
Claire
564d74ea36 Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream 2025-06-06 18:16:52 +02:00
PGray
076005eae2 fix: update search column input on param change (#34951) 2025-06-06 12:25:38 +00:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Eugen Rochko
c77158c8b7 Fix nested buttons in search popout in web UI (#34871) 2025-06-02 12:21:31 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Echo
545e8fbd0c Fix emoji bundle size (#34677) 2025-05-14 06:39:05 +00:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
79013c730d Add endorsed accounts to profiles in web UI (#34568) 2025-04-29 12:14:22 +00:00
Essem
e96044f389 Update to Twemoji 15.1.0 (#34321) 2025-04-28 14:22:14 +00:00
Eugen Rochko
926c67c648 Refactor <ActionsModal> to TypeScript (#34559) 2025-04-28 11:43:42 +00:00
Claire
300e9de24d Merge commit '498372fd06bfb0235b75888629ca5de0336ccd71' into glitch-soc/merge-upstream 2025-04-10 17:02:40 +02:00
Eugen Rochko
22d33244ee Refactor <Dropdown> into TypeScript (#34357) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-04-08 19:22:19 +00:00
Claire
e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
Echo
65c553ab59 Fix bugs with upload progress (#34325) 2025-03-31 21:05:09 +00:00
Claire
8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire
04a9252a93 Fix incorrect locked account warning in composer (#34312) 2025-03-29 18:06:46 +00:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Echo
902aab1245 Remove react-motion library (#34293) 2025-03-28 12:34:51 +00:00
Claire
d2c4f69148 Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream 2025-03-17 20:25:32 +01:00
Claire
30e334b51a Fix language detection sometimes kicking in *after* posting (#34193) 2025-03-17 16:49:09 +00:00
Claire
399fbf97de Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream 2025-03-11 18:44:32 +01:00
Claire
725a68d273 Fix unnecessary rerenders in composer dropdown menu (#34133) 2025-03-11 15:36:31 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
Damien Erambert
debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
Eugen Rochko
d50110a17a Change alt text reminder to not appear for private mentions in web UI (#33784) 2025-02-28 18:02:58 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
Eugen Rochko
1e70da5e3c Add reminder when about to post without alt text in web UI (#33760) 2025-01-29 11:37:56 +00:00
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Claire
85668becde Change language detection debouncing behavior to refresh at least once every 1.5 seconds (#33770) 2025-01-29 09:26:06 +00:00
Claire
fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Eugen Rochko
52a5c8ae05 Refactor <LanguageDropdown> into TypeScript (#33723) 2025-01-27 08:06:33 +00:00
Claire
9a0166c3f3 Convert LanguageDropdownMenu to functional component (#33704) 2025-01-24 16:11:23 +00:00
Claire
db146046c4 Convert LanguageDropdown to a functional component (#33701) 2025-01-23 12:54:23 +00:00
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Claire
3178acc5cb Fix language detection taking mentions and URLs into account (#33700) 2025-01-23 10:25:14 +00:00
Claire
8dcfd3f246 Fix WebUI crash when language detection code returns undefined (#33683) 2025-01-22 15:30:59 +00:00
Claire
05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00