graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-14 05:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity
9231 commits 62 branches 916 tags 154 MiB
Commit graph

3861 commits

Author SHA1 Message Date
syuilo
53926082e7
Merge pull request #2438 from mei23/mei-0824-basehtmlcc 
ベースHTMLは immutableキャッシュしないようにする
 2018-08-24 05:47:53 +09:00
mei23
5b5de6a89c ベースHTMLは immutableキャッシュしないようにする 2018-08-24 05:41:03 +09:00
syuilo
a11c991f83
Merge pull request #2436 from mei23/mei-0824-api404 
/api/ 下の存在しないにURL対しては404を返すようにする
 2018-08-24 05:40:30 +09:00
syuilo
4dee7d91b1 Better charts 2018-08-24 05:37:19 +09:00
mei23
839be6477d Return 404 for unknown API 2018-08-24 05:26:26 +09:00
syuilo
efae7a7bce
8.1.0 (#2426) 
* Update url-preview.vue

* 一時間ごとのグラフも見れるように

* Merge pull request #2423 from syuilo/develop (#2425)

* 8.1.0
 2018-08-23 16:38:12 +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
8fc1e07136 1時間単位での集計を追加 2018-08-23 15:40:24 +09:00
syuilo
a62e2b83ff Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-08-23 14:56:43 +09:00
syuilo
e31a2f7e55 Fix bug: Check following request existance 2018-08-23 14:56:39 +09:00
rinsuki
4fb7ee760a
https://misskey.xyz/notes/5b7e20bd248403003019b860 の修正 2018-08-23 11:58:44 +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
d129151fdf Fix #2410 
なぜか .ts という拡張子で来るのかは不明
 2018-08-23 02:28:58 +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
c3747db670 Fix doc 2018-08-22 09:36:42 +09:00
syuilo
fe1e60a28c Fix #2334 2018-08-22 09:33:59 +09:00
syuilo
f91d2e8c8d Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-22 09:31:51 +09:00
syuilo
dccc2c60e3 Fix bugs 
Closes #2367
 2018-08-22 09:31:35 +09:00
Tosuke
0b503661af fix login bug(#2384) 2018-08-22 09:26:06 +09:00
syuilo
58082431ff Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-22 09:16:55 +09:00
syuilo
2536bfb5f5 #2378 2018-08-22 09:16:52 +09:00
syuilo
6428066552
Merge pull request #2388 from mei23/mei-0822-dbcheck 
起動時のDB接続チェックでエラーを検出できないのを修正
 2018-08-22 09:12:59 +09:00
syuilo
4bf3827b73 Revert "#2387" 
This reverts commit 3cad494404.
 2018-08-22 09:12:37 +09:00
syuilo
3cad494404 #2387 2018-08-22 09:11:59 +09:00
syuilo
ef0793311f リバーシのアイコンのコントラストのオプションを追加するなど 2018-08-22 09:10:39 +09:00
mei23
6f3e341e89 Fix DB connectivity check 2018-08-22 08:46:31 +09:00
syuilo
2fea3be7c0
Merge pull request #2364 from acid-chicken/patch-2 
Resolve #2363
 2018-08-22 08:41:47 +09:00
syuilo
07ddeae2f1 Clean up 2018-08-22 04:53:02 +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
c65f5761e1
Merge pull request #2385 from mei23/mei-0821-aptype 
ActivityPub で Content-Type を正しく扱う
 2018-08-22 01:23:43 +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
75e4c8d74d Better reponse 2018-08-21 23:56:15 +09:00
syuilo
3476be16ab
Merge pull request #2381 from mei23/mei-0821-apnote 
ActivityPub Note/Outbox の公開範囲の修正
 2018-08-21 20:07:33 +09:00
mei23
b42a9e1c4e Set ActivityPub Content-Type 2018-08-21 13:48:03 +09:00
mei23
4495525705 Respect visibility in ActivityPub Note/Outbox 2018-08-21 13:22:30 +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
30444e5f1a #2359 など 2018-08-21 01:03:58 +09:00
syuilo
f0d818de24 Fix bug 2018-08-21 00:12:45 +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
9bc3fcf74f
Merge pull request #2348 from mei23/mei-0819-nsfw3 
リモートにNSFWが効かないのを修正
 2018-08-19 18:46:47 +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
mei23
be5a0b4794 Fix リモートにNSFWが効かない 2018-08-19 18:08:29 +09:00
Aya Morisawa
566317dc83 Fix bug 2018-08-19 13:32:02 +09:00
syuilo
452514f7fe Fix bug 2018-08-19 05:26:34 +09:00
syuilo
000d9cc1ce Fix bug 2018-08-19 05:15:50 +09:00
syuilo
f3936a79aa Fix #2335 2018-08-19 04:01:10 +09:00
syuilo
78b560d89a #2324 2018-08-19 03:56:44 +09:00
syuilo
2fc6313380 Fix #2325 2018-08-19 03:36:51 +09:00
syuilo
c2b882a5d7 Improve cpu and memory chart in control panel 2018-08-19 03:32:01 +09:00
syuilo
667b18fe24 Refactoring 2018-08-19 03:06:23 +09:00
syuilo
043b66f5da
Merge pull request #2330 from syuilo/patch 
Clean up
 2018-08-19 00:52:10 +09:00
syuilo
2f45ac3712
Merge pull request #2329 from syuilo/improve-chart 
Improve chart
 2018-08-19 00:46:17 +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
Aya Morisawa
7aac2c4e29 Clean up 2018-08-19 00:31:25 +09:00
syuilo
0481de6629 wip 2018-08-19 00:27:23 +09:00
tamaina
f59d0a75e4 missing semicolon 2018-08-19 00:20:36 +09:00
tamaina
22f4b3cc7b missing semicolon 2018-08-19 00:20:36 +09:00
tamaina
a4283c415a improve html to MFM 2018-08-19 00:20:36 +09:00
tamaina
c0fbcee38a improve MFM to html 2018-08-19 00:20:36 +09:00
syuilo
335200c31e wip 2018-08-18 23:56:44 +09:00
syuilo
df71c90f9f wip 2018-08-18 23:48:54 +09:00
syuilo
ef79903811 wip 2018-08-18 23:23:55 +09:00
syuilo
c3cd0451ad wip 2018-08-18 23:15:16 +09:00
syuilo
773fe28fcb wip 2018-08-18 20:26:01 +09:00
syuilo
69e2576387 wip 2018-08-18 20:22:56 +09:00
Aya Morisawa
b52d995719 Fix typo 2018-08-18 13:12:29 +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
31aaf559ac Fix bug 2018-08-18 05:46:57 +09:00
syuilo
160185b108 Fix bug 2018-08-18 05:43:09 +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
syuilo
e922d8904c Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 04:22:00 +09:00
syuilo
45b55a8c98 Update rate limit setting 2018-08-18 04:21:49 +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
c35e760fd3 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 03:52:46 +09:00
syuilo
bc34ac82cf Show some charts in control panel 2018-08-18 03:52:24 +09:00
syuilo
9f8d21b2bc
Fix #2298 2018-08-18 03:36:13 +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
syuilo
77d82d2d17
Merge pull request #2282 from sei0o/improve-login-failed-message 
ログイン失敗時のメッセージを改善
 2018-08-17 13:19:41 +09:00
syuilo
2777460150
Merge pull request #2278 from mei23/mei-0817-announce3 
Misskey => Misskey で renote 出来ない件修正
 2018-08-17 13:18:11 +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
mei23
939c0dc5f9 Fix indent 2018-08-17 06:46:32 +09:00
mei23
a89c206572 Fix Announce Activity 2018-08-17 06:40:50 +09:00
Aya Morisawa
48dc1678c3 Resolve #2276 2018-08-17 06:04:09 +09:00
Aya Morisawa
431383ab54 Clean up 2018-08-17 05:33:20 +09:00
syuilo
7a8d252f63
Merge pull request #2272 from mei23/mei-0817-debuglog 
production以外のときに`npm run debug`が効かないのを修正
 2018-08-17 04:04:18 +09:00
mei23
39060374c2 Fix npm run debug not working 2018-08-17 03:51:42 +09:00
Aya Morisawa
7b94cf9f84 Add a space between the words 2018-08-17 03:08:17 +09:00
syuilo
d70e27a865 Provide id in announce activity 2018-08-17 02:37:20 +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
ee12d887ae typo 2018-08-17 00:07:23 +09:00
syuilo
b78d24be1e Fix bug 2018-08-17 00:05:57 +09:00
syuilo
d5379e2b36 autoWatchをデフォルトでfalseに 2018-08-17 00:04:07 +09:00
syuilo
58f3c6aab7 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-16 23:59:25 +09:00
syuilo
22e79675ad #2263 2018-08-16 23:59:22 +09:00
syuilo
e5c350d740
Fix bug 2018-08-16 23:33:11 +09:00
syuilo
7f9a35d7ac Improve object storage key 2018-08-16 21:23:31 +09:00
syuilo
9d6641be3a Fix bug 2018-08-16 08:18:41 +09:00
syuilo
ac15c2e71f Fix bug 2018-08-16 08:11:21 +09:00
syuilo
e7d9018944 ✌️ 2018-08-16 07:56:53 +09:00
syuilo
6183262037 wip 2018-08-16 07:17:04 +09:00
syuilo
1c7a194950 wip 2018-08-16 06:27:35 +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
syuilo
aa9fe38c25
Merge pull request #2247 from syuilo/clickable-reaction 
Make reactions in reactions-viewer clickable
 2018-08-16 05:00:13 +09:00
Aya Morisawa
0d33cbbbbb Make reactions in reactions-viewer clickable 2018-08-16 04:57:09 +09:00
syuilo
bf077da72f Trim code 2018-08-16 04:42:44 +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
Aya Morisawa
ab3f8fd10c Enhance log message 2018-08-16 00:13:24 +09:00
syuilo
08b431723a Refactoring 2018-08-15 20:27:49 +09:00
syuilo
83dcfec053 Improve MFM 2018-08-15 20:27:36 +09:00