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

11277 Commits

Author SHA1 Message Date
Eugen Rochko
4eda233e09 Add webhook templating (#23289) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 10:42:47 +02:00
Eugen Rochko
0ddc895282 Change follow button in account row to be more obvious in web UI (#24956) 2023-06-06 04:14:28 +02:00
Matt Jankowski
af135bddd0 Update Admin::Metrics::Measure classes for Rails 7 (#25236) 2023-06-05 20:46:04 +02:00
Claire
1483a3ddfe Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279) 2023-06-05 17:32:24 +02:00
Matt Jankowski
3b21c13dcc Rails 7 compatibility fix for Admin::Metrics::Dimension classes (#25277) 2023-06-05 16:52:33 +02:00
S.H
a6c898f501 Fix not shown announcements in hometimeline. (#25251) 2023-06-05 14:49:51 +02:00
dependabot[bot]
7fc1297c3e [Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 
Port 89d6341c80 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:31:45 +02:00
Claire
5e876c2901 [Glitch] Fix null signUp URL in various places 
Port 14bb6bb29a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:22 +02:00
y.takahashi
4993b6e800 [Glitch] Handle Surrogate Pairs in truncate() 
Port 64b960b6b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:02 +02:00
Claire
c22fc2fa80 Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
Claire
c2c396157f Fix design issues with recent react-intl upgrade (#25272) 2023-06-05 09:52:36 +02:00
Darius Kazemi
bacb674921 Add exclusive lists (#22048) 
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>
 2023-06-05 09:37:02 +02:00
Matt Jankowski
0daf78f903 Add allow_other_host: true to backups controller (#25266) 2023-06-05 08:22:03 +02:00
Eugen Rochko
4a5464f360 Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954) 2023-06-05 01:42:17 +02:00
Claire
ee771f5bad Fix closeModal invocation (#2239) 
Fixes #2238

Some call sites where missed in 382b2a506a
 2023-06-04 22:05:45 +02:00
Jed Fox
768b00c4d0 Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
Claire
0766c9a631 Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
Claire
94329f28e1 Change wording of “Content cache retention period” setting to highlight destructive implications (#23261) 2023-06-02 18:09:08 +02:00
Jed Fox
acc419b81b Fix spacing of middle dots in the detailed status meta section (#25247) 2023-06-02 15:40:23 +02:00
Renaud Chaput
b0780cfeed Fix /share and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
Claire
5fae2de454 Fix overflow behavior of account rows (#25131) 2023-06-01 14:47:55 +02:00
Claire
8884d1ece0 Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
S.H
b3f9a0da52 Fix using Date.now() instead of intl.now() (#25234) 2023-06-01 13:46:19 +02:00
Matt Jankowski
f84037ae2b Remove unused #hash_to_object method in SettingsHelper (#25213) 2023-06-01 09:47:05 +02:00
Claire
e9385e93e9 Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
Claire
b922ad7a1b Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018) 2023-06-01 09:23:28 +02:00
Claire
2b45fecde1 Fix multiple N+1s in ConversationsController (#25134) 2023-06-01 02:41:51 +02:00
Renaud Chaput
675672feb6 Fix prev/next buttons color in media viewer (#25231) 2023-06-01 02:25:38 +02:00
Christian Schmidt
69057467cb Translate CW, poll options and media descriptions (#24175) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-01 00:10:21 +02:00
Renaud Chaput
44cd88adc4 Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
Matt Jankowski
00c222377d Remove unused Settings::Extend module (#25214) 2023-05-31 23:34:48 +02:00
Renaud Chaput
b7d995cb00 Disable some metrics cops (#25215) 2023-05-31 23:33:10 +02:00
Claire
b6519ab3f5 Fix inconsistent naming of Instance.by_domain_and_subdomain (#25159) 2023-05-31 09:57:24 +02:00
dependabot[bot]
89d6341c80 Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-05-31 09:27:21 +02:00
Claire
14bb6bb29a Fix null signUp URL in various places (#25190) 2023-05-30 19:01:42 +02:00
S.H
8c183a9831 Align argument type to keyword argument for private process method in FetchResourceService (#25189) 2023-05-30 09:28:01 +02:00
y.takahashi
64b960b6b3 Handle Surrogate Pairs in truncate() (#25148) 2023-05-29 11:55:16 +02:00
Claire
5ed48e6878 Fix extraneous newlines 2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
382b2a506a [Glitch] Rewrite actions/modal and reducers/modal with typescript 
Port 38c6216082 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:49:55 +02:00
たいち ひ
6a592083f1 [Glitch] Fix export style of <LoadGap /> based on <Domain /> 
Port 4197b5e4c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:15:21 +02:00
Renaud Chaput
0009b4b574 [Glitch] Update inconsistent defaultMessage 
Port e58c36d308 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 17:14:31 +02:00
Claire
0669783da8 Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
Eugen Rochko
e7dc375aab [Glitch] Change share action from being in action bar to being in dropdown in web UI 
Port 1caa5ff39e to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:59:12 +02:00
Renaud Chaput
7bec63e6e2 [Glitch] Fix null signUp URL handling from #25014 
Port 40b948a1fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:52:16 +02:00
たいち ひ
017fbc7a74 [Glitch] Rewrite <LoadGap /> as FC and TS 
Port 7336f3648b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 16:48:17 +02:00
Claire
0e7466717f Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
 2023-05-28 16:41:14 +02:00
Claire
7d7db8977b Fix import order with ESLint 
Port d27216dc46 to glitch-soc
 2023-05-28 16:38:10 +02:00
Claire
1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
 2023-05-28 15:54:31 +02:00
Claire
9e5278ea7b [Glitch] Add support for custom sign-up URLs 
Port ca66e61b93 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 15:09:28 +02:00
Claire
8f380a33fc [Glitch] Fix video player offering to expand in a lightbox when it's in an iframe 
Port 100840c06e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-28 15:06:29 +02:00