treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,385 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18385 Commits (0a6bc158bdbb9439cb7e6712ffb61d8ac29c0e48)

Author SHA1 Message Date
Claire 0a6bc158bd Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
Eugen Rochko edb6aab974 Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
mogaminsk ee22b32aef Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663) 2023-07-02 11:12:16 +02:00
Eugen Rochko f504aded26 Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) 2023-07-02 10:39:55 +02:00
Matt Jankowski 5cadbaa296 Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Daniel M Brasil 2f17abc686 Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595) 2023-07-02 00:05:44 +02:00
Claire 6ca66c8cad Change local and federated timelines to be in a single firehose column (#25641) 2023-07-02 00:05:10 +02:00
Matt Jankowski 8e2e36ba0c Update uri to version 0.12.2 (CVE fix) (#25657) 2023-07-02 00:04:21 +02:00
Vivianne 6c6857f7ad Fixing an issue with a missing argument (#2261) 
undefined
 2023-07-01 22:55:43 +02:00
Matt Jankowski c1f496d2fb Remove unused routes (#25578) 2023-07-01 21:48:53 +02:00
Matt Jankowski 843448c7d9 Fix rails `rewhere` deprecation warning in directories api controller (#25625) 2023-07-01 21:48:16 +02:00
Matt Jankowski 54c3204834 Add index to backups on `user_id` column (#25647) 2023-06-30 19:09:03 +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
Eugen Rochko 377238ab0e Update Crowdin configuration file 2023-06-30 16:22:40 +02:00
Renaud Chaput d0f4ce8fa8 Remove `pkg-config` gem dependency (#25615) 2023-06-30 14:59:07 +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
Claire 8d98cffcc5 Merge pull request #2258 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-27 14:47:30 +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
renovate[bot] 5e18962962 Update dependency glob to v10.3.0 (#25608) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 12:16:17 +02:00
renovate[bot] 4ea45ce3bc Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (#25613) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 11:28:07 +02:00
renovate[bot] 51af55a38d Update dependency pg to v8.11.1 (#25604) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 10:36:21 +02:00
renovate[bot] 338334e21a Update dependency pg-connection-string to v2.6.1 (#25605) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 10:21:54 +02:00
renovate[bot] f7ba6af02c Update dependency react-textarea-autosize to v8.5.0 (#25610) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 10:20:46 +02:00
renovate[bot] 9123a25a84 Update dependency sass to v1.63.6 (#25607) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 10:20:09 +02:00
renovate[bot] efd48f3c08 Update dependency rails to v6.1.7.4 (#25606) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-27 10:19:51 +02:00
Claire 1569b36e28 Fix batch attachment deletion leaving empty directories (#25587) 2023-06-27 09:36:11 +02:00
renovate[bot] ee350f0491 Update dependency react-redux to v8.1.1 (#25432) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-26 20:59:58 +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 bddbda39fe Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-25 21:01:10 +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