161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-23 12:39:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,227 Commits 10 Branches 22 Tags 1.5 GiB
fd4566b9e7
Commit Graph

3863 Commits

Author SHA1 Message Date
syuilo
6ab2aec96e Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-08-24 06:41:56 +09:00
syuilo
3581850c3b Improve chart 2018-08-24 06:41:53 +09:00
syuilo
c809f4df6a Merge pull request #2438 from mei23/mei-0824-basehtmlcc 
ベースHTMLは immutableキャッシュしないようにする
 2018-08-24 05:47:53 +09:00
mei23
2ce57c57ee ベースHTMLは immutableキャッシュしないようにする 2018-08-24 05:41:03 +09:00
syuilo
1425289338 Merge pull request #2436 from mei23/mei-0824-api404 
/api/ 下の存在しないにURL対しては404を返すようにする
 2018-08-24 05:40:30 +09:00
syuilo
c51ba19926 Better charts 2018-08-24 05:37:19 +09:00
mei23
307d458726 Return 404 for unknown API 2018-08-24 05:26:26 +09:00
syuilo
55749db456 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
e1aaa01177 Merge pull request #2424 from acid-chicken/patch-4 
Fix #2421
 2018-08-23 16:36:42 +09:00
syuilo
90c8eacd95 一時間ごとのグラフも見れるように 2018-08-23 16:36:23 +09:00
Acid Chicken (硫酸鶏)
14690e4729 Update url-preview.vue 2018-08-23 16:25:36 +09:00
syuilo
dc413e984f 1時間単位での集計を追加 2018-08-23 15:40:24 +09:00
syuilo
86ec6f01e4 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-08-23 14:56:43 +09:00
syuilo
3af8ab7694 Fix bug: Check following request existance 2018-08-23 14:56:39 +09:00
rinsuki
ccea661b4f https://misskey.xyz/notes/5b7e20bd248403003019b860 の修正 2018-08-23 11:58:44 +09:00
syuilo
255660c645 コントロールパネルから招待制のオンオフを切り替えられるように 2018-08-23 03:19:57 +09:00
syuilo
e14b84a65e Add control panel link in nav 2018-08-23 02:47:12 +09:00
syuilo
d9dd7e705d Fix #2410 
なぜか .ts という拡張子で来るのかは不明
 2018-08-23 02:28:58 +09:00
