usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,529 Commits 398 Branches 1,053 Tags 326 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
nullobsi 3ff89fa7ec
feat: Option to show replies in timeline (rebase #7685) (#8202) 
* Add an option for timeline replies. Credit to Emilis (puffaboo)

* update db on request
 2022-02-06 16:02:48 +09:00
MeiMei c0ef868ad2
Fix cast (#8257) 2022-02-06 16:01:54 +09:00
syuilo efe62eb303 fix 2022-02-06 08:39:23 +09:00
syuilo cc7a1808ec imprpve active users chart 2022-02-06 06:24:06 +09:00
xianon 08d0a45ee7
fix: NodeInfo のユーザー数と投稿数の内容を見直す (#8255) 
* NodeInfoのアクティブユーザーの取得方法を変更する

* NodeInfoの投稿数の出力内容を見直す
 2022-02-06 04:29:36 +09:00
syuilo be15c8f437
fix chart clean 2022-02-06 02:16:52 +09:00
syuilo 80fa92fb97 improve chart 2022-02-06 00:43:22 +09:00
syuilo c1b264e4e9
Improve chart engine (#8253) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update core.ts

* wip

* wip

* #7361

* delete network chart

* federationChart強化 apRequestChart追加

* tweak
 2022-02-06 00:13:52 +09:00
syuilo bd7662e5e4 refactor 2022-02-04 11:10:53 +09:00
syuilo fb914db1aa use date-fns 2022-02-04 10:41:27 +09:00
syuilo 3a04c66ee1 refactor 2022-02-04 02:06:24 +09:00
syuilo b8f785b89d Update yarn.lock 2022-02-04 01:58:28 +09:00
syuilo 32f5987263 ESM使えない 2022-02-04 01:58:21 +09:00
syuilo 9ee0db95ac refactor: use date-fns 2022-02-04 01:56:33 +09:00
syuilo 7168811283 ESMは使えない 2022-02-03 22:19:54 +09:00
syuilo 6efff48025 refactor 2022-02-03 22:01:14 +09:00
syuilo 556abfabb9 refactor 2022-02-03 21:48:23 +09:00
syuilo 6caec5b8e2 refactor 2022-02-03 21:43:53 +09:00
syuilo 508af8d458 refactor 2022-02-03 21:38:57 +09:00
syuilo b7bbe090e9 refactor 2022-02-03 21:20:25 +09:00
syuilo 8c9a13b2b7 update deps 2022-02-03 21:09:15 +09:00
syuilo f69867fcff refactor 2022-02-03 21:09:07 +09:00
syuilo 1e14102316 refactor: use toISOString 2022-02-03 20:45:18 +09:00
syuilo 92c30739f6 refactor 2022-02-03 17:21:52 +09:00
syuilo ddc0b37d13 refactor 2022-02-03 17:12:51 +09:00
tamaina 28a2297985 Merge branch 'develop' into swn 2022-02-03 03:47:35 +09:00
syuilo 435945d09d refactor 2022-02-03 02:41:22 +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
MeiMei fc9a6a805f
fix: ストリーミングからのAPIリクエストが出来ないのを修正 (#8244) 
* Update call.ts

* あれ
 2022-02-02 20:04:52 +09:00
MeiMei f2b40b51c2
refactor: APIで非JSON入力の型変換はendpointに渡す前に行うように (#8229) 
* Resolve #8228

* fix
 2022-01-31 01:40:27 +09:00
syuilo aa64ff6c94 update misskey-js 2022-01-30 11:32:42 +09:00
shibao 380d14f406
Add `img-src` and `media-src` to `Content-Security-Policy` header for files and media proxy (#8188) 
* add img-src and media-src to csp in file and media proxy

* add csp changes to changelog

* sort and remove trailing semicolon
 2022-01-29 02:23:18 +09:00
tamaina 57534be253 Merge branch 'notification-read-api' into swn 2022-01-28 15:46:47 +09:00
tamaina cbb5858316 Merge branch 'develop' into notification-read-api 2022-01-28 15:46:26 +09:00
syuilo 69e08abaef refactor(backend): fix type 2022-01-26 18:52:40 +09:00
syuilo 928c51ba7b refactor(backend): fix type 2022-01-26 18:48:44 +09:00
syuilo 449709f6cb refactor: fix type 2022-01-26 18:42:14 +09:00
syuilo 37a4e5f4fc refactor(backend): use insert instead of save 2022-01-26 00:51:26 +09:00
tamaina e8ca4785e8 Service Workerのビルドにesbuildを使うようにする 2022-01-25 13:03:13 +00:00
MeiMei 7aecf15f94
refactor, enhance: ドライブ引数のオブジェクト化, 追加時のcomment指定 (#8180) 
* refactor: ドライブの引数をオブジェクト化する Resolve #8177

* Resolve #8181

* fix

* archivePath
 2022-01-23 22:52:35 +09:00
MeiMei d8905a9588
Unifying Misskey-specific IRIs in JSON-LD `@context` Resolve #8116 (#8178) 
* Unifying Misskey-specific IRIs in JSON-LD `@context` Resolve #8116

* CHANGELOG
 2022-01-23 01:52:35 +09:00
xianon e2cefb7f47
NodeInfo にユーザー数と投稿数の情報を追加する (#8126) 2022-01-22 02:13:29 +09:00
tamaina 154e7c2e59 Merge branch 'notification-read-api' into swn 2022-01-21 21:30:11 +09:00
tamaina 05d601710a Merge branch 'develop' into notification-read-api 2022-01-21 21:29:24 +09:00
syuilo eec7e6500e enhance: convert svg to png of custom emojis 2022-01-21 18:47:02 +09:00
syuilo e3a5584d0a feat: increase files limit for note 
#8062
 2022-01-21 18:27:33 +09:00
syuilo 8d502eba59 refactor 2022-01-21 17:15:14 +09:00
syuilo ecca0d69a4 update deps 2022-01-21 17:04:48 +09:00
tamaina e1d69e236f
enhance: e2eテストをできるだけ改良してみた (#8159) 
* update docker image?

* 続

* serial run delete from "${table}" cascade

* use cypress official github action

* refuse install by cypress action

* clean up

* use wait?

* use more wait?

* Revert "use more wait?"

This reverts commit 18d0fcae9c.

* Revert "use wait?"

This reverts commit 5aa8feec9c.

* fix

* test

* test

* log?

* 握りつぶしてみる

* clean up

* env?

* clean up?

* disable video

* add comment

* remove test

* 成功?

* test browser

* nodeインストール無効化

* node16.13.0-chrome95-ff94

* node.js復活

* ？

* ちょっと戻してみる

* chrome?

* cross browser test2

* --shm-size=2g

* artifact?

* misskey.local?

* firefoxはあきらめる

* not headless?

* oops

* fix

* ??

* test1

* if?

* fail-fast: false

* headless: false

* easy error ignoreing describe

* エラーの解消
とちょっとリファクター

* add browser name to artifact

* Install mplayer for FireFox

* no wait?

* タイムアウトを甘くしてみる

* firefoxをあきらめる(n回目)

* remove timeout setting

* wait復活

* Update basic.js

* Update index.js

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-01-21 16:43:56 +09:00
Johann150 cbb7e95d82
enhance: Forward report (#8001) 
* implement sending AP Flag object

Optionally allow a user to select to forward a report about a remote
user to the other instance. This is added in a backwards-compatible way.

* add locale string

* forward report only for moderators

* add switch to moderator UI to forward report

* fix report note url

* return forwarded status from API

apparently forgot to carry this over from my testing environment

* object in Flag activity has to be an array

For correct interoperability with Pleroma the "object" property of the Flag
activity has to be an array.

This array will in the future also hold the link to respective notes, so it
makes sense to correct this on our side.

* Update get-note-menu.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-01-21 03:06:38 +09:00
Johann150 e2d2a4e2e4
fix: code url in documentation (#8117) 
It seems this was not changed while refactoring the modules apart.
 2022-01-21 03:01:45 +09:00
syuilo 7a999f2289 feat(server): add more metadata for emoji export 2022-01-21 02:56:08 +09:00
tamaina 7627c43dee
send-drive-file svg as png (#8107) 2022-01-20 03:05:52 +09:00
tamaina 74df9b57ec
fix: proxyでsvgをpngに変換するように (#8106) 
* wip

* revert send-drive-file change

* fix

* Update packages/backend/src/server/proxy/proxy-media.ts

Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>

Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
 2022-01-20 03:03:28 +09:00
syuilo 59520c31fd refactor(server): use named export 2022-01-20 02:43:13 +09:00
syuilo 53937e09a0 feat(server): store mime type of webpublic 2022-01-20 02:40:13 +09:00
syuilo 8b5a1faaa4 refactor(server): use insert instead of save 2022-01-20 02:33:20 +09:00
tamaina efb0ffc4ec
refactor: APIエンドポイントファイルの定義を良い感じにする (#8154) 
* Fix API Schema Error

* Delete SimpleSchema/SimpleObj
and Move schemas to dedicated files

* Userのスキーマを分割してみる

* define packMany type

* add ,

* Ensure enum schema and Make "as const" put once

* test?

* Revert "test?"

This reverts commit 97dc9bfa70.

* Revert "Fix API Schema Error"

This reverts commit 21b6176d97.

* ✌️

* clean up

* test?

* wip

* wip

* better schema def

* ✌️

* fix

* add minLength property

* wip

* wip

* wip

* anyOf/oneOf/allOfに対応？ ~ relation.ts

* refactor!

* Define MinimumSchema

* wip

* wip

* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正

* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正

* Update packages/backend/src/misc/schema.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* fix

* array oneOfをより正確な型に

* array oneOfをより正確な型に

* wip

* ✌️

* なんかもういろいろ

* remove

* very good schema

* api schema

* wip

* refactor: awaitAllの型定義を変えてみる

* fix

* specify types in awaitAll

* specify types in awaitAll

* ✌️

* wip

* ...

* ✌️

* AllowDateはやめておく

* 不必要なoptional: false, nullable: falseを廃止

* Packedが展開されないように

* 続packed

* wip

* define note type

* wip

* UserDetailedをMeDetailedかUserDetailedNotMeかを区別できるように

* wip

* wip

* wip specify user type of other schemas

* ok

* convertSchemaToOpenApiSchemaを改修

* convertSchemaToOpenApiSchemaを改修

* Fix

* fix

* ✌️

* wip

* 分割代入ではなくallOfで定義するように

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-01-18 22:27:10 +09:00
tamaina 1750a19e0c Merge branch 'develop' into swn 2022-01-16 18:03:00 +09:00
syuilo 2c36844d34 refactor: more common name 2022-01-16 10:45:48 +09:00
syuilo 53fb48537d git add忘れ 2022-01-13 00:48:58 +09:00
syuilo 7e5e763584 feat: emojis import 2022-01-13 00:47:40 +09:00
syuilo 1f2dab0a83 feat: multiple emojis editing 2022-01-13 00:47:05 +09:00
syuilo b267a504ca bye reversi 2022-01-12 17:34:53 +09:00
tamaina e17fca1fd6 Merge branch 'notification-read-api' into swn 2022-01-08 16:59:03 +09:00
tamaina 70fb72b139 Merge branch 'develop' into notification-read-api 2022-01-08 16:58:30 +09:00
syuilo faef125b74 bye room 2022-01-07 17:06:47 +09:00
syuilo 9693b2166a clean up 2022-01-04 18:01:30 +09:00
tamaina 3fabe81b1f Merge branch 'notification-read-api' into swn 2022-01-04 13:37:02 +09:00
tamaina 728878aa3c Merge branch 'develop' into notification-read-api 2022-01-04 13:36:43 +09:00
tamaina 333ba491f1
enhance: 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように (#8108) 
* 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように

* add comment
 2022-01-03 07:35:02 +09:00
syuilo f25777f2d2 refactor(server): use insert instead of save 2022-01-03 03:17:16 +09:00
syuilo 6be1db00d1 refactor(server): use insert instead of save 2022-01-03 02:20:30 +09:00
syuilo 4a64280a7c lint 2022-01-03 02:12:50 +09:00
tamaina e9b184a807 Merge branch 'notification-read-api' into swn 2022-01-02 21:58:16 +09:00
tamaina 61ea668eac Merge branch 'develop' into notification-read-api 2022-01-02 21:57:55 +09:00
syuilo 92d9ce8117 update deps 2022-01-02 02:15:12 +09:00
tamaina 7f8e3b0dee Merge branch 'notification-read-api' into swn 2022-01-01 23:04:36 +09:00
tamaina a70d9d2034 Merge branch 'develop' into notification-read-api 2022-01-01 23:01:21 +09:00
syuilo 158dd49b3d fix 
d53795184c (r62707827)
 2022-01-01 22:28:02 +09:00
syuilo 57d994db0c Revert "revert d53795184" 
This reverts commit aedbab17cc.
 2022-01-01 22:25:30 +09:00
tamaina 87c5c69c87
wip (#8101) 2022-01-01 18:00:53 +09:00
syuilo aedbab17cc revert d53795184 2021-12-29 17:21:08 +09:00
syuilo 3e00ce0d88 fix(server): エクスポートした絵文字の拡張子がfalseになることがあるのを修正 2021-12-29 17:04:13 +09:00
tamaina a444e6adab Merge branch 'notification-read-api' into swn 2021-12-29 16:15:07 +09:00
tamaina 5c495c0bcf Merge branch 'develop' into notification-read-api 2021-12-29 16:14:46 +09:00
Johann150 af022fd8b8
fix html blockquote conversion (#8069) 2021-12-29 04:15:28 +09:00
tamaina 9a78690222 Merge branch 'notification-read-api' into swn 2021-12-28 18:46:44 +09:00
tamaina b65506d32e Merge branch 'develop' into notification-read-api 2021-12-28 18:46:29 +09:00
syuilo 154e418c34 Update const.ts 2021-12-26 12:10:33 +09:00
syuilo cfd1888969 refactor 2021-12-26 12:08:22 +09:00
syuilo d53795184c enhance(server): better content type detection 2021-12-26 01:43:51 +09:00
syuilo 3692c9eb64 refactor 2021-12-26 01:42:06 +09:00
tamaina a456a63e34 Merge branch 'develop' into notification-read-api 2021-12-25 02:02:49 +09:00
tamaina c77fe1f2cf
Truncate push notification message (#8089) 
* Truncate push notification message

* fix
 2021-12-25 02:01:35 +09:00
tamaina 06f6c66732 Merge branch 'truncate-push-notification' into swn 2021-12-25 01:38:21 +09:00
tamaina ffef12ce1d Truncate push notification message 2021-12-25 01:37:15 +09:00
tamaina 1122f7281e
ノートページでRenoteである場合にnoindexを付加 (#8074) 2021-12-24 01:16:58 +09:00
tamaina 469434dd9a キャッシュ対策 2021-12-23 21:17:12 +09:00
tamaina 252169f879 Merge branch 'notification-read-api' into swn 2021-12-18 00:31:35 +09:00
tamaina 66c5111a29 Merge branch 'develop' into notification-read-api 2021-12-18 00:31:03 +09:00
syuilo 2f8e3559b5 update deps 2021-12-17 14:12:34 +09:00
syuilo 983599bdae Update 1639325650583-chart-v3.js 2021-12-14 23:13:09 +09:00
syuilo 0be4e10462 enhance(backend): improve chart engine 2021-12-14 18:12:37 +09:00
syuilo ef485044ea Update export-custom-emojis.ts 2021-12-12 06:24:13 +09:00
syuilo c599a304c8 refactor 2021-12-12 06:21:48 +09:00
tamaina b4954fe7c2 Merge branch 'notification-read-api' into swn 2021-12-11 00:57:22 +09:00
tamaina 56234f54fe Merge branch 'develop' into notification-read-api 2021-12-11 00:54:33 +09:00
syuilo bd903cdbb5 feat: カスタム絵文字エクスポート 2021-12-10 18:24:26 +09:00
syuilo 20134a5367 feat: improve follow export 2021-12-10 01:22:35 +09:00
syuilo c69b72e199 fix lint 2021-12-09 23:58:30 +09:00
romaboo 054417354c
feat: user-level instance mute (#7712) 
* Update ja-JP.yml

* Added settable config for muted instances

* added psql query for removal of muted notes

* Added filtering and trimming for instance mutes

* cleaned up filtering of bad instance mutes and added a refresh at the end for the list on the client

* Added notification & streaming timeline muting

* Updated changelog

* Added missing semicolon

* Apply japanese string suggestions from robflop

Co-authored-by: Robin B. <robflop98@outlook.com>

* Changed Ja-JP instance mute title string to one suggested by sousuke

Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>

* Update ja-JP instanceMuteDescription based on sousuke's suggestion

Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>

* added notification mute

* added notification and note children muting

* Fixed a bug where local notifications were getting filtered on cold start

* Fixed instance mute imports

* Fixed not saving/loading instance mutes

* removed en-US translations for instance mute

* moved instance mute migration to js

* changed settings index back to spaces

* removed destructuring assignment from notification stream in instance mute check call

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* added .note accessor for checking note data instead of notification data

* changed note to use Packed<'Note'> instead of any and removed usage of snake case

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* changed notification mute check to check specifically for notification host

* changed to using single quotes

* moved @click to the end for the linter

* revert unnecessary changes

* restored newlines

* whitespace removal

Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Co-authored-by: Robin B. <robflop98@outlook.com>
Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
Co-authored-by: puffaboo <emilis@jigglypuff.club>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2021-12-09 21:38:56 +09:00
syuilo b9095995eb update deps 2021-12-09 21:31:36 +09:00
tamaina 4a8dfbdf2d Merge branch 'notification-read-api' into swn 2021-12-05 12:47:24 +09:00
tamaina 2685fd12bc Merge branch 'develop' into notification-read-api 2021-12-05 12:47:10 +09:00
syuilo 8223a069fe fix(server): Fix #8032 2021-12-03 17:47:44 +09:00
syuilo e617ced1d3 refactoring 
https: //github.com/misskey-dev/misskey/pull/7901
Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com>
 2021-12-03 11:43:05 +09:00
xianon 22464c434e
fix: 画像ファイルの縦横サイズの取得で Exif Orientation を考慮する (#8014) 
* 画像ファイルの縦横サイズの取得で Exif Orientation を考慮する

* test: Add rotate.jpg test

* Webpublic 画像を返す時のみ Exif Orientation を考慮して縦横サイズを返す

* test: Support orientation
 2021-12-03 11:19:28 +09:00
nullobsi f33ded3107
feat: Undo Accept (#7980) 
* allow breaking of follow

* send undo

* delete by using reject follow
 2021-12-03 11:14:44 +09:00
tamaina b19902d92c truncate notification 2021-11-30 04:04:47 +09:00
tamaina 47d77d14fd Failed to load the script unexpectedly回避 
sw.jsとlib.tsを分離してみた
 2021-11-30 03:12:32 +09:00
tamaina 7e5ab7af1b Merge branch 'develop' into swn 2021-11-29 15:50:26 +09:00
tamaina 557e1faccf Merge branch 'develop' into notification-read-api 2021-11-29 15:48:59 +09:00
xianon 335e4bd213
/antennas/notes API で日付による絞り込みができるようにする (#8015) 2021-11-28 13:45:17 +09:00
MeiMei d9775c147f
fix: toolsが動かないのを修正 (#8008) 
* Move tools

* Fix DB
 2021-11-26 13:41:49 +09:00
tamaina a585664b72 Merge branch 'fix-notification.vue' into swn 2021-11-22 21:11:51 +09:00
syuilo 270df5c5b0 move tools dir into src 2021-11-21 13:43:07 +09:00
tamaina 6c2a27756c swパッケージに 2021-11-20 14:44:59 +09:00
tamaina 0e4b72cf1c Merge branch 'notification-read-api' into swn 2021-11-19 20:43:41 +09:00
tamaina e02bd4b820 Merge branch 'develop' into notification-read-api 2021-11-19 20:43:23 +09:00
syuilo a9a5673069 implement dev command 2021-11-19 14:48:59 +09:00
syuilo 0e3ca41b3c improve ide support 2021-11-18 23:52:41 +09:00
syuilo 73b5c12927 introduce lint for client 
Resolve #7998
 2021-11-18 23:32:43 +09:00
syuilo 037db7c5ef
lint: warn non-null-assertion to reduce unexpected behaviour 2021-11-18 20:12:50 +09:00
tamaina ea9f0be129 Merge branch 'notification-read-api' into swn 2021-11-14 16:39:20 +09:00
tamaina 3448927b56 Merge branch 'develop' into notification-read-api 2021-11-14 16:39:02 +09:00
syuilo 8a40026c5c fix(client): improve error handling 2021-11-14 13:13:05 +09:00
syuilo 8b7f5be878 fix for lint 2021-11-13 19:10:14 +09:00
syuilo 01afdc410e Update .eslintrc.js 2021-11-13 19:10:08 +09:00
tamaina 7c6ed8d9e5 Merge branch 'notification-read-api' into swn 2021-11-13 12:27:54 +09:00
tamaina a626a5a407 Merge branch 'develop' into notification-read-api 2021-11-13 12:25:06 +09:00
syuilo cfa38e875c refactor 2021-11-12 21:11:21 +09:00
syuilo 9ea7d75aa4 feat: 通報があったときに管理者へEメールで通知されるように 
Resolve #7025
 2021-11-12 21:11:15 +09:00
syuilo 9b876b30b2 update ms to 3.0.0 2021-11-12 19:47:04 +09:00
tamaina 853982aa94 Merge branch 'notification-read-api' into swn 2021-11-12 19:22:59 +09:00
tamaina c10b5ac254 Merge branch 'develop' into notification-read-api 2021-11-12 19:22:46 +09:00
syuilo 6496835515 viaMobileフラグ廃止 
Close #7965
 2021-11-12 15:11:20 +09:00
syuilo b404ce463f refactor 2021-11-12 15:08:36 +09:00
syuilo 4786214e2a fix bug 2021-11-12 13:39:57 +09:00
syuilo 19cc9f7fb0 test 2021-11-12 12:43:55 +09:00
syuilo 7706c38d3d fix test 2021-11-12 12:07:37 +09:00
syuilo be89516707 add clean script 2021-11-12 11:42:47 +09:00
tamaina 12e99c852d Merge branch 'notification-read-api' into swn 2021-11-12 11:04:57 +09:00
tamaina 96b78e2c33 Merge branch 'develop' into notification-read-api 2021-11-12 11:03:55 +09:00
syuilo f6e7f389d6 improve lint 2021-11-12 10:58:13 +09:00
tamaina cb83e7d36f Merge branch 'notification-read-api' into swn 2021-11-12 10:52:59 +09:00
tamaina 07d0badfa2 Merge branch 'develop' into notification-read-api 2021-11-12 10:52:49 +09:00
syuilo b9eaf906e7 fix lint errors 2021-11-12 10:52:10 +09:00
tamaina d68120c8d7 Merge branch 'notification-read-api' into swn 2021-11-12 10:48:18 +09:00
tamaina 850784dbfd Merge branch 'develop' into notification-read-api 2021-11-12 10:47:50 +09:00
syuilo 84df0714d8 use eslint 2021-11-12 10:35:41 +09:00
tamaina af8c2d436b Merge branch 'notification-read-api' into swn 2021-11-12 10:08:36 +09:00
tamaina da8263a4ac Merge branch 'develop' into notification-read-api 2021-11-12 09:20:06 +09:00
syuilo 0e4a111f81 refactoring 
Resolve #7779
 2021-11-12 02:02:25 +09:00