Commit graph

16154 commits

Author SHA1 Message Date
MeiMei
43f50e0602 confirm silence (#4560) 2019-04-18 03:33:51 +09:00
tamaina
2d79243798 Use menu instead of prompt Fix #4540, Fix #342 (#4575)
* Use menu instead prompt

* fix

* https://bit.ly/2U0JuVt

* fix
2019-04-18 03:32:45 +09:00
MeiMei
567df7c6b2 アンケートウィジットでもMFMを使用するように v11 (#4741)
* MFM in poll

* use mfm
2019-04-18 03:14:04 +09:00
syuilo
c3ad1c62d1 Merge branch 'develop' 2019-04-18 01:12:21 +09:00
syuilo
a5a459b072 11.1.6 2019-04-18 01:12:03 +09:00
syuilo
ea86a39489 New Crowdin translations (#4692)
* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Czech)
2019-04-18 01:11:06 +09:00
かひわし4(バージョン1)
132c190374 Docker: Back to npm from yarn (#4730)
This commit reverts "Fix Dockerfile #4214" which uses yarn instead of npm.
The cause of the build error is that binding.gyp and src/crypto_key.cc
are missing when installing dependencies.
In other words, yarn did not fix build error.

There is no reason to use yarn, so go back to npm.
2019-04-18 01:09:31 +09:00
syuilo
f4d14fb928 Fix bug 2019-04-18 01:05:40 +09:00
syuilo
9890b3ffa8 Improve readability 2019-04-18 00:57:06 +09:00
syuilo
0273a18ae4 Remove unused imports 2019-04-18 00:56:10 +09:00
MeiMei
0cb8480117 Fix: v11で未認知ユーザーからActivityが飛んできた場合に処理できない (#4733)
* Fix: inboxに未知のユーザーが来ると処理できない

* こうかな
2019-04-18 00:53:00 +09:00
syuilo
bfa78631b3 [MFM] Better hashtag parsing 2019-04-18 00:40:56 +09:00
syuilo
162b923a53 Fix indent 2019-04-18 00:13:31 +09:00
syuilo
b47057a56f Better error handling 2019-04-18 00:09:08 +09:00
syuilo
110a2a7121 Merge branch 'develop' 2019-04-17 19:37:32 +09:00
syuilo
54c61ae4fa 11.1.5 2019-04-17 19:36:58 +09:00
syuilo
022bb7a5b3 Better avgColor 2019-04-17 17:13:49 +09:00
syuilo
651c79536f 🎨 2019-04-17 17:01:57 +09:00
syuilo
4d41016c10 Update CONTRIBUTING.md 2019-04-17 16:59:39 +09:00
syuilo
9f363d253d Fix error 2019-04-17 16:50:50 +09:00
syuilo
22bf8eb86f Disable sql log 2019-04-17 16:45:31 +09:00
syuilo
6d20c88ffa Clean up 2019-04-17 14:39:45 +09:00
syuilo
0fd33c1172 Refactor 2019-04-17 14:32:59 +09:00
syuilo
ac4fdc0e10 Fix #4721 Fix #4722 2019-04-17 14:30:31 +09:00
syuilo
f11f901d7d Clean up 2019-04-17 07:25:34 +09:00
syuilo
ba783bfdd0 Update schemas.ts 2019-04-17 04:32:04 +09:00
syuilo
02845dc171 Merge branch 'develop' 2019-04-17 02:58:09 +09:00
syuilo
f5786c4f15 11.1.4 2019-04-17 02:57:48 +09:00
syuilo
696bc486ea Clean up 2019-04-17 02:57:36 +09:00
syuilo
6d299316d2 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-04-17 02:51:19 +09:00
syuilo
f9f8ccdfbf Better response 2019-04-17 02:51:12 +09:00
syuilo
a08a0270e7 Update delete-file.ts 2019-04-17 02:37:37 +09:00
tamaina
2d21361b36 Update stream.ja-JP.md (#4725) 2019-04-17 02:21:22 +09:00
syuilo
475e613931 Refactor 2019-04-17 02:19:49 +09:00
かひわし4(バージョン1)
9c3f765343 Doc: Update setup documents (#4680)
* Doc: Update setup documents

Use GitHub api to checkout latest release instead of "git tag" command
which cannot accurately determine prerelease tag.
Also, Changed numbered list format because
the shell command is too long to fit on one line.

* Doc: Use tab instead of spaces

* Doc: Use master branch as latest release tag

master branch and latest release is the same.
master branch merges develop branch with each latest release.
2019-04-17 02:15:27 +09:00
syuilo
cfcdef99a1 smallint 2019-04-17 02:12:15 +09:00
syuilo
8760a4195c Fix #4724 2019-04-17 02:11:22 +09:00
MeiMei
135c99591e Metaのアクセスでトランザクションを張るように (#4720)
* admin/instanceでmetaをキャッシュしないように

* Metaのアクセスにトランザクションをかける
2019-04-17 00:45:33 +09:00
syuilo
0f9e0b9c83 Refactor 2019-04-17 00:34:49 +09:00
syuilo
f87b1582a7 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-04-17 00:33:10 +09:00
syuilo
660a976a1c Meta を二重にデータベースに保存できないように 2019-04-17 00:33:02 +09:00
Satsuki Yanagi
f21d1f17ad Correct syntax error (#4718) 2019-04-17 00:30:34 +09:00
YuzuRyo61
e83abda575 Fix space indent in misskey.nginx (#4717)
Tabインデントになっていたものをスペースインデントに変更
2019-04-16 19:41:58 +09:00
syuilo
0b4d7de915 チャートの数値カラムの型を拡張 2019-04-16 17:52:09 +09:00
Acid Chicken (硫酸鶏)
59f758f207 Update README.md [AUTOGEN] (#4697) 2019-04-16 13:07:00 +09:00
かひわし4(バージョン1)
8190e89824 Docker: Uncomment redis (#4707)
Redis is required since Misskey 11.0.0.
2019-04-16 13:06:36 +09:00
tamaina
78c88f9ff0 fix syuilo#4711 (#4715) 2019-04-16 13:05:47 +09:00
tamaina
44bad42cf3 色々な修正; Fix #4709 (#4714)
* Fix a la carte 1

* use dialog instead of alert() etc
2019-04-16 13:05:10 +09:00
MeiMei
5c36a24937 Fix: admin/driveのアイコンがずれてる (#4710) 2019-04-16 02:46:47 +09:00
syuilo
31642ff542 Merge branch 'develop' 2019-04-16 01:24:00 +09:00