syuilo
c0fecda18b Fix bug 2018-08-23 01:55:39 +09:00
syuilo
4ab19e12b9 良い感じに 2018-08-23 01:37:05 +09:00
syuilo
ff47a37740 Merge pull request #2396 from Tosuke/fix-2354 
Mute on mobile(#2354)
 2018-08-23 00:47:50 +09:00
Acid Chicken (硫酸鶏)
d7dc3ca969 Update url-preview.vue 2018-08-23 00:40:32 +09:00
Acid Chicken (硫酸鶏)
4d77db942f Update url-preview.vue 2018-08-23 00:34:35 +09:00
Tosuke
35b5817ce9 feature mute on mobile(#2354) 2018-08-22 15:54:22 +09:00
syuilo
bd3c607893 Fix doc 2018-08-22 09:36:42 +09:00
syuilo
b6673cda89 Fix #2334 2018-08-22 09:33:59 +09:00
syuilo
ab13201457 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-22 09:31:51 +09:00
syuilo
fb3f25f6b0 Fix bugs 
Closes #2367
 2018-08-22 09:31:35 +09:00
Tosuke
b90db0e905 fix login bug(#2384) 2018-08-22 09:26:06 +09:00
syuilo
f16a684023 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-22 09:16:55 +09:00
syuilo
0287ced18e #2378 2018-08-22 09:16:52 +09:00
syuilo
1f11befc24 Merge pull request #2388 from mei23/mei-0822-dbcheck 
起動時のDB接続チェックでエラーを検出できないのを修正
 2018-08-22 09:12:59 +09:00
syuilo
9381435fff Revert "#2387" 
This reverts commit 3cad494404ad0e2df2a4d42f2934640f402d1412.
 2018-08-22 09:12:37 +09:00
syuilo
f8491d479f #2387 2018-08-22 09:11:59 +09:00
syuilo
13a9dd642b リバーシのアイコンのコントラストのオプションを追加するなど 2018-08-22 09:10:39 +09:00
mei23
487f07baf8 Fix DB connectivity check 2018-08-22 08:46:31 +09:00
syuilo
f7a12375b8 Merge pull request #2364 from acid-chicken/patch-2 
Resolve #2363
 2018-08-22 08:41:47 +09:00
syuilo
0c1b8a26db Clean up 2018-08-22 04:53:02 +09:00
Acid Chicken (硫酸鶏)
5950bcdf8d Update boot.js 2018-08-22 01:50:13 +09:00
Acid Chicken (硫酸鶏)
c4f3d1e432 Update boot.js 2018-08-22 01:48:08 +09:00
syuilo
10d5e52be7 Merge pull request #2385 from mei23/mei-0821-aptype 
ActivityPub で Content-Type を正しく扱う
 2018-08-22 01:23:43 +09:00
syuilo
c75920aab2 Fix bug 2018-08-22 01:02:56 +09:00
syuilo
6b272362c4 #2338 2018-08-22 00:52:00 +09:00
syuilo
bda0843bba Better reponse 2018-08-21 23:56:15 +09:00
syuilo
491a311904 Merge pull request #2381 from mei23/mei-0821-apnote 
ActivityPub Note/Outbox の公開範囲の修正
 2018-08-21 20:07:33 +09:00
mei23
7439e2d2d8 Set ActivityPub Content-Type 2018-08-21 13:48:03 +09:00
mei23
8ad2b4fd15 Respect visibility in ActivityPub Note/Outbox 2018-08-21 13:22:30 +09:00
syuilo
a5015410da Clean up 2018-08-21 05:42:31 +09:00
syuilo
17610e0a13 Revert "Fix bug?" 
This reverts commit 2c9bacfceade688865ad1e8533ca494dd34d0ee5.
 2018-08-21 01:23:39 +09:00
syuilo
78f84dbc21 #2359 など 2018-08-21 01:03:58 +09:00
syuilo
d57f2f5701 Fix bug 2018-08-21 00:12:45 +09:00
syuilo
c17c12d684 Fix bug? 2018-08-20 23:49:00 +09:00
Acid Chicken (硫酸鶏)
fb81e4585d Update reversi.game.vue 2018-08-20 18:12:03 +09:00
Acid Chicken (硫酸鶏)
03185b12e5 Update reversi.game.vue 2018-08-20 18:10:51 +09:00
Acid Chicken (硫酸鶏)
120cd170df Update user.vue 2018-08-20 02:05:57 +09:00
syuilo
486535cfd3 Fix bug 2018-08-20 01:41:53 +09:00
syuilo
ce7ca7e160 wip 2018-08-19 22:32:25 +09:00
syuilo
a6eaa9718e wip 2018-08-19 21:07:18 +09:00
syuilo
e9473ca642 wip 2018-08-19 19:15:29 +09:00
syuilo
9dbf5c6df9 Merge pull request #2348 from mei23/mei-0819-nsfw3 
リモートにNSFWが効かないのを修正
 2018-08-19 18:46:47 +09:00
syuilo
e59ad55f39 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-19 18:38:15 +09:00
syuilo
eaa3cbc9ab nameId廃止 & アプリ作成時にシークレットを返すように 2018-08-19 18:38:02 +09:00
mei23
a135dad7b5 Fix リモートにNSFWが効かない 2018-08-19 18:08:29 +09:00
Aya Morisawa
118fc3d3b8 Fix bug 2018-08-19 13:32:02 +09:00
syuilo
6a109bd251 Fix bug 2018-08-19 05:26:34 +09:00
syuilo
64dd0aec60 Fix bug 2018-08-19 05:15:50 +09:00
syuilo
2f10efea7d Fix #2335 2018-08-19 04:01:10 +09:00
syuilo
55f42f8eae #2324 2018-08-19 03:56:44 +09:00
syuilo
78ab81cc83 Fix #2325 2018-08-19 03:36:51 +09:00
syuilo
a532ad738f Improve cpu and memory chart in control panel 2018-08-19 03:32:01 +09:00
syuilo
6405eee659 Refactoring 2018-08-19 03:06:23 +09:00
syuilo
d5d6f49f2f Merge pull request #2330 from syuilo/patch 
Clean up
 2018-08-19 00:52:10 +09:00
syuilo
8db8c912b8 Merge pull request #2329 from syuilo/improve-chart 
Improve chart
 2018-08-19 00:46:17 +09:00
syuilo
79413d6d2d Add drive chart 2018-08-19 00:45:54 +09:00
syuilo
32b32cef0e Fix bug 2018-08-19 00:42:09 +09:00
Aya Morisawa
84d8b49f76 Clean up 2018-08-19 00:31:25 +09:00
syuilo
b6df125961 wip 2018-08-19 00:27:23 +09:00
tamaina
30af01a7fc missing semicolon 2018-08-19 00:20:36 +09:00
tamaina
95a68340f9 missing semicolon 2018-08-19 00:20:36 +09:00
tamaina
d6bad7cb30 improve html to MFM 2018-08-19 00:20:36 +09:00
tamaina
8ec8d89e0a improve MFM to html 2018-08-19 00:20:36 +09:00
syuilo
dac45c447b wip 2018-08-18 23:56:44 +09:00
syuilo
ad641970d4 wip 2018-08-18 23:48:54 +09:00
syuilo
1699ad9f40 wip 2018-08-18 23:23:55 +09:00
syuilo
c7dc7748d5 wip 2018-08-18 23:15:16 +09:00
syuilo
486ccffcfb wip 2018-08-18 20:26:01 +09:00
syuilo
5c202cc4c7 wip 2018-08-18 20:22:56 +09:00
Aya Morisawa
043ae91032 Fix typo 2018-08-18 13:12:29 +09:00
Aya Morisawa
c309aa9189 Resolve #2293 2018-08-18 13:09:15 +09:00
syuilo
a54d3f5a4d Merge pull request #2310 from sei0o/fix-1776 
fix #1776
 2018-08-18 07:54:49 +09:00
sei0o
5c748da02f fix #1776 2018-08-18 07:53:06 +09:00
syuilo
415cd55cf0 Fix bug 2018-08-18 05:46:57 +09:00
syuilo
56e856233c Fix bug 2018-08-18 05:43:09 +09:00
syuilo
3b1fa40f1f Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 05:05:48 +09:00
syuilo
075ada81a5 🎨 2018-08-18 05:05:39 +09:00
Aya Morisawa
da179ed746 🎨 2018-08-18 05:00:54 +09:00
syuilo
b49183529c Improve control panel 2018-08-18 04:52:06 +09:00
syuilo
f2fbf79a55 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 04:22:00 +09:00
syuilo
5dd21e26e3 Update rate limit setting 2018-08-18 04:21:49 +09:00
Aya Morisawa
eef09b8f3f Fix #2301 2018-08-18 04:13:25 +09:00
Aya Morisawa
d9078cff42 🎨 2018-08-18 03:59:56 +09:00
Aya Morisawa
83971a4872 Add new kao 2018-08-18 03:55:45 +09:00
syuilo
12c4612e09 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-18 03:52:46 +09:00
syuilo
cfac3d5ed6 Show some charts in control panel 2018-08-18 03:52:24 +09:00
syuilo
d3b62980f7 Fix #2298 2018-08-18 03:36:13 +09:00
syuilo
18033d57a3 🎨 2018-08-17 23:06:58 +09:00
Aya Morisawa
392d118f4a Resolve #2271 2018-08-17 21:40:08 +09:00
syuilo
8766f483b0 Fix bug 2018-08-17 19:38:39 +09:00
syuilo
6edfa66157 Fix bug 2018-08-17 19:35:05 +09:00
syuilo
5054201636 Merge pull request #2283 from sei0o/patch-2266 
fix #2266
 2018-08-17 19:24:10 +09:00
syuilo
d41237022e #2214 #2155 2018-08-17 19:17:23 +09:00
sei0o
76b97ba15e fix #2266: デフォルト値を設定 2018-08-17 17:16:27 +09:00
sei0o
320f657712 fix #2266 2018-08-17 16:35:04 +09:00
syuilo
41b382be53 Merge pull request #2279 from syuilo/enhance-note-footer 
Enhance note footer
 2018-08-17 14:43:25 +09:00
syuilo
bbaa647d86 Merge pull request #2282 from sei0o/improve-login-failed-message 
ログイン失敗時のメッセージを改善
 2018-08-17 13:19:41 +09:00
syuilo
64b27953de Merge pull request #2278 from mei23/mei-0817-announce3 
Misskey => Misskey で renote 出来ない件修正
 2018-08-17 13:18:11 +09:00
sei0o
8153108166 ログイン失敗時のメッセージを改善 2018-08-17 12:34:07 +09:00
Aya Morisawa
f1436f9cae Enhance note footer 2018-08-17 07:16:56 +09:00
mei23
cc11ca6d45 Fix indent 2018-08-17 06:46:32 +09:00
mei23
63a6e0a24d Fix Announce Activity 2018-08-17 06:40:50 +09:00
Aya Morisawa
c1e2979c63 Resolve #2276 2018-08-17 06:04:09 +09:00
Aya Morisawa
a44f93482c Clean up 2018-08-17 05:33:20 +09:00
syuilo
86d4c49a95 Merge pull request #2272 from mei23/mei-0817-debuglog 
production以外のときに`npm run debug`が効かないのを修正
 2018-08-17 04:04:18 +09:00
mei23
17de8b454c Fix npm run debug not working 2018-08-17 03:51:42 +09:00
Aya Morisawa
e82a794151 Add a space between the words 2018-08-17 03:08:17 +09:00
syuilo
258193008f Provide id in announce activity 2018-08-17 02:37:20 +09:00
syuilo
017a2c7a3c Use thumbnail 2018-08-17 00:27:36 +09:00
syuilo
3b5014c7da Fix bug 2018-08-17 00:19:27 +09:00
syuilo
7c4f11566a typo 2018-08-17 00:07:23 +09:00
syuilo
d9355eaae7 Fix bug 2018-08-17 00:05:57 +09:00
syuilo
bc44a7866b autoWatchをデフォルトでfalseに 2018-08-17 00:04:07 +09:00
syuilo
3efb2efd79 Merge branch 'master' of https://github.com/syuilo/misskey 2018-08-16 23:59:25 +09:00
syuilo
6ef10ba596 #2263 2018-08-16 23:59:22 +09:00
syuilo
d9d2e59fa3 Fix bug 2018-08-16 23:33:11 +09:00
syuilo
8531d6a8f1 Improve object storage key 2018-08-16 21:23:31 +09:00
syuilo
e3641192ec Fix bug 2018-08-16 08:18:41 +09:00
syuilo
9ab87f62a8 Fix bug 2018-08-16 08:11:21 +09:00
syuilo
212f70b55c ✌️ 2018-08-16 07:56:53 +09:00
syuilo
43bfabb04b wip 2018-08-16 07:17:04 +09:00
syuilo
96878677f5 wip 2018-08-16 06:27:35 +09:00
Aya Morisawa
04fe66828e Add new kao 2018-08-16 05:17:00 +09:00
Aya Morisawa
50bf058a90 Remove trailing comma 2018-08-16 05:15:51 +09:00
Aya Morisawa
de01a1d51a Use Array.prototype.length to avoid magic number 2018-08-16 05:15:06 +09:00
syuilo
bea60a86ea Merge pull request #2247 from syuilo/clickable-reaction 
Make reactions in reactions-viewer clickable
 2018-08-16 05:00:13 +09:00
Aya Morisawa
c384e9d2b9 Make reactions in reactions-viewer clickable 2018-08-16 04:57:09 +09:00
syuilo
cccd889449 Trim code 2018-08-16 04:42:44 +09:00
mei23
d47217a71e Fix url-preview.vue 2018-08-16 03:06:59 +09:00
syuilo
4f3103a6bd ⭐ 2018-08-16 01:25:35 +09:00
Aya Morisawa
e1b80606a1 Make text unclickable 2018-08-16 00:49:40 +09:00
Aya Morisawa
303b04fb42 Enhance log message 2018-08-16 00:13:24 +09:00