me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18604 commits 2 branches 0 tags 429 MiB
Commit graph

11360 commits

Author SHA1 Message Date
Claire
6ca66c8cad Change local and federated timelines to be in a single firehose column (#25641) 2023-07-02 00:05:10 +02:00
Vivianne
6c6857f7ad Fixing an issue with a missing argument (#2261) 
undefined
 2023-07-01 22:55:43 +02:00
Matt Jankowski
843448c7d9 Fix rails rewhere deprecation warning in directories api controller (#25625) 2023-07-01 21:48:16 +02:00
Renaud Chaput
2751a6d716 Use an Immutable Record as the root state (#25584) 2023-06-30 17:03:25 +02:00
Claire
1408b62211 Fix onboarding prompt being displayed because of disconnection gaps (#25617) 2023-06-30 16:32:12 +02:00
Claire
85dc0869a5 Fix ResolveURLService not resolving local URLs for remote content (#25637) 2023-06-29 14:48:54 +02:00
jsgoldstein
5d75bf9846 Change account search to match by text when opted-in (#25599) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-06-29 13:05:21 +02:00
Claire
7a47a52cd3 Remove the search button from UI header when logged out (#25631) 2023-06-28 14:57:51 +02:00
Renaud Chaput
bbe08e28cd [Glitch] Improve dismissable banner buttons when they dont fit on 1 line 
Port ff9ed824db to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:25:21 +02:00
Eugen Rochko
5e3d6a3433 [Glitch] Fix onboarding prompt flashing while home feed is loading in web UI 
Port 66c513511c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:21:55 +02:00
Eugen Rochko
fa093eef89 [Glitch] Fix search not being easily findable on smaller screens in web UI 
Port 1924660c5b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-27 13:21:14 +02:00
Claire
ea57f8e3af Merge branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
Claire
92fbaae7b6 Fix suspending an already-limited domain (#25603) 2023-06-27 12:32:51 +02:00
Claire
1569b36e28 Fix batch attachment deletion leaving empty directories (#25587) 2023-06-27 09:36:11 +02:00
S.H
2c6f88ad71 Remove media attachment only when file was exist (#25586) 2023-06-26 16:38:19 +02:00
Eugen Rochko
bcee25e36c Change files to be deleted in batches instead of one-by-one (#23302) 2023-06-26 14:17:41 +02:00
Renaud Chaput
ff9ed824db Improve dismissable banner buttons when they dont fit on 1 line (#25580) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-26 12:31:48 +02:00
Claire
1164011bad Fix compose form not being shown when clicking “Make your first post” on mobile (#25581) 2023-06-26 12:30:35 +02:00
Eugen Rochko
65b5808421 Change header backgrounds to use fewer different colors in web UI (#25577) 2023-06-26 05:27:07 +02:00
Eugen Rochko
66c513511c Fix onboarding prompt flashing while home feed is loading in web UI (#25579) 2023-06-26 05:26:54 +02:00
Eugen Rochko
1924660c5b Fix search not being easily findable on smaller screens in web UI (#25576) 2023-06-26 05:26:41 +02:00
Claire
a4e2d81804 [Glitch] Remove unique accounts condition from Home onboarding prompt 
Port 7acdf21c77 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
Eugen Rochko
5660204731 [Glitch] Add onboarding prompt when home feed too slow in web UI 
Port ad92c48d71 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
Claire
7cd1b2d753 [Glitch] Fix j/k keyboard shortcuts on some status lists 
Port 9a27d4ec36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 17:40:01 +02:00
mogaminsk
34310c3924 [Glitch] Fix custom signup URL may not loaded 
Port e87a2c676c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
Ian
e7905c8b32 [Glitch] Change emoji picker icon 
Port a56475866f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
たいち ひ
f0999de66f [Glitch] Rewrite <AutosuggestHashtag /> as FC and TS 
Port 6c4a6bd115 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
Claire
b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire
3d50947e62 Fix verified badge in account lists potentially including rel="me" links (#25561) 2023-06-24 17:24:31 +02:00
Eugen Rochko
1caf3a3933 Change labels and styles on the onboarding screen in web UI (#25559) 2023-06-23 16:34:27 +02:00
Claire
7acdf21c77 Remove unique accounts condition from Home onboarding prompt (#25556) 2023-06-23 14:44:54 +02:00
Eugen Rochko
ad92c48d71 Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
Claire
3406cb0427 Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Claire
9a27d4ec36 Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
Claire
d0144d2be3 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2023-06-22 14:56:14 +02:00
Claire
c1c87fe7b9 Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
mogaminsk
e87a2c676c Fix custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
Ian
a56475866f Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
Claire
5e5af7a0fe Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
Claire
ba5c12974a Fix missing validation on default_privacy setting (#25513) 2023-06-20 18:32:14 +02:00
Claire
923dde8e6c Fix wrong view being displayed when a webhook fails validation (#25464) 2023-06-20 18:15:35 +02:00
Claire
4e861795a4 Add translate="no" to outgoing mentions and links (#25524) 2023-06-20 18:10:19 +02:00
Emelia Smith
71d3100038 Prevent UserCleanupScheduler from overwhelming streaming (#25519) 2023-06-20 18:04:35 +02:00
Claire
ecf17008e8 Fix user settings not getting validated (#25508) 2023-06-19 14:06:06 +01:00
たいち ひ
6c4a6bd115 Rewrite <AutosuggestHashtag /> as FC and TS (#25481) 2023-06-19 14:11:46 +02:00
Matt Jankowski
d05a68a12e Reduce sleep time in request pool spec (#25470) 2023-06-19 13:48:25 +02:00
Matt Jankowski
eb10ac2b3e Remove unused picture_hint helper method (#25485) 2023-06-19 09:04:15 +02:00
Daniel M Brasil
498e3231b6 Fix incorrect pagination headers in /api/v2/admin/accounts (#25477) 2023-06-19 08:53:05 +02:00
Claire
4e889e478f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
 2023-06-18 16:14:29 +02:00
Claire
85f74ed0a7 Fix cross-origin loading of locales (#25498) 2023-06-18 15:47:04 +02:00
Claire
d5a295f8c0 [Glitch] Fix non-interactive upload container being given a button role and tabIndex 
Port 7c70237d7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 14:10:49 +02:00
Claire
7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Eugen Rochko
85041b74fb [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow 
Port 239ee4f5d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:58 +02:00
たいち ひ
5a38d538a0 [Glitch] Rewrite emoji_mart_data_light as TS 
Port 6e0c48cbe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:19 +02:00
alfe
7e24689b7d [Glitch] Rewrite <LoadingIndicator/> as FC and TS (#25364) 
Port 293cf44626 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:10:37 +02:00
Renaud Chaput
0e43f4d4fc [Glitch] Add missing report category translation 
Port b51a10a066 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:43:07 +02:00
alfe
8cbdffe2c7 [Glitch] Rewrite <LoadPending /> as FC and TS 
Port 569ff79fb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:42:04 +02:00
Eugen Rochko
1ce44ec36e [Glitch] Change "bot" label to "automated" 
Port 272e099bce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:40:56 +02:00
Claire
f101b67a45 Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
Claire
7c70237d7e Fix non-interactive upload container being given a button role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00
Daniel M Brasil
4a994e5b50 Fix ArgumentError in /api/v1/admin/accounts/:id/action (#25386) 2023-06-14 15:21:36 +02:00
Eugen Rochko
937764ce4b Fix always redirecting to onboarding in web UI (#25396) 2023-06-14 09:05:03 +02:00
Claire
a424076226 Fix ArgumentError when loading newer Private Mentions (#25399) 2023-06-14 08:54:52 +02:00
Eugen Rochko
989a8758e3 Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00
Eugen Rochko
239ee4f5d1 Fix CAPTCHA page not following design pattern of sign-up flow (#25395) 2023-06-13 22:30:40 +02:00
たいち ひ
6e0c48cbe8 Rewrite emoji_mart_data_light as TS (#25138) 2023-06-13 19:28:31 +02:00
alfe
293cf44626 Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
Renaud Chaput
b51a10a066 Add missing report category translation (#25400) 2023-06-13 15:05:40 +02:00
Eugen Rochko
94ef94c5ea Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
Plastikmensch
a804371e21 [Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) 
Port 868d478b1b to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-11 13:33:45 +02:00
alfe
569ff79fb8 Rewrite <LoadPending /> as FC and TS (#25363) 2023-06-11 04:47:18 +02:00
Eugen Rochko
272e099bce Change "bot" label to "automated" (#25356) 2023-06-11 04:47:07 +02:00
Claire
f49b12e06d Fix some translation strings inconsistencies 2023-06-10 19:21:44 +02:00
Claire
1c25f35ddf Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
 2023-06-10 18:42:29 +02:00
Claire
14788cf0ce Switch to using a common runtime chunk rather than locales 2023-06-10 17:43:13 +02:00
Claire
c51e8de4ad Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 2023-06-10 17:18:36 +02:00
Eugen Rochko
b5872b0686 [Glitch] Change design of dropdowns in web UI 
Port 7abfddd8a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 17:10:06 +02:00
alfe
ee6682e48d [Glitch] Rewrite <LoadMore /> as FC and TS 
Port f9c819e8db to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:59:25 +02:00
Claire
ee1de4206a Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
 2023-06-10 16:48:01 +02:00
Claire
29e63ef4d5 [Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for / 
Port 21f904b344 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:38:03 +02:00
S.H
00307189bc [Glitch] Fix not shown announcements in hometimeline. 
Port 94f9888d57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:37:20 +02:00
Claire
3dd186bbf1 [Glitch] Fix design issues with recent react-intl upgrade 
Port 4c2503d36c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:36:54 +02:00
Darius Kazemi
46b4268007 [Glitch] Add exclusive lists 
Port 6debddcf89 to glitch-soc

Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:36:15 +02:00
Claire
60762fb8ba [Glitch] Add card with who invited you to join when displaying rules on sign-up 
Port SCSS from c7a8838bd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:30:36 +02:00
Jed Fox
2877b12754 [Glitch] Fix spacing of middle dots in the detailed status meta section 
Port 2d2750c6a9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:29:48 +02:00
Claire
085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
 2023-06-10 16:22:14 +02:00
Renaud Chaput
333c28ce6d [Glitch] Fix /share and cleanup and reorganize frontend locale loading 
Port 29851c83bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:18:01 +02:00
Claire
3b87fe21fa Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different.
 2023-06-10 15:32:29 +02:00
S.H
7ccf99b652 [Glitch] Fix using Date.now() instead of intl.now() 
Port 4e28b89f51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 15:21:04 +02:00
Claire
e6b6a0535e Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire
fd0b9c9881 [Glitch] Add a confirmation screen when suspending a domain 
Port 8ee98cfd2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 15:10:24 +02:00
Claire
13b84da439 Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
Renaud Chaput
5715cd6b8a [Glitch] Fix prev/next buttons color in media viewer 
Port 40e756f291 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:48:41 +02:00
Christian Schmidt
8b958c0858 [Glitch] Translate CW, poll options and media descriptions 
Port 971eafc709 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:48:41 +02:00
Claire
447b44a5d6 Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
 2023-06-10 14:38:04 +02:00
Renaud Chaput
b428d82286 [Glitch] Upgrade react-intl 
Port 76960f128a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:37:08 +02:00
Claire
c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.
 2023-06-10 12:38:33 +02:00
Eugen Rochko
1dd243cc09 Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
Matt Jankowski
8b5680fd9a Remove unused redis_info method Admin::Dashboard (#25345) 2023-06-09 14:03:35 +02:00
jsgoldstein
975914e0a6 Fix translations for changing theme (#25340) 2023-06-08 17:12:41 +02:00