feat: edit widgets color

Merge branch 'master' into develop
2022-02-07 18:24:02 +09:00 · 2022-02-07 18:18:26 +09:00 · 2022-02-03 10:48:04 +09:00 · 2022-02-03 01:43:09 +00:00 · 2022-02-03 01:42:58 +00:00 · 2022-02-03 04:51:29 +09:00
24 changed files with 1840 additions and 66 deletions
--- a/.github/ISSUE_TEMPLATE/01_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.md
@ -16,11 +16,11 @@ First, in order to avoid duplicate Issues, please search to see if the problem y

 <!-- Tell us what the bug is -->

-## 🙂 Expected Behavior
+## 🥰 Expected Behavior

 <!--- Tell us what should happen -->

-## ☹️ Actual Behavior
+## 🤬 Actual Behavior

 <!--- Tell us what happens instead of the expected behavior -->

@ -33,3 +33,7 @@ First, in order to avoid duplicate Issues, please search to see if the problem y
 ## 📌 Environment

 <!-- Tell us where on the platform it happens -->
+
+Misskey version:
+Your OS:
+Your browser:
--- a/locales/index.js
+++ b/locales/index.js
@ -24,6 +24,7 @@ const languages = [
 	'fr-FR',
 	'id-ID',
 	'it-IT',
+	'ja-NY',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',
@ -56,6 +57,7 @@ module.exports = Object.entries(locales)
 		const [lang] = k.split('-');
 		switch (k) {
 			case 'ja-JP': return v;
+			case 'ja-NY':
 			case 'ja-KS':
 			case 'en-US': return merge(locales['ja-JP'], v);
 			default: return merge(
--- a/locales/ja-NY.yml
+++ b/locales/ja-NY.yml
--- a/package.json
+++ b/package.json
@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.103.1",
+	"version": "12.103.1-simkey",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/misskey-dev/misskey.git"
+		"url": "https://github.com/sim1222/misskey.git"
 	},
 	"private": true,
 	"scripts": {
@ -46,7 +46,7 @@
 		"@types/fluent-ffmpeg": "2.1.20",
 		"@typescript-eslint/parser": "5.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.3.1",
+		"cypress": "9.4.1",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.5.5"
 	}
--- a/packages/backend/src/misc/is-duplicate-key-value-error.ts
+++ b/packages/backend/src/misc/is-duplicate-key-value-error.ts
@ -1,3 +1,3 @@
-export function isDuplicateKeyValueError(e: Error): boolean {
-	return e.message.startsWith('duplicate key value');
+export function isDuplicateKeyValueError(e: unknown | Error): boolean {
+	return (e as any).message && (e as Error).message.startsWith('duplicate key value');
 }
--- a/packages/backend/src/server/api/call.ts
+++ b/packages/backend/src/server/api/call.ts
@ -90,7 +90,7 @@ export default async (endpoint: string, user: User | null | undefined, token: Ac

 	// API invoking
 	const before = performance.now();
-	return await ep.exec(data, user, token, ctx!.file).catch((e: Error) => {
+	return await ep.exec(data, user, token, ctx?.file).catch((e: Error) => {
 		if (e instanceof ApiError) {
 			throw e;
 		} else {
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@ -105,7 +105,10 @@ export interface NoteStreamTypes {
 	};
 	reacted: {
 		reaction: string;
-		emoji?: Emoji;
+		emoji?: {
+			name: string;
+			url: string;
+		} | null;
 		userId: User['id'];
 	};
 	unreacted: {
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@ -4,7 +4,7 @@
 	"start_url": "/",
 	"display": "standalone",
 	"background_color": "#313a42",
-	"theme_color": "#86b300",
+	"theme_color": "#a7dc4e",
 	"icons": [
 		{
 			"src": "/static-assets/icons/192.png",
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@ -19,8 +19,9 @@ html
 		meta(charset='utf-8')
 		meta(name='application-name' content='Misskey')
 		meta(name='referrer' content='origin')
-		meta(name='theme-color' content='#86b300')
-		meta(name='theme-color-orig' content='#86b300')
+		meta(name='theme-color' content='#a7dc4e')
+		meta(name='theme-color-orig' content='#a7dc4e')
+		meta(property='twitter:card' content='summary')
 		meta(property='og:site_name' content= instanceName || 'Misskey')
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		link(rel='icon' href= icon || '/favicon.ico')
@ -42,7 +43,9 @@ html
 		block meta

 		block og
-			meta(property='og:image' content=img)
+			meta(property='og:title'       content= title || 'Misskey') 
+			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') 
+			meta(property='og:image'       content= img)

 		style
 			include ../style.css
--- a/packages/backend/src/server/web/views/channel.pug
+++ b/packages/backend/src/server/web/views/channel.pug
@ -16,6 +16,3 @@ block og
 	meta(property='og:description' content= channel.description)
 	meta(property='og:url'         content= url)
 	meta(property='og:image'       content= channel.bannerUrl)
-
-block meta
-	meta(name='twitter:card' content='summary')
--- a/packages/backend/src/server/web/views/clip.pug
+++ b/packages/backend/src/server/web/views/clip.pug
@ -26,8 +26,6 @@ block meta
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:clip-id' content=clip.id)

-	meta(name='twitter:card' content='summary')
-
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ b/packages/backend/src/server/web/views/gallery-post.pug
@ -25,8 +25,6 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)

-	meta(name='twitter:card' content='summary')
-
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@ -26,9 +26,7 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:note-id' content=note.id)
-
-	meta(name='twitter:card' content='summary')
-
+	
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
--- a/packages/backend/src/server/web/views/page.pug
+++ b/packages/backend/src/server/web/views/page.pug
@ -26,8 +26,6 @@ block meta
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:page-id' content=page.id)

-	meta(name='twitter:card' content='summary')
-
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@ -25,8 +25,6 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)

-	meta(name='twitter:card' content='summary')
-
 	if profile.twitter
 		meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)

--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@ -59,7 +59,7 @@ class NotificationManager {

 		if (exist) {
 			// 「メンションされているかつ返信されている」場合は、メンションとしての通知ではなく返信としての通知にする
-			if (reason != 'mention') {
+			if (reason !== 'mention') {
 				exist.reason = reason;
 			}
 		} else {
@ -201,7 +201,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		mentionedUsers.push(await Users.findOneOrFail(data.reply.userId));
 	}

-	if (data.visibility == 'specified') {
+	if (data.visibility === 'specified') {
 		if (data.visibleUsers == null) throw new Error('invalid param');

 		for (const u of data.visibleUsers) {
@ -301,7 +301,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		if (Users.isRemoteUser(user)) activeUsersChart.update(user);

 		// 未読通知を作成
-		if (data.visibility == 'specified') {
+		if (data.visibility === 'specified') {
 			if (data.visibleUsers == null) throw new Error('invalid param');

 			for (const u of data.visibleUsers) {
@ -439,7 +439,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 async function renderNoteOrRenoteActivity(data: Option, note: Note) {
 	if (data.localOnly) return null;

-	const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length == 0)
+	const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length === 0)
 		? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote.id}`, note)
 		: renderCreate(await renderNote(note, false), note);

@ -478,7 +478,7 @@ async function insertNote(user: { id: User['id']; host: User['host']; }, data: O
 		userId: user.id,
 		localOnly: data.localOnly!,
 		visibility: data.visibility as any,
-		visibleUserIds: data.visibility == 'specified'
+		visibleUserIds: data.visibility === 'specified'
 			? data.visibleUsers
 				? data.visibleUsers.map(u => u.id)
 				: []
@ -502,7 +502,7 @@ async function insertNote(user: { id: User['id']; host: User['host']; }, data: O
 		insert.mentions = mentionedUsers.map(u => u.id);
 		const profiles = await UserProfiles.find({ userId: In(insert.mentions) });
 		insert.mentionedRemoteUsers = JSON.stringify(mentionedUsers.filter(u => Users.isRemoteUser(u)).map(u => {
-			const profile = profiles.find(p => p.userId == u.id);
+			const profile = profiles.find(p => p.userId === u.id);
 			const url = profile != null ? profile.url : null;
 			return {
 				uri: u.uri,
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@ -39,7 +39,7 @@ export default async function(user: User, note: Note, quiet = false) {
 			let renote: Note | undefined;

 			// if deletd note is renote
-			if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length == 0)) {
+			if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
 				renote = await Notes.findOne({
 					id: note.renoteId,
 				});
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@ -76,7 +76,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
 	// カスタム絵文字リアクションだったら絵文字情報も送る
 	const decodedReaction = decodeReaction(reaction);

-	let emoji = await Emojis.findOne({
+	const emoji = await Emojis.findOne({
 		where: {
 			name: decodedReaction.name,
 			host: decodedReaction.host,
--- a/packages/backend/src/services/note/read.ts
+++ b/packages/backend/src/services/note/read.ts
@ -52,7 +52,7 @@ export default async function(

 		if (note.user != null) { // たぶんnullになることは無いはずだけど一応
 			for (const antenna of myAntennas) {
-				if (await checkHitAntenna(antenna, note, note.user as any, undefined, Array.from(following))) {
+				if (await checkHitAntenna(antenna, note, note.user, undefined, Array.from(following))) {
 					readAntennaNotes.push(note);
 				}
 			}
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@ -114,9 +114,9 @@ export async function sendEmail(to: string, subject: string, html: string, text:
 </html>`,
 		});

-		logger.info('Message sent: %s', info.messageId);
-	} catch (e) {
-		logger.error(e);
-		throw e;
+		logger.info(`Message sent: ${info.messageId}`);
+	} catch (err) {
+		logger.error(err as Error);
+		throw err;
 	}
 }
--- a/packages/client/src/components/chart.vue
+++ b/packages/client/src/components/chart.vue
@ -250,7 +250,15 @@ export default defineComponent({
 					},
 					interaction: {
 						intersect: false,
+						mode: 'index',
 					},
+					elements: {
+						point: {
+							hoverRadius: 5,
+							hoverBorderWidth: 2,
+						},
+					},
+					animation: false,
 					plugins: {
 						legend: {
 							display: props.detailed,
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@ -14,7 +14,7 @@ if (localStorage.getItem('accounts') != null) {
 //#endregion

 import { computed, createApp, watch, markRaw, version as vueVersion } from 'vue';
-import * as compareVersions from 'compare-versions';
+import compareVersions from 'compare-versions';

 import widgets from '@/widgets';
 import directives from '@/directives';
--- a/packages/client/src/widgets/server-metric/pie.vue
+++ b/packages/client/src/widgets/server-metric/pie.vue
@ -29,7 +29,7 @@ const props = defineProps<{

 const r = 0.45;

-const color = $computed(() => `hsl(${180 - (props.value * 180)}, 80%, 70%)`);
+const color = `hsl(248%, 80%, 70%)`;
 const strokeDashoffset = $computed(() => (1 - props.value) * (Math.PI * (r * 2)));
 </script>

--- a/yarn.lock
+++ b/yarn.lock
@ -1117,10 +1117,10 @@ csso@~2.3.1:
    clap "^1.0.9"
    source-map "^0.5.3"

-cypress@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.3.1.tgz#8116f52d49d6daf90a91e88f3eafd940234d2958"
-  integrity sha512-BODdPesxX6bkVUnH8BVsV8I/jn57zQtO1FEOUTiuG2us3kslW7g0tcuwiny7CKCmJUZz8S/D587ppC+s58a+5Q==
+cypress@9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.4.1.tgz#1a4ba706435829c24b7edf350c2b059e05da9084"
+  integrity sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==
  dependencies:
    "@cypress/request" "^2.88.10"
    "@cypress/xvfb" "^1.2.4"
@ -1159,10 +1159,10 @@ cypress@9.3.1:
    pretty-bytes "^5.6.0"
    proxy-from-env "1.0.0"
    request-progress "^3.0.0"
+    semver "^7.3.2"
    supports-color "^8.1.1"
    tmp "~0.2.1"
    untildify "^4.0.0"
-    url "^0.11.0"
    yauzl "^2.10.0"

 d@1, d@^1.0.1:
@ -3422,11 +3422,6 @@ pumpify@^1.3.5:
    inherits "^2.0.3"
    pump "^2.0.0"

-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
 punycode@^2.1.0, punycode@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@ -3450,11 +3445,6 @@ query-string@^4.1.0:
    object-assign "^4.1.0"
    strict-uri-encode "^1.0.0"

-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
 queue-microtask@^1.2.2:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@ -3736,7 +3726,7 @@ semver-greatest-satisfied-range@^1.1.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

-semver@^7.3.5:
+semver@^7.3.2, semver@^7.3.5:
  version "7.3.5"
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@ -4353,14 +4343,6 @@ urix@^0.1.0:
  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=

-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 use@^3.1.0:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
Author	SHA1	Message	Date
sim1222	45f8fdc52d	feat: edit widgets color	2022-02-07 18:24:02 +09:00
sim1222	a3354213d0	feat: edit widgets color	2022-02-07 18:18:26 +09:00
こけっち	5d9b9eeaad	Merge branch 'master' into develop	2022-02-03 10:48:04 +09:00
sim1222	98f5cb6cd2	git push origin developMerge branch 'misskey-dev-develop' into develop	2022-02-03 01:43:09 +00:00
sim1222	b88c4d6d34	fix comf	2022-02-03 01:42:58 +00:00
syuilo	12678eb1c0	Update 01_bug-report.md	2022-02-03 04:51:29 +09:00
syuilo	435945d09d	refactor	2022-02-03 02:41:22 +09:00
syuilo	5e198381d3	🎨	2022-02-03 02:08:54 +09:00
syuilo	978282404a	fix(client): fix compare-versions import	2022-02-03 01:45:34 +09:00
Kainoa Kanter	8485559318	Twitterの埋め込みを修正しました [Fix Twitter embed] (#8193 ) * Fix Twitter embed * Update packages/backend/src/server/web/views/gallery-post.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/channel.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/base.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/base.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/clip.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/channel.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/note.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/gallery-post.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/page.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/user.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/page.pug Co-authored-by: rinsuki <428rinsuki+git@gmail.com> * Yay! * Update packages/backend/src/server/web/views/base.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/base.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update packages/backend/src/server/web/views/base.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * Update page.pug * Update channel.pug * Update gallery-post.pug * Update note.pug * Update page.pug * Update user.pug Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> Co-authored-by: rinsuki <428rinsuki+git@gmail.com>	2022-02-03 00:51:41 +09:00
dependabot[bot]	a4a40f3b5b	chore(deps-dev): bump cypress from 9.3.1 to 9.4.1 (#8239 ) Bumps [cypress](https://github.com/cypress-io/cypress) from 9.3.1 to 9.4.1. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v9.3.1...v9.4.1) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-02-03 00:50:40 +09:00
MeiMei	fc9a6a805f	fix: ストリーミングからのAPIリクエストが出来ないのを修正 (#8244 ) * Update call.ts * あれ	2022-02-02 20:04:52 +09:00
こけっち	8489c3ca7b	Merge pull request #22 from sim1222/v12.102.1 Merge develop V12.102.1	2022-01-29 05:34:12 +09:00
こけっち	33871f3cb8	Merge branch 'master' into v12.102.1	2022-01-29 05:34:03 +09:00
sim1222	5eb758fa28	update package.json	2022-01-29 04:17:15 +09:00
こけっち	56d8f7f257	Merge pull request #19 from sim1222/develop Merge Develop v12.102.0	2022-01-27 00:53:29 +09:00
sim1222	74c3e6d483	Merge branch 'misskey-dev-develop' into develop	2022-01-27 00:52:19 +09:00
sim1222	ead62a538f	fix confrict	2022-01-27 00:52:09 +09:00
こけっち	72058b30c2	Merge branch 'misskey-dev:develop' into develop	2022-01-26 20:09:42 +09:00
こけっち	22102639a8	Merge pull request #16 from sim1222/develop Change Color	2022-01-13 03:11:14 +09:00
こけっち	ee4289076f	Change Color	2022-01-13 03:10:42 +09:00
こけっち	be011d3985	Merge pull request #15 from sim1222/develop change color	2022-01-09 21:43:44 +09:00
こけっち	6ef86df368	change color	2022-01-09 21:43:12 +09:00
こけっち	34e099984f	Merge pull request #14 from sim1222/develop Fix ja-NY Language	2022-01-04 19:50:23 +09:00
こけっち	5a1c6be944	Fix ja-NY Language	2022-01-04 19:33:41 +09:00
こけっち	25991cfdc1	Merge pull request #11 from sim1222/develop Merge Develop 12.101.1	2021-12-29 18:15:50 +09:00
sim1222	b1a526aeea	fix conflict	2021-12-29 18:15:03 +09:00
こけっち	f31ef70ce7	Merge pull request #9 from sim1222/develop Merge develop 12.101.0	2021-12-29 15:12:02 +09:00
sim1222	09a751b992	git push origin developMerge branch 'misskey-dev-develop' into develop	2021-12-29 15:08:42 +09:00
sim1222	a41e4ed4fd	fix conflict	2021-12-29 15:08:31 +09:00
こけっち	b77f7f5041	Merge pull request #7 from sim1222/develop change repo url	2021-12-28 16:16:19 +09:00
こけっち	7adcf99865	change repo url	2021-12-28 16:15:51 +09:00
こけっち	cc2d5480f3	Merge pull request #6 from sim1222/develop wip	2021-12-28 03:16:18 +09:00
こけっち	fdd129fb83	wip	2021-12-28 03:15:56 +09:00
こけっち	8dd3fef0e2	Merge pull request #5 from sim1222/develop fix wip	2021-12-28 03:04:25 +09:00
こけっち	f1c66f09e1	fix wip	2021-12-28 03:03:58 +09:00
こけっち	6f328f2ccf	Merge pull request #4 from sim1222/develop fix typo	2021-12-28 02:55:19 +09:00
こけっち	70b3d598c6	fix typo	2021-12-28 02:54:53 +09:00
こけっち	668c403ece	Merge pull request #3 from sim1222/develop fix NYA JP	2021-12-28 02:49:24 +09:00
こけっち	c873f17080	fix NYA JP	2021-12-28 02:48:55 +09:00
こけっち	3f6691bd5e	Merge pull request #2 from sim1222/develop vsddgvsgdsgsdsg	2021-12-28 02:27:13 +09:00
こけっち	260ece9881	Update package.json	2021-12-28 02:26:10 +09:00
こけっち	9a4c04fe79	Merge pull request #1 from sim1222/sim-dev-ja-nya Sim dev ja nya	2021-12-28 02:25:13 +09:00
こけっち	24896d4a36	Merge branch 'misskey-dev:develop' into sim-dev-ja-nya	2021-12-28 02:17:22 +09:00
こけっち	8aea52e9b4	てぬきにゃ翻訳	2021-12-28 02:05:40 +09:00
syuilo	1b956af855	Merge branch 'develop'	2021-12-18 20:59:16 +09:00
syuilo	80c88e13ff	Merge branch 'develop'	2021-12-17 19:43:00 +09:00
syuilo	ad9e6a4ec5	Merge branch 'develop'	2021-12-17 16:18:29 +09:00
syuilo	504f182448	Merge branch 'develop'	2021-12-14 23:28:29 +09:00
syuilo	fd5999378b	Merge branch 'develop'	2021-12-14 23:13:41 +09:00
syuilo	8451436cb8	Merge branch 'develop'	2021-12-14 23:03:56 +09:00
syuilo	37628953c5	Merge branch 'develop'	2021-12-14 22:38:31 +09:00
syuilo	83a77f1064	Merge branch 'develop'	2021-12-03 22:30:10 +09:00
syuilo	99640a35a3	Merge branch 'develop'	2021-11-19 20:41:40 +09:00
syuilo	88cdbc2ad6	Merge branch 'develop'	2021-11-19 20:39:59 +09:00
syuilo	db10103d8e	Merge branch 'develop'	2021-11-13 17:08:15 +09:00
syuilo	2795fe4579	Merge branch 'develop'	2021-11-13 12:23:49 +09:00
syuilo	54631026de	Merge branch 'develop'	2021-10-31 20:21:50 +09:00
syuilo	80783199a9	Merge branch 'develop'	2021-10-25 03:57:09 +09:00
syuilo	6d557269c1	Merge branch 'develop'	2021-10-25 02:34:58 +09:00
syuilo	26b268588f	Merge branch 'develop'	2021-10-23 11:36:50 +09:00
syuilo	a1af83c0ab	Merge branch 'develop'	2021-10-23 02:46:44 +09:00
syuilo	d0d5068f72	Merge branch 'develop'	2021-10-23 01:08:45 +09:00
syuilo	8a1f3a4c0b	Merge branch 'develop'	2021-10-16 19:55:44 +09:00
syuilo	338793d891	Merge branch 'develop'	2021-09-22 22:53:41 +09:00
syuilo	c82ce9233b	Merge branch 'develop'	2021-09-05 16:26:34 +09:00
syuilo	4b48ba4e8c	Merge branch 'develop'	2021-09-04 20:38:20 +09:00
syuilo	7115bd46ff	Merge branch 'develop'	2021-08-24 14:40:22 +09:00
syuilo	e967d9ded3	Merge branch 'develop'	2021-08-24 13:20:30 +09:00
syuilo	f00ceedae4	Merge branch 'develop'	2021-08-21 17:59:29 +09:00
syuilo	df67836c1a	Merge branch 'develop'	2021-08-17 22:01:46 +09:00
syuilo	9fd0e90850	Merge branch 'develop'	2021-08-12 12:48:58 +09:00
syuilo	42c4ea38cc	Merge branch 'develop'	2021-08-11 22:36:59 +09:00
syuilo	df53968306	Merge branch 'develop'	2021-08-09 21:47:52 +09:00
syuilo	df530bb66d	Merge branch 'develop'	2021-08-09 21:47:23 +09:00
syuilo	c52e30e8e0	Merge branch 'develop'	2021-08-08 23:25:21 +09:00
syuilo	5e6e1e237a	Merge branch 'develop'	2021-07-26 11:15:42 +09:00
syuilo	943a1940e2	Merge branch 'develop'	2021-07-23 22:43:47 +09:00
syuilo	12913a16fd	Merge branch 'develop'	2021-07-23 21:37:09 +09:00
syuilo	acb9244205	Merge branch 'develop'	2021-07-20 12:11:07 +09:00
syuilo	d04014f875	Merge branch 'develop'	2021-06-10 14:03:28 +09:00
syuilo	929e545514	Merge branch 'develop'	2021-05-31 13:06:40 +09:00
syuilo	942c802431	Merge branch 'develop'	2021-05-21 17:28:39 +09:00
syuilo	70d02cf1be	Merge branch 'develop'	2021-05-21 17:27:47 +09:00
syuilo	f96c60c1a0	Merge branch 'develop'	2021-05-11 14:39:40 +09:00
syuilo	8accb78fa9	Merge branch 'develop'	2021-05-05 19:05:50 +09:00
syuilo	05203e2cf0	Merge branch 'develop'	2021-05-05 15:17:53 +09:00
syuilo	b6c9ab0c15	Merge branch 'develop'	2021-05-04 23:12:53 +09:00
syuilo	cdef5cd1ad	Merge branch 'develop'	2021-05-04 22:53:25 +09:00
syuilo	ea7d4d323e	Merge branch 'develop'	2021-04-28 18:37:48 +09:00
syuilo	17fff8c665	Merge branch 'develop'	2021-04-26 13:00:10 +09:00
syuilo	92977f303d	Merge branch 'develop'	2021-04-25 15:20:39 +09:00
syuilo	8043409d38	Merge branch 'develop'	2021-04-24 23:04:59 +09:00
syuilo	37dc1c9a82	Merge branch 'develop'	2021-04-23 18:25:44 +09:00
syuilo	631091940b	Merge branch 'develop'	2021-04-18 23:25:55 +09:00
syuilo	938fcb3e5e	Merge branch 'develop'	2021-04-18 00:07:33 +09:00
syuilo	5e1d17dff2	Merge branch 'develop'	2021-04-16 00:21:56 +09:00
syuilo	449dc17df8	Merge branch 'develop'	2021-04-14 16:39:53 +09:00
syuilo	3e11011229	Merge branch 'develop'	2021-03-24 11:34:29 +09:00
syuilo	52d577c7dd	Merge branch 'develop'	2021-03-22 15:27:08 +09:00
syuilo	18693fb380	Merge branch 'develop'	2021-03-07 14:43:00 +09:00
syuilo	f7e9725e59	Merge branch 'develop'	2021-03-06 23:23:54 +09:00
syuilo	9a4a534c92	Merge branch 'develop'	2021-03-03 01:04:45 +09:00
syuilo	b090ff9994	Merge branch 'develop'	2021-02-28 13:14:26 +09:00
syuilo	3d68a0988b	Merge branch 'develop'	2021-02-21 13:38:29 +09:00
syuilo	d6c8b9b994	Merge branch 'develop'	2021-02-19 21:42:47 +09:00
syuilo	49e6c2ed75	Merge branch 'develop'	2021-02-07 18:23:23 +09:00
syuilo	e4bcdd7b4d	Merge branch 'develop'	2021-01-23 20:06:22 +09:00
syuilo	7747ec5b6d	Update ja-JP.yml	2021-01-23 20:05:44 +09:00