amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,106 Commits 3 Branches 0 Tags 162 MiB
4ce330c59e
Commit Graph

17106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MeiMei
653b8f6352 スプラッシュがクリックに反応するように (#4561) 
* confirm silence

* Resolve #4554

* Revert "confirm silence"

This reverts commit e1dbdc2bfc0f41c2b308b142c70e9e4573c98cf9.
 2019-04-18 03:37:49 +09:00
MeiMei
9ec6afa375 confirm on user menu (#4553) 2019-04-18 03:36:06 +09:00
MeiMei
adff5382ca confirm silence (#4560) 2019-04-18 03:33:51 +09:00
tamaina
704aabd703 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
f7b1ef0690 アンケートウィジットでもMFMを使用するように v11 (#4741) 
* MFM in poll

* use mfm
 2019-04-18 03:14:04 +09:00
syuilo
929982117f
Merge branch 'develop' 2019-04-18 01:12:21 +09:00
syuilo
56a530d769
11.1.6 2019-04-18 01:12:03 +09:00
syuilo
7ef75fb06b
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）
112a72abdf 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
71813e03ee
Fix bug 2019-04-18 01:05:40 +09:00
syuilo
9b05b6ef28
Improve readability 2019-04-18 00:57:06 +09:00
syuilo
54a87b25b3
Remove unused imports 2019-04-18 00:56:10 +09:00
MeiMei
55e97864bd Fix: v11で未認知ユーザーからActivityが飛んできた場合に処理できない (#4733) 
* Fix: inboxに未知のユーザーが来ると処理できない

* こうかな
 2019-04-18 00:53:00 +09:00
syuilo
95733c9490
[MFM] Better hashtag parsing 2019-04-18 00:40:56 +09:00
syuilo
e19ae644f1
Fix indent 2019-04-18 00:13:31 +09:00
syuilo
ac4ea25267
Better error handling 2019-04-18 00:09:08 +09:00
syuilo
611e4f34dc
Merge branch 'develop' 2019-04-17 19:37:32 +09:00
syuilo
faf017f333
11.1.5 2019-04-17 19:36:58 +09:00
syuilo
5eec896615
Better avgColor 2019-04-17 17:13:49 +09:00
syuilo
17f35174ea
🎨 2019-04-17 17:01:57 +09:00
syuilo
bf71b31123
Update CONTRIBUTING.md 2019-04-17 16:59:39 +09:00
syuilo
9399a44c82
Fix error 2019-04-17 16:50:50 +09:00
syuilo
c96418806f
Disable sql log 2019-04-17 16:45:31 +09:00
syuilo
7945eddef6
Clean up 2019-04-17 14:39:45 +09:00
syuilo
0ede390fef
Refactor 2019-04-17 14:32:59 +09:00
syuilo
85959a3b9b
Fix #4721 Fix #4722 2019-04-17 14:30:31 +09:00
syuilo
946c3a25b9
Clean up 2019-04-17 07:25:34 +09:00
syuilo
f9d697128a
Update schemas.ts 2019-04-17 04:32:04 +09:00
syuilo
532ef744f4
Merge branch 'develop' 2019-04-17 02:58:09 +09:00
syuilo
27a961814b
11.1.4 2019-04-17 02:57:48 +09:00
syuilo
5a5b65e9bf
Clean up 2019-04-17 02:57:36 +09:00
syuilo
96673ad610
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-04-17 02:51:19 +09:00
syuilo
a9025aea0d
Better response 2019-04-17 02:51:12 +09:00
syuilo
f38ab0b973
Update delete-file.ts 2019-04-17 02:37:37 +09:00
tamaina
150dac00cf Update stream.ja-JP.md (#4725) 2019-04-17 02:21:22 +09:00
syuilo
bcb1a9c5d3
Refactor 2019-04-17 02:19:49 +09:00
かひわし4（バージョン1）
2e55aea584 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
4f5a3f0df5
smallint 2019-04-17 02:12:15 +09:00
syuilo
e265b538cc
Fix #4724 2019-04-17 02:11:22 +09:00
MeiMei
b186504718 Metaのアクセスでトランザクションを張るように (#4720) 
* admin/instanceでmetaをキャッシュしないように

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

* use dialog instead of alert() etc
 2019-04-16 13:05:10 +09:00