resolve merge conflicts

remove charts
Merge branch 'main' into update-mfm-core
2023-06-11 14:49:20 +02:00 · 2023-05-27 10:36:20 +02:00 · 2023-05-27 09:12:58 +02:00 · 2023-05-21 19:16:44 +02:00 · 2023-05-21 18:41:46 +02:00 · 2023-05-21 17:23:26 +02:00
1 changed files with 10 additions and 10 deletions
--- a/packages/backend/src/services/chart/index.ts
+++ b/packages/backend/src/services/chart/index.ts
@ -28,18 +28,18 @@ export const perUserDriveChart = new PerUserDriveChart();
 export const apRequestChart = new ApRequestChart();
 const charts = [
-	federationChart,
+	// federationChart,
-	notesChart,
+	// notesChart,
 	usersChart,
-	activeUsersChart,
+	// activeUsersChart,
-	instanceChart,
+	// instanceChart,
-	perUserNotesChart,
+	// perUserNotesChart,
-	driveChart,
+	// driveChart,
-	perUserReactionsChart,
+	// perUserReactionsChart,
-	hashtagChart,
+	// hashtagChart,
 	perUserFollowingChart,
-	perUserDriveChart,
+	// perUserDriveChart,
-	apRequestChart,
+	// apRequestChart,
 ];
 // Write memory information to DB every 20 minutes
Author	SHA1	Message	Date
Puniko	7e902c8b9d	resolve merge conflicts	2023-06-11 14:49:20 +02:00
Puniko	ce4b552fa7	remove charts	2023-05-27 10:36:20 +02:00
Puniko	47f971c8de	Merge branch 'main' into update-mfm-core	2023-05-27 09:12:58 +02:00
Puniko	5788c675c7	parseSimple in backend	2023-05-21 19:16:44 +02:00
Puniko	5f9ab12596	update mfm-js lib	2023-05-21 18:41:46 +02:00
Puniko	2393487bc2	add fg and bg tag	2023-05-21 17:23:26 +02:00
Puniko	eb8463b292	add scale tag	2023-05-21 17:16:22 +02:00
Puniko	83567995e7	add position token	2023-05-21 16:52:11 +02:00