mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-14 06:38:28 +09:00
Code
16,258 Commits 30 Branches 126 Tags 136 MiB
149de5b17b
Commit Graph

2722 Commits

Author SHA1 Message Date
MeiMei
d95242cab0 ミュート/ブロックでページングと解除ができるように (#5610) 2019-12-15 03:42:33 +09:00
Mary
70bb5879f9 boot: remove setAttribute() calls and translate reload msg (#5532) 
* boot: remove setAttribute() calls and translate reload msg

* Update src/client/app/boot.js

Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2019-11-17 00:44:21 +09:00
MeiMei
8ada1725bf 管理画面のジョブキュー一覧の修正 (#5586) 
* Fix: inboxのジョブキューが表示されない

* ジョブキューで試行回数等を表示するように

* DBとオブジェクトストレージのジョブキューが表示されるように
 2019-11-07 05:41:44 +09:00
MeiMei
8bdd4fd061 Resolve #5582 (#5583) 2019-11-06 23:56:56 +09:00
syuilo
072bc2d9fb Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-11-04 20:44:05 +09:00
syuilo
cc7fec4b9f Improve reaction setting 
Fix #5577
 2019-11-04 20:44:01 +09:00
MeiMei
570931cff8 Fix #5552 (#5579) 2019-11-03 17:54:37 +09:00
Aya Morisawa
bf654c6f42 Componentize modal (#5386) 2019-10-29 09:51:19 +09:00
MeiMei
02bde5150e Fix: プロフィールで他のユーザーにうつってもfieldsが更新されない (#5563) 2019-10-29 09:37:55 +09:00
MeiMei
245b08b624 Talk federation (#5534) 2019-10-29 06:01:14 +09:00
MeiMei
d672bb4643 Escでメディアビューワが閉じれるように (#5494) 
* EscやBackspaceでメディアビューワが閉じれるように

* Backspaceでは閉じないように
 2019-10-21 00:46:14 +09:00
MeiMei
4c6c06c80a Improve emoji-picker (#5515) 
* Improve emoji-picker

* remove unimplanted translation

* カテゴリのサジェスト

* use unique
 2019-10-21 00:43:39 +09:00
syuilo
f180f02dd1 Fix bug on iOS 2019-10-20 23:13:14 +09:00
syuilo
3c99b2fd12 Improve usability 2019-10-20 23:12:07 +09:00
syuilo
c81ff10d5b Fix bug 2019-10-17 00:42:04 +09:00
MeiMei
3a973aee69 みつけるの微修正 (#5506) 
* default instance name

* とりあえずリモートの人気のユーザーはリモートのみにするように
 2019-10-16 03:45:09 +09:00
MeiMei
488fe2e7bd みつけるに連合分を表示するように (#5490) 
* みつける Fediverse

* discovered
 2019-10-14 02:00:29 +09:00
syuilo
da69650505 Resolve #5500 2019-10-14 01:41:25 +09:00
MeiMei
a85f6edd8a 閉じずに残ってしまうメニューなどの修正 (#5496) 
* Fix: ページ移動等してもメニュー等が閉じずに残ってしまう

* Fix: ページ移動してもメディアビューワーが残ってしまう
 2019-10-09 21:42:23 +09:00
MeiMei
d17c6adba4 ダウンロードURLにdownloadを付けないなど (#5488) 2019-10-04 20:18:41 +09:00
Satsuki Yanagi
a81d5786f3 Indicate if input value is invalid (#5422) 
* Indicate if input value is invalid

* titleのとなり

* となりにメッセージ

* CSS as Suggested

* 同じ色に
 2019-10-04 14:18:49 +09:00
MeiMei
533884dcaa Fix: オフライン時に大室櫻子が出てこない (#5480) 
* Fix: オフライン時に大室櫻子が出てこない

* use onerror
 2019-10-04 10:27:57 +09:00
tamaina
b040ac6373 PWA Fix (#5432) 
* PWA Fix

* SWが/api/へのリクエストに関与しないように

* fix semicolon

* Update base.pug

* Update base.pug
 2019-09-27 05:12:56 +09:00
syuilo
3a093f8bd7 Use mk-frac 2019-09-26 05:47:42 +09:00
Acid Chicken (硫酸鶏)
ebb9a9b64f Add mk-frac component (#5456) 
* Add mk-frac component

* Follow lint

* FIx linting miss
 2019-09-26 04:24:38 +09:00
tamaina
ef17838c64 Better broadcast widget mk2 (#5455) 
* better broadcast widget

* 🎨

* 🎨

* 🎨

* mk2 (left nav with chevron icons)

* fix

* button title
 2019-09-26 04:23:48 +09:00
Satsuki Yanagi
61642539b1 Adminページのユーザー一覧フィルターに利用可能アカウントを追加 (#5430) 
* Adminページのユーザー一覧フィルターにアクティブアカウントを追加

* validator update

* availableに
 2019-09-21 21:35:22 +09:00
MeiMei
1b7454ca77 Fix: syuilo#3122 (#5435) 2019-09-21 21:33:01 +09:00
MeiMei
60d2558ed6 絵文字ピッカーの Unicode 12.0 対応など (#5441) 
* Twemoji 12.1

* 絵文字ライブラリを持つように

* Fix chess_pawn emoji

* Add Unicode 12.0 emojis

* Add transgender flag/symbol emoji

* Add some japanese emoji keywords

* format emojilist.json

* fix emojilist order

* Add missing flags
 2019-09-21 21:31:38 +09:00
MeiMei
9f5a763c69 Fix: selectでprefix/sufixがないときにいらない下線が付く (#5440) 2019-09-21 01:47:32 +09:00
Zero King
75ab146860 Follow requests page improvements (#5429) 
* follow-requests: add spacing between actions

* follow-requests: make separator more visible in dark themes
 2019-09-15 02:38:34 +09:00
Satsuki Yanagi
c3f9b2dcc3 Resolve #5420 (#5421) 2019-09-12 21:27:44 +09:00
Aya Morisawa
9d530a5c38 Fix typo: ommited -> omitted (#5406) 2019-09-09 22:47:52 +09:00
MeiMei
a7b710a2f8 広告ブロッカーの警告を削除 (#5408) 
* remove f*ckadbloack

* follow-buttonが消されないように

* revert version

* remove locales
 2019-09-08 21:19:28 +09:00
syuilo
4db710a4b0 Fix indentation 2019-09-04 14:35:21 +09:00
syuilo
143190ab38 Fix bug 2019-09-03 08:00:21 +09:00
syuilo
d36b129369 Improve reaction tooltip 2019-09-03 07:25:02 +09:00
syuilo
f36d88246a Fetch more reactins 2019-09-03 07:15:53 +09:00
syuilo
1dc07f6b72 🎨 2019-09-03 06:58:01 +09:00
syuilo
a9a93db2b4 Update reactions-viewer.reaction.vue 2019-09-03 06:20:52 +09:00
syuilo
f187df3933 Update reactions-viewer.reaction.vue 2019-09-03 06:20:04 +09:00
syuilo
8abe8042d7 Fix bug 2019-09-03 06:19:17 +09:00
syuilo
58fd46ff6f 🎨 2019-09-03 06:00:45 +09:00
syuilo
fef8b662c1 🎨 2019-09-03 05:50:01 +09:00
Aya Morisawa
e70d7edf41 Fix #5380 (#5381) 2019-09-02 07:01:33 +09:00
syuilo
0e0d6692c0 Fix bug 2019-09-02 06:21:43 +09:00
syuilo
ee39d9594e Improve readability 2019-09-02 06:04:12 +09:00
Oni-Men
cefd2a4c54 ページURLが空の時currentNameを使うように (#5368) 
* ページURLが空の時currentNameを使う

* 空の時はページURLにcurrentNameを代入するように

* Update src/client/app/common/views/pages/page-editor/page-editor.vue

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

* update validator

* Update src/client/app/common/views/pages/page-editor/page-editor.vue

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

* やっぱりuuidは統一

* エラー処理を追加

* some fix

* ちょっとだけ翻訳の追加と改善

* リファクタリング

* Revert "やっぱりuuidは統一"

This reverts commit 965a860504e8b09e5561a4ab862f8bab6a95e8d5.

* やっぱりuuidをわける

* エラー判定をidからcodeに+リファクタリング
 2019-09-02 06:02:35 +09:00
syuilo
a08c20d9af Fix #5353 2019-09-02 05:59:24 +09:00
syuilo
dc11f1afbf Improve readavility 2019-09-02 05:52:38 +09:00
syuilo
b0f2b209a2 Fix error 2019-09-02 05:42:30 +09:00
syuilo
a25fdfd519 Fix #5373 2019-09-02 05:34:25 +09:00
Aya Morisawa
701fee3139 Prevent users from opening note menu when already opened (#5367) 2019-09-02 04:45:01 +09:00
Aya Morisawa
749200d22b Show users who sent reaction on hover (#5362) 
* Show users who sent reaction on hover

* Support i18n

* detail -> details

* Extract methods

* Update on change
 2019-08-31 03:04:36 +09:00
Aya Morisawa
1f890c5bed Assign URL to each page of admin (#5366) 
* Assign URL to each page of admin

* Remove cursor pointer
 2019-08-30 04:19:49 +09:00
Aya Morisawa
97f23af86d Assign URL to each page of settings (#5349) 
* Assign URL to each page of settings

* Use router-link

* comma

* Use active-class

* Clean up

* space

* comma

* Redirect if mobile

* Redirect to /i/settings/profile

* Clean up
 2019-08-29 14:57:28 +09:00
Aya Morisawa
423f776ed0 Perform animation only when reaction is added (#5359) 2019-08-29 05:20:27 +09:00
Aya Morisawa
084fd8152b Refactor reactions-viewer.vue (#5358) 2019-08-29 05:15:14 +09:00
syuilo
89d35c2e63 Fix bug 2019-08-29 05:13:03 +09:00
Aya Morisawa
be33581642 Fix animation not being performed on new reaction (#5345) 
* Fix animation not being performed on new reaction

* Clean up
 2019-08-29 05:11:26 +09:00
Oni-Men
2d6d9f30e1 ページURLが他と重複してたらエラーを投げるように (#5354) 
* [Page]nameが重複したときの処理を追加

* page-editor側のerr.idにuuidを適用

* refactor

* uuidをわけた
 2019-08-28 08:00:05 +09:00
Aya Morisawa
85721065fd Save memo automatically (#5351) 
* Save memo automatically

* Use clearTimeout

* Clean up

* Clean up
 2019-08-28 02:26:19 +09:00
Aya Morisawa
9d65768d4d [MFM] Fallback to js if specified lang is not available (#5347) 2019-08-27 19:44:49 +09:00
Aya Morisawa
ba93bf7478 Prevent users from changing the disabled option (#5344) 2019-08-27 02:44:01 +09:00
Satsuki Yanagi
1c4e1af7c3 Improve post form (#5326) 
* Improve post form

* Remove local icon from button
 2019-08-25 16:12:01 +09:00
MeiMei
9d6c8806af CWの中のサムネイルのサイズが変なのを修正 (#5339) 
* Fix #5338

* Revert "Fix #5338"

This reverts commit 72b32df2b74743bede6fff0dbc37fec352cff51f.

* Fix media-list height

* fix
 2019-08-24 19:20:53 +09:00
syuilo
f4cec53ba1 [Room] Make Pinguin customizable 2019-08-24 02:18:21 +09:00
syuilo
ad70b50fee [Room] Add energy drink 2019-08-23 06:52:42 +09:00
syuilo
c2f932e28b Fix #5324 2019-08-22 19:56:27 +09:00
syuilo
c637882578 カップ麺をスムーズシェードするように 2019-08-22 19:42:52 +09:00
syuilo
ef7221e39e Fix holo-display animation glitch 2019-08-22 19:37:01 +09:00
Oni-Men
6b571a7799 Improve furniture preview (#5328) 
* Improve furniture preview

* improve calc method

* camera.aspectいらないことに気付いた

* refactor & go camera far away

* 対角線の長さで計算するように

* 対角線の計算にhypot()を使用

Co-Authored-By: Aya Morisawa <AyaMorisawa4869@gmail.com>
 2019-08-22 18:34:15 +09:00
MeiMei
0638b6cb69 Roomで未保存警告ダイアログなどを追加 (#5332) 
* Room保存時にダイアログを表示するように

* Roomから移動するときに未保存ならば警告するように
 2019-08-22 18:33:50 +09:00
syuilo
a39c1706a1 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-08-22 02:40:19 +09:00
syuilo
c741e27057 [Room] Add holo-display 2019-08-22 02:40:01 +09:00
Aya Morisawa
ede854c215 Update button.vue (#5331) 2019-08-22 02:36:19 +09:00
Oni-Men
630d873ec0 [room]Add cup noodle (#5323) 
* [Room] Add cup noodles

* remove ,

* Fix Cup-Noodle Texture
 2019-08-20 15:57:42 +09:00
syuilo
fcf5531e5b 🎨 2019-08-19 16:44:55 +09:00
syuilo
3bef69ee58 🎨 2019-08-19 16:13:08 +09:00
syuilo
311a4f28b0 Resolve #5298 2019-08-19 16:05:57 +09:00
syuilo
01e692b353 Refactor 2019-08-19 15:59:36 +09:00
syuilo
3b445af6fc Improve readability 2019-08-19 15:51:00 +09:00
syuilo
1e43ece637 [Room] Update model 2019-08-19 14:01:05 +09:00
syuilo
d686e70f2b [Room] Better rendering 2019-08-19 12:35:18 +09:00
syuilo
79c6475028 Improve readability 2019-08-19 02:19:37 +09:00
syuilo
7dee5309dc Refactoring 2019-08-19 02:06:37 +09:00
syuilo
958ec7b03f Fix #5307 2019-08-19 02:02:10 +09:00
syuilo
9153434906 [Room] Add bin 2019-08-19 01:54:06 +09:00
syuilo
3a08364c24 [Room] Add some furnitures 2019-08-19 01:45:20 +09:00
syuilo
a9beeab502 [Room] Better rendering 2019-08-19 01:43:45 +09:00
syuilo
38c901069a [Room] Better avatar rendering 2019-08-19 01:15:30 +09:00
syuilo
3f7606060e Update geometry name 2019-08-19 01:01:15 +09:00
kabo2468
777f20e9be Add Trash can (#5309) 
new file:   src/client/assets/room/furnitures/trash-can/trash-can.blend
	new file:   src/client/assets/room/furnitures/trash-can/trash-can.glb
 2019-08-19 00:51:57 +09:00
syuilo
0f9e09f4bd cors 2019-08-18 20:32:04 +09:00
MeiMei
743ebc17b9 Fix #5291 (#5294) 2019-08-18 20:25:12 +09:00
syuilo
9bc4af76b8 モバイルでもRoomを表示できるように 2019-08-18 19:11:24 +09:00
syuilo
46fa26426d Fix bug 2019-08-18 19:08:33 +09:00
syuilo
bc11702f7d Fix #5290 2019-08-18 16:55:09 +09:00
syuilo
6288de5813 Fix #5291 2019-08-18 16:51:27 +09:00
imgbot[bot]
d7787bacf7 [ImgBot] Optimize images (#5289) 
*Total -- 2,381.44kb -> 1,992.59kb (16.33%)

/src/client/assets/room/furnitures/photoframe/photo-uv.png -- 20.34kb -> 2.58kb (87.33%)
/src/client/assets/room/furnitures/pc/motherboard-uv.png -- 21.43kb -> 2.85kb (86.69%)
/src/client/assets/room/furnitures/cardboard-box3/uv.png -- 21.58kb -> 3.51kb (83.72%)
/src/client/assets/room/furnitures/poster-v/uv.png -- 21.85kb -> 3.71kb (83.04%)
/src/client/assets/room/furnitures/milk/milk.png -- 3.76kb -> 0.64kb (82.89%)
/src/client/assets/room/furnitures/server/uv.png -- 22.29kb -> 3.92kb (82.42%)
/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png -- 3.80kb -> 0.67kb (82.3%)
/src/client/assets/room/rooms/washitsu/tatami-uv.png -- 22.27kb -> 3.98kb (82.13%)
/src/client/assets/room/rooms/washitsu/husuma-uv.png -- 22.06kb -> 3.94kb (82.13%)
/src/client/assets/room/furnitures/tv/screen-uv.png -- 20.55kb -> 3.70kb (81.98%)
/src/client/assets/room/furnitures/poster-h/uv.png -- 20.15kb -> 3.70kb (81.65%)
/src/client/assets/room/furnitures/plant/plant-soil-uv.png -- 23.17kb -> 4.40kb (81%)
/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png -- 22.96kb -> 4.37kb (80.99%)
/src/client/assets/room/furnitures/cardboard-box2/uv.png -- 22.36kb -> 4.52kb (79.78%)
/src/client/assets/room/furnitures/book2/uv.png -- 37.36kb -> 8.41kb (77.49%)
/src/client/assets/room/furnitures/server/rack-uv.png -- 26.68kb -> 6.55kb (75.46%)
/src/client/assets/room/furnitures/monitor/screen-uv.png -- 5.81kb -> 1.46kb (74.88%)
/src/client/assets/room/furnitures/milk/milk-uv.png -- 49.21kb -> 16.19kb (67.1%)
/src/client/assets/room/furnitures/eraser/eraser-uv.png -- 27.93kb -> 10.90kb (60.96%)
/src/client/assets/room/furnitures/book2/barcode.png -- 8.71kb -> 3.42kb (60.72%)
/src/client/assets/room/rooms/washitsu/husuma.png -- 4.23kb -> 2.48kb (41.44%)
/src/client/assets/room/furnitures/server/rack.png -- 9.42kb -> 6.88kb (26.92%)
/src/client/assets/room/furnitures/eraser/cover.png -- 10.75kb -> 8.14kb (24.26%)
/src/client/assets/room/furnitures/plant2/soil.png -- 13.06kb -> 10.60kb (18.83%)
/src/client/assets/room/furnitures/plant/plant-soil.png -- 13.06kb -> 10.60kb (18.83%)
/src/client/assets/room/furnitures/monitor/screen.jpg -- 28.93kb -> 24.26kb (16.16%)
/src/client/assets/room/furnitures/cardboard-box3/texture.png -- 18.23kb -> 15.82kb (13.21%)
/src/client/assets/room/furnitures/cardboard-box2/texture.png -- 18.64kb -> 16.48kb (11.56%)
/src/client/assets/room/furnitures/book2/texture.png -- 64.05kb -> 59.59kb (6.97%)
/src/client/assets/room/furnitures/server/server.png -- 121.75kb -> 114.13kb (6.26%)
/src/client/assets/room/furnitures/pc/motherboard.jpg -- 67.25kb -> 63.09kb (6.19%)
/src/client/assets/room/furnitures/photoframe/photo.jpg -- 31.10kb -> 29.79kb (4.22%)
/src/client/assets/room/rooms/washitsu/tatami-single1600.png -- 1,163.42kb -> 1,145.84kb (1.51%)
/src/client/assets/room/rooms/washitsu/tatami.png -- 308.19kb -> 306.37kb (0.59%)
/src/client/assets/room/furnitures/moon/moon.jpg -- 85.11kb -> 85.11kb (0%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-08-18 15:06:22 +09:00