1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-24 03:28:38 +09:00
Commit Graph

1063 Commits

Author SHA1 Message Date
syuilo
02341ceb6e
Merge pull request #2512 from Hiramiya/avatarbannerfiletypes
Fix linting errors
2018-08-28 18:08:22 +09:00
Nasha Hiramiya
3dcdd7a5d7 Fix linting errors 2018-08-28 09:44:49 +01:00
syuilo
77baca8e6e
Merge pull request #2511 from Hiramiya/avatarbannerfiletypes
Prevent setting non-image files as avatar/banner
2018-08-28 07:41:50 +09:00
syuilo
6a7169630c
Merge pull request #2509 from Hiramiya/updateavatarfix
Update update-avatar.ts to match update-banner.ts behaviour
2018-08-28 07:39:35 +09:00
Hiramiya
e7e6d833b7
Restrict banner filetypes 2018-08-27 20:03:48 +01:00
Hiramiya
d1a9561135
Restrict avatar filetypes 2018-08-27 20:03:28 +01:00
Hiramiya
ef43721e32
Update update-avatar.ts 2018-08-27 17:29:21 +01:00
Hiramiya
f283d2423f
Fix border-radius on friends 2018-08-27 16:06:31 +01:00
Hiramiya
c07f668f14
Fix border-radius on photos 2018-08-27 16:06:04 +01:00
Hiramiya
975e4dd285
Remove temp border change 2018-08-27 15:51:31 +01:00
Hiramiya
09b05c8552
DarkMode user page bottom nav 2018-08-27 15:46:27 +01:00
Hiramiya
530ee6f80e
DarkMode User Photos 2018-08-27 15:45:35 +01:00
Hiramiya
6ad31dca76
DarkMode user friends 2018-08-27 15:43:19 +01:00
xps2
3f30a69b8b fix 2018-08-26 10:29:24 +09:00
xps2
2d2e16d9f6 donation、configのmaintainerを参照するよう変更 2018-08-26 10:14:43 +09:00
syuilo
699879d95d Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-08-26 02:05:46 +09:00
syuilo
6677508ba7 Fix #2428 2018-08-26 02:05:42 +09:00
syuilo
58da32358b Fix indent 2018-08-26 02:05:13 +09:00
syuilo
b9eafeee3f
Merge pull request #2486 from syuilo/fix-fa-pen
Use pencil-alt instead of pen
2018-08-26 01:57:39 +09:00
syuilo
9a295a85b1
Merge pull request #2491 from xps2/fix-repository-feedback-url
リポジトリとフィードバックのURLが設定ファイルから反映されないのを修正
2018-08-26 01:23:41 +09:00
syuilo
7135c0e308
Merge pull request #2487 from syuilo/clock-visibility-option
Make clock on header optional
2018-08-26 01:20:29 +09:00
xps2
fa7c8cfe5b リポジトリとフィードバックのURLが設定ファイルから反映されないのを修正 2018-08-26 01:00:13 +09:00
Aya Morisawa
08a59591ae
Use startsWith and endsWith for readability 2018-08-25 22:42:26 +09:00
Aya Morisawa
483a61d90d
Make clock on header optional 2018-08-25 22:24:58 +09:00
Aya Morisawa
385fb7586b
Use pencil-alt instead of pen 2018-08-25 22:07:10 +09:00
syuilo
f0b08d3936 Add brackets 2018-08-25 19:39:06 +09:00
syuilo
16520c7b4c
Merge pull request #2476 from acid-chicken/patch-4
Fix #2392
2018-08-25 19:37:35 +09:00
syuilo
65549d06d9 ✌️ 2018-08-25 19:34:54 +09:00
Acid Chicken (硫酸鶏)
0ebe801af4
Update boot.js 2018-08-25 17:06:40 +09:00
syuilo
47f4b51207 Fix bug 2018-08-25 15:40:22 +09:00
syuilo
739c993911 Fix #2466 2018-08-25 15:30:48 +09:00
syuilo
81969ea8b2 🎨 2018-08-25 15:25:16 +09:00
syuilo
1c45cc808b Improve stats page 2018-08-25 12:43:18 +09:00
syuilo
47a5f3bc67 チャートコンポーネントを分離するなど 2018-08-25 12:28:05 +09:00
syuilo
1c1e3009e9 ✌️ 2018-08-25 12:14:36 +09:00
syuilo
88c71c2998 #2451 2018-08-25 08:39:12 +09:00
syuilo
7b6e55047f #2460 2018-08-25 08:35:41 +09:00
syuilo
13624ea7c2 バグ修正など 2018-08-24 14:55:58 +09:00
syuilo
9c4a7bf94c Improve chart 2018-08-24 09:39:16 +09:00
syuilo
8b37fc4772 Improve chart 2018-08-24 08:56:57 +09:00
syuilo
b21287262e チャート取得APIを誰でも利用できるようにするなど 2018-08-24 07:23:04 +09:00
syuilo
3f7d248684 Improve chart 2018-08-24 07:17:17 +09:00
syuilo
92cf205c66 Fix bug 2018-08-24 07:02:52 +09:00
syuilo
fa3299840f Refactor 2018-08-24 07:02:27 +09:00
syuilo
a294a881ec Improve chart 2018-08-24 06:41:53 +09:00
syuilo
4dee7d91b1 Better charts 2018-08-24 05:37:19 +09:00
syuilo
912ffae600
Merge pull request #2424 from acid-chicken/patch-4
Fix #2421
2018-08-23 16:36:42 +09:00
syuilo
71a5662195 一時間ごとのグラフも見れるように 2018-08-23 16:36:23 +09:00
Acid Chicken (硫酸鶏)
774834a31f
Update url-preview.vue 2018-08-23 16:25:36 +09:00
syuilo
8ba178f795 コントロールパネルから招待制のオンオフを切り替えられるように 2018-08-23 03:19:57 +09:00
syuilo
d98c67e13c Add control panel link in nav 2018-08-23 02:47:12 +09:00
syuilo
1b9c69f793 Fix bug 2018-08-23 01:55:39 +09:00
syuilo
8dc9ec06f8 良い感じに 2018-08-23 01:37:05 +09:00
syuilo
da88043962
Merge pull request #2396 from Tosuke/fix-2354
Mute on mobile(#2354)
2018-08-23 00:47:50 +09:00
Acid Chicken (硫酸鶏)
d704aca035
Update url-preview.vue 2018-08-23 00:40:32 +09:00
Acid Chicken (硫酸鶏)
2b54b4ac06
Update url-preview.vue 2018-08-23 00:34:35 +09:00
Tosuke
9f49ca8fdb feature mute on mobile(#2354) 2018-08-22 15:54:22 +09:00
syuilo
dccc2c60e3 Fix bugs
Closes #2367
2018-08-22 09:31:35 +09:00
syuilo
ef0793311f リバーシのアイコンのコントラストのオプションを追加するなど 2018-08-22 09:10:39 +09:00
syuilo
2fea3be7c0
Merge pull request #2364 from acid-chicken/patch-2
Resolve #2363
2018-08-22 08:41:47 +09:00
Acid Chicken (硫酸鶏)
f33701233c
Update boot.js 2018-08-22 01:50:13 +09:00
Acid Chicken (硫酸鶏)
70003269e5
Update boot.js 2018-08-22 01:48:08 +09:00
syuilo
3016ac4805 Fix bug 2018-08-22 01:02:56 +09:00
syuilo
6ecb88b0d1 #2338 2018-08-22 00:52:00 +09:00
syuilo
a603602f32 Clean up 2018-08-21 05:42:31 +09:00
syuilo
fd947407af Revert "Fix bug?"
This reverts commit 2c9bacfcea.
2018-08-21 01:23:39 +09:00
syuilo
2c9bacfcea Fix bug? 2018-08-20 23:49:00 +09:00
Acid Chicken (硫酸鶏)
166c4ebda0
Update reversi.game.vue 2018-08-20 18:12:03 +09:00
Acid Chicken (硫酸鶏)
319eed029b
Update reversi.game.vue 2018-08-20 18:10:51 +09:00
Acid Chicken (硫酸鶏)
4f4496078a
Update user.vue 2018-08-20 02:05:57 +09:00
syuilo
bdc6718ae5 Fix bug 2018-08-20 01:41:53 +09:00
syuilo
7d65a0c3d5 wip 2018-08-19 22:32:25 +09:00
syuilo
bb925e5de3 wip 2018-08-19 21:07:18 +09:00
syuilo
c9de5b65d4 wip 2018-08-19 19:15:29 +09:00
syuilo
19d979c330 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-19 18:38:15 +09:00
syuilo
bb7b335491 nameId廃止 & アプリ作成時にシークレットを返すように 2018-08-19 18:38:02 +09:00
Aya Morisawa
566317dc83 Fix bug 2018-08-19 13:32:02 +09:00
syuilo
78b560d89a #2324 2018-08-19 03:56:44 +09:00
syuilo
c2b882a5d7 Improve cpu and memory chart in control panel 2018-08-19 03:32:01 +09:00
syuilo
8ecf3db608 Add drive chart 2018-08-19 00:45:54 +09:00
syuilo
f59c68022f Fix bug 2018-08-19 00:42:09 +09:00
syuilo
0481de6629 wip 2018-08-19 00:27:23 +09:00
Aya Morisawa
11bb1608cf Resolve #2293 2018-08-18 13:09:15 +09:00
syuilo
bc3f5e0d78
Merge pull request #2310 from sei0o/fix-1776
fix #1776
2018-08-18 07:54:49 +09:00
sei0o
53ea709697 fix #1776 2018-08-18 07:53:06 +09:00
syuilo
607a5326d9 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 05:05:48 +09:00
syuilo
2cbd35acc4 🎨 2018-08-18 05:05:39 +09:00
Aya Morisawa
9a0224ee21 🎨 2018-08-18 05:00:54 +09:00
syuilo
6d53e64798 Improve control panel 2018-08-18 04:52:06 +09:00
Aya Morisawa
41cf856e26 Fix #2301 2018-08-18 04:13:25 +09:00
Aya Morisawa
d7dbe503b6 🎨 2018-08-18 03:59:56 +09:00
Aya Morisawa
f8a977f1c0 Add new kao 2018-08-18 03:55:45 +09:00
syuilo
bc34ac82cf Show some charts in control panel 2018-08-18 03:52:24 +09:00
syuilo
71657ddb98 🎨 2018-08-17 23:06:58 +09:00
Aya Morisawa
9f4c6a3aef Resolve #2271 2018-08-17 21:40:08 +09:00
syuilo
fbf43c1450 Fix bug 2018-08-17 19:38:39 +09:00
syuilo
8d3f71d490 Fix bug 2018-08-17 19:35:05 +09:00
syuilo
9776d8e06b
Merge pull request #2283 from sei0o/patch-2266
fix #2266
2018-08-17 19:24:10 +09:00
syuilo
2c8f962889 #2214 #2155 2018-08-17 19:17:23 +09:00
sei0o
e4b8c688bb fix #2266: デフォルト値を設定 2018-08-17 17:16:27 +09:00
sei0o
4535ab4c43 fix #2266 2018-08-17 16:35:04 +09:00
syuilo
e18655d18f
Merge pull request #2279 from syuilo/enhance-note-footer
Enhance note footer
2018-08-17 14:43:25 +09:00
sei0o
9476a240d9 ログイン失敗時のメッセージを改善 2018-08-17 12:34:07 +09:00
Aya Morisawa
a507b7c0b0 Enhance note footer 2018-08-17 07:16:56 +09:00
Aya Morisawa
48dc1678c3 Resolve #2276 2018-08-17 06:04:09 +09:00
Aya Morisawa
7b94cf9f84 Add a space between the words 2018-08-17 03:08:17 +09:00
syuilo
ffdaa6bc56 Use thumbnail 2018-08-17 00:27:36 +09:00
syuilo
f3be077adc Fix bug 2018-08-17 00:19:27 +09:00
syuilo
22e79675ad #2263 2018-08-16 23:59:22 +09:00
syuilo
e7d9018944 ✌️ 2018-08-16 07:56:53 +09:00
syuilo
6183262037 wip 2018-08-16 07:17:04 +09:00
Aya Morisawa
afa62d3d44 Add new kao 2018-08-16 05:17:00 +09:00
Aya Morisawa
270c7997c6 Remove trailing comma 2018-08-16 05:15:51 +09:00
Aya Morisawa
fa95641f88 Use Array.prototype.length to avoid magic number 2018-08-16 05:15:06 +09:00
Aya Morisawa
0d33cbbbbb Make reactions in reactions-viewer clickable 2018-08-16 04:57:09 +09:00
mei23
3c3d3e4c0c Fix url-preview.vue 2018-08-16 03:06:59 +09:00
syuilo
73c396cb39 2018-08-16 01:25:35 +09:00
Aya Morisawa
d2ef95a8c3 Make text unclickable 2018-08-16 00:49:40 +09:00
syuilo
78563ef9a0 Fix #2228 2018-08-15 20:09:56 +09:00
syuilo
14de35e3f5
Merge pull request #2234 from acid-chicken/patch-player
Update player whitelist
2018-08-15 19:04:31 +09:00
Acid Chicken (硫酸鶏)
a860479e88
Update url-preview.vue 2018-08-15 19:00:44 +09:00
Acid Chicken (硫酸鶏)
b351b3fae5
Update url-preview.vue 2018-08-15 18:49:05 +09:00
Aya Morisawa
c53cb94250 Resolve #2215 2018-08-15 06:50:49 +09:00
Aya Morisawa
259fac224e Resolve #2201 2018-08-15 04:44:39 +09:00
syuilo
e0bc0d2830 Add new kao 2018-08-15 02:01:49 +09:00
syuilo
ec07112f94 Fix bug 2018-08-14 16:53:57 +09:00
Aya Morisawa
dc02168f33 Merge #2182 2018-08-14 05:25:02 +09:00
Aya Morisawa
cc5c32b4d2 Clean up 2018-08-14 05:24:51 +09:00
syuilo
d35f62d0e4
Merge pull request #2195 from syuilo/instance-management-system
管理画面
2018-08-14 04:42:16 +09:00
Aya Morisawa
09b8e81a77 wip 2018-08-14 04:39:37 +09:00
Aya Morisawa
3b38979a34 wip 2018-08-14 04:30:42 +09:00
syuilo
8939452036
Merge pull request #2192 from acid-chicken/acid-chicken-patch-3
Re: Re: Fix #2177
2018-08-14 02:31:00 +09:00
Acid Chicken (硫酸鶏)
a2931d6f7e
Update ui.header.vue 2018-08-14 02:26:58 +09:00
Acid Chicken (硫酸鶏)
38b75ad977
Update avatar.vue 2018-08-14 02:10:06 +09:00
Aya Morisawa
ba08d1aa53 wip 2018-08-14 01:48:11 +09:00
Aya Morisawa
fb1e2efbdd wip 2018-08-14 01:37:23 +09:00
Aya Morisawa
92e5cff285 wip 2018-08-14 01:35:36 +09:00
Aya Morisawa
ba9340a26b wip 2018-08-14 01:24:46 +09:00
Aya Morisawa
00119328f2 wip 2018-08-14 01:19:05 +09:00
syuilo
9021bb5694 wip 2018-08-14 01:05:58 +09:00
syuilo
a3cf63823f
Merge pull request #2189 from syuilo/patch-1
Hide unimplemented button
2018-08-13 23:53:15 +09:00
Acid Chicken (硫酸鶏)
f15878cc6f
Update avatar.vue
refs: https://github.com/syuilo/misskey/pull/2182#discussion_r209609541
2018-08-13 22:49:32 +09:00
Aya Morisawa
33469ff87a Hide Unimplemented button 2018-08-13 22:08:59 +09:00
Acid Chicken (硫酸鶏)
979efee412
Update url-preview.vue 2018-08-13 04:41:12 +09:00
Acid Chicken (硫酸鶏)
4edd9efc0b
Update avatar.vue
refs: https://github.com/syuilo/misskey/pull/2182#discussion_r209464350
2018-08-13 03:47:56 +09:00
Acid Chicken (硫酸鶏)
2913c7ccfb
Update avatar.vue 2018-08-13 03:42:12 +09:00
Acid Chicken (硫酸鶏)
e1f460f90f
Update user.header.vue 2018-08-13 03:40:50 +09:00
Acid Chicken (硫酸鶏)
70f927ea43
Update avatar.vue 2018-08-13 03:39:32 +09:00
Acid Chicken (硫酸鶏)
80d343bb0b
Update avatar.vue 2018-08-13 03:36:42 +09:00
syuilo
9e41fddea3
Merge pull request #2130 from acid-chicken/patch-player
WIP: Add player
2018-08-13 03:25:22 +09:00
Acid Chicken (硫酸鶏)
8384efc8c7
Create whitelist 2018-08-13 03:23:36 +09:00
Acid Chicken (硫酸鶏)
4da8cc478f
Update ui.header.vue 2018-08-13 01:58:15 +09:00
syuilo
01f28b21dd #1211 2018-08-13 01:25:50 +09:00
syuilo
2cb39a8882 Fix #2097 2018-08-13 00:59:36 +09:00
Acid Chicken (硫酸鶏)
92befbb4cc Fix #2177
Resolves #2177
2018-08-13 00:18:02 +09:00
syuilo
4a5e145048 Add new reaction: rip 😇 2018-08-11 21:08:34 +09:00
MeiMei
9bc17974f2 未利用時はTwitterでログインを表示しない (#2156) 2018-08-11 20:20:35 +09:00
Acid Chicken (硫酸鶏)
19c872a1f3
Update url-preview.vue 2018-08-11 19:56:53 +09:00
Acid Chicken (硫酸鶏)
9252c59d90
Merge branch 'master' into patch-player 2018-08-11 19:56:05 +09:00
MeiMei
a8f142096c Cache failed url-preview (apply to proxy/client) (#2154) 2018-08-11 18:04:59 +09:00
MeiMei
3d10b19727 Fix Powered by <b>Misskey</b>. (#2140) 2018-08-10 20:11:54 +09:00
syuilo
454d294cf3 Fix #2133 など 2018-08-10 00:51:40 +09:00
Acid Chicken (硫酸鶏)
1b9f293959
Update url-preview.vue
多分もう折り返す必要はないのだわ
2018-08-09 23:34:54 +09:00
Acid Chicken (硫酸鶏)
7289d5b401 Add player 2018-08-09 16:44:34 +09:00
Acid Chicken (硫酸鶏)
6a92c19227
Update url-preview.vue 2018-08-09 04:21:25 +09:00
Acid Chicken (硫酸鶏)
ebf0479ecc
Update url-preview.vue 2018-08-09 04:05:28 +09:00
syuilo
196c55edbc
Merge pull request #2125 from acid-chicken/acid-chicken-patch-2
Spotify
2018-08-09 03:32:55 +09:00
Acid Chicken (硫酸鶏)
e724c1e7e8
Update url-preview.vue 2018-08-09 03:32:09 +09:00
syuilo
7bd33ecc72 ✌️ 2018-08-07 13:25:50 +09:00
syuilo
d4f7058574 🍕 2018-08-07 12:37:17 +09:00
gutfuckllc
b85f13dad3 Localize mobile search.vue 2018-08-06 21:06:09 -04:00
gutfuckllc
eb8c3fe884 Localize a dev file 2018-08-06 21:03:24 -04:00
gutfuckllc
ff325d9588 Localized annotations line 2018-08-06 21:00:58 -04:00
gutfuckllc
a98392ff27 Localize "only one file attached" popup 2018-08-06 20:57:14 -04:00
gutfuckllc
24de518922 Localized 2 missing lines for mobile widgets.vue 2018-08-06 16:08:54 -04:00
gutfuckllc
a169c7756f Added more close buttons 2018-08-06 16:05:48 -04:00
gutfuckllc
4f590e0a96 Localized adjective 2018-08-06 16:04:20 -04:00
gutfuckllc
f5b5b290e4 Localized copy-paste message (added common) 2018-08-06 16:02:53 -04:00
gutfuckllc
1f75cf4ace Localize missing line 2018-08-06 16:00:12 -04:00
gutfuckllc
1e4f11a979 Localize japanese adjective. 2018-08-06 15:58:09 -04:00
gutfuckllc
be12e23aa1 Localize unlocalized line. 2018-08-06 15:55:39 -04:00
gutfuckllc
790e6ceca4 Localize unlocalized line 2018-08-06 15:53:21 -04:00
gutfuckllc
a303d52990 Fix typo 2018-08-06 15:53:06 -04:00
syuilo
d733a1b445 i18n 2018-08-07 03:20:26 +09:00
syuilo
5f208a7d99 ユーザー検索APIを統合 2018-08-06 18:28:27 +09:00
syuilo
0d9782571f 🎨 2018-08-06 00:09:21 +09:00
syuilo
be67f5f422 🎨 2018-08-05 23:38:31 +09:00
syuilo
2e454dad2d 🎨 2018-08-05 20:57:24 +09:00
syuilo
6ef28214df ひとつの投稿内で使えるそれぞれの動きのあるMFM構文は3回までに制限 2018-08-05 19:36:19 +09:00
syuilo
5bbc95d659 文字数が多い場合は動きを無効に 2018-08-05 19:20:26 +09:00
syuilo
128a201b9d #2080 など 2018-08-05 13:40:26 +09:00
syuilo
cd28504dd8 Add new MFM syntax 2018-08-05 12:33:51 +09:00
syuilo
9a2ff56a79 動きのあるMFMを無効にするオプションを実装 2018-08-04 22:48:35 +09:00
syuilo
be9f6ad294 Implement surrender of reversi 2018-08-04 22:28:01 +09:00
syuilo
61a9ad23f1 Fix bug 2018-08-04 12:35:57 +09:00
syuilo
29418ecbb4 🎨 2018-08-04 11:32:53 +09:00
syuilo
67e97310cf Clean up 2018-08-04 11:25:39 +09:00
syuilo
33d3d5c570 スライダーコントロールを追加するなど 2018-08-04 11:24:15 +09:00
syuilo
0389afa0fe 🎨 2018-08-04 01:48:02 +09:00
syuilo
caec6933d1 Fix bug 2018-08-04 01:47:57 +09:00