syuilo
|
8eebec30b8
|
Merge remote-tracking branch 'refs/remotes/origin/master' into domain
|
2018-03-27 12:35:01 +09:00 |
|
syuilo
|
d0d55f2b5e
|
Fix bug
|
2018-03-27 12:33:51 +09:00 |
|
syuilo
|
affaf07d3f
|
Merge remote-tracking branch 'refs/remotes/origin/master' into domain
|
2018-03-27 12:23:51 +09:00 |
|
syuilo
|
792b657a82
|
Merge pull request #1311 from akihikodaki/key
Fix keypair assignment in a migration script
|
2018-03-27 12:20:37 +09:00 |
|
Akihiko Odaki
|
629e19603e
|
Fix keypair assignment in a migration script
|
2018-03-27 12:18:22 +09:00 |
|
syuilo
|
9a56c9ad0f
|
Merge pull request #1309 from akihikodaki/key
Add host field to User
|
2018-03-27 12:03:48 +09:00 |
|
Akihiko Odaki
|
396bb5821e
|
Add host field to User
|
2018-03-27 12:02:43 +09:00 |
|
syuilo
|
27183b2142
|
Merge branch 'master' of https://github.com/syuilo/misskey
|
2018-03-27 11:47:17 +09:00 |
|
syuilo
|
c051779d34
|
Refactor
|
2018-03-27 11:47:13 +09:00 |
|
syuilo
|
4189ffd5e4
|
Merge pull request #1304 from rinsuki/features/implement-media-video
Implement mk-media-video
|
2018-03-27 04:43:18 +09:00 |
|
syuilo
|
7ee39a2f17
|
Merge pull request #1303 from akihikodaki/key
Add keypair to local account
|
2018-03-27 04:42:08 +09:00 |
|
Akihiko Odaki
|
001d5faac9
|
Add keypair to local account
|
2018-03-27 00:26:25 +09:00 |
|
rinsuki
|
6d69b0d271
|
mobile version of media-video
|
2018-03-26 22:04:34 +09:00 |
|
rinsuki
|
b1f8fe7752
|
implement mk-media-video
|
2018-03-26 21:54:38 +09:00 |
|
syuilo
|
7b0f93464a
|
Merge branch 'master' of https://github.com/syuilo/misskey
|
2018-03-26 17:54:13 +09:00 |
|
syuilo
|
4c0a341ccf
|
Implement packForAp
|
2018-03-26 17:54:10 +09:00 |
|
syuilo
|
e9038f8ec9
|
Merge pull request #1300 from rinsuki/i18n/mobile.tags.mk-user-timeline.load-more
add mobile.tags.mk-user-timeline.load-more translation
|
2018-03-26 17:34:48 +09:00 |
|
rinsuki
|
8eab25f22c
|
add mobile.tags.mk-user-timeline.load-more translation
|
2018-03-26 17:33:29 +09:00 |
|
syuilo
|
e6af2ebe0c
|
Merge pull request #1299 from rinsuki/features/media-list-grid-js-to-css
media-listのgridの処理をJSからCSSに移行
|
2018-03-26 17:28:20 +09:00 |
|
rinsuki
|
1696c50c86
|
media-listのgridの処理をJSからCSSに移行
|
2018-03-26 17:26:21 +09:00 |
|
syuilo
|
e2ad98de82
|
Merge pull request #1298 from rinsuki/features/mk-media
mk-images -> mk-media-list, mk-images-image -> mk-media-image
|
2018-03-26 17:04:40 +09:00 |
|
rinsuki
|
4d25db59a9
|
:mediaList -> :media-list
|
2018-03-26 17:03:20 +09:00 |
|
rinsuki
|
2dba24d0da
|
mk-images -> mk-media-list, mk-images-image -> mk-media-image
|
2018-03-26 16:56:46 +09:00 |
|
syuilo
|
6417c3b780
|
Merge pull request #1297 from rinsuki/fix/1296-broken
#1296 で壊してしまったのを直した
|
2018-03-26 16:22:35 +09:00 |
|
rinsuki
|
ff8b8df075
|
#1296 で壊してしまったのを直した
|
2018-03-26 16:22:00 +09:00 |
|
syuilo
|
d230503913
|
Merge pull request #1296 from rinsuki/features/revived-twitter-login-link-on-desktop
デスクトップ版にTwitterでログインするリンクを復活させた
|
2018-03-26 16:19:08 +09:00 |
|
rinsuki
|
7676b86617
|
デスクトップ版にTwitterでログインするリンクを復活させた
|
2018-03-26 16:18:40 +09:00 |
|
syuilo
|
8bdb074b5d
|
Merge pull request #1295 from rinsuki/features/user-tab-position-sticky
モバイル版のユーザーページの表示切り変えnavを上についてくるように
|
2018-03-26 16:11:04 +09:00 |
|
rinsuki
|
fd0e63c12e
|
モバイル版のユーザーページの表示切り変えnavを上についてくるように
|
2018-03-26 15:56:31 +09:00 |
|
syuilo
|
8d7d200eff
|
Merge pull request #1287 from akihikodaki/account
Introduce account document to user document
|
2018-03-26 14:51:03 +09:00 |
|
syuilo
|
c48a33c996
|
Merge pull request #1293 from rinsuki/fix/using-hostname-insteadof-host
document.domainをチェックする際に、hostのかわりにhostnameを使うように
|
2018-03-26 14:32:22 +09:00 |
|
rinsuki
|
8d6356c565
|
document.domainをチェックする際に、hostのかわりにhostnameを使うように
|
2018-03-26 14:27:42 +09:00 |
|
syuilo
|
ca78cbc7eb
|
Merge pull request #1292 from akihikodaki/config
Define hostname and secondary_hostname in config
|
2018-03-26 14:15:19 +09:00 |
|
Akihiko Odaki
|
5db00e8179
|
Define hostname and secondary_hostname in config
This is missing part of commit 0109e0811c.
|
2018-03-26 14:12:14 +09:00 |
|
Akihiko Odaki
|
19b9cb105d
|
Introduce account document to user document
An account document is attached to a user document if an account of the
user is on the server. It may be missing if the user is on a remote server.
|
2018-03-26 14:07:16 +09:00 |
|
syuilo
|
7a347c1881
|
Merge pull request #1291 from rinsuki/fix/using-whatwg-url-api
using WHATWG URL API
|
2018-03-26 13:58:50 +09:00 |
|
rinsuki
|
4c9bcf2ab4
|
using WHATWG URL API
|
2018-03-26 13:57:28 +09:00 |
|
syuilo
|
13e80bb53b
|
Merge pull request #1290 from akihikodaki/cookie
Specify Cookie domain with hostname
|
2018-03-26 13:22:38 +09:00 |
|
Akihiko Odaki
|
0109e0811c
|
Specify Cookie domain with hostname
|
2018-03-26 13:21:41 +09:00 |
|
syuilo
|
a23790a1e8
|
Merge pull request #1286 from akihikodaki/master
Allow to use domain whose prefix is not misskey
|
2018-03-25 23:12:29 +09:00 |
|
Akihiko Odaki
|
a633f184ab
|
Allow to use domain whose prefix is not misskey
|
2018-03-25 23:10:31 +09:00 |
|
syuilo
|
687cd56cc1
|
Merge pull request #1284 from akihikodaki/master
Pass hostname instead of host to vhost module
|
2018-03-25 22:51:45 +09:00 |
|
Akihiko Odaki
|
dc351ef396
|
Pass hostname instead of host to vhost module
|
2018-03-25 22:49:30 +09:00 |
|
syuilo
|
8047512906
|
Merge pull request #1283 from akihikodaki/master
Fix the order of setup procedure
|
2018-03-25 20:24:38 +09:00 |
|
Akihiko Odaki
|
97c6dd6fe3
|
Fix the order of setup procedure
|
2018-03-25 20:21:00 +09:00 |
|
syuilo
|
94f3367cf8
|
Update DONORS.md
|
2018-03-24 15:35:14 +09:00 |
|
syuilo
|
56af1278a4
|
Update donate.ja.md
|
2018-03-24 05:09:30 +09:00 |
|
syuilo
|
609b59c6ff
|
Create donate.ja.md
|
2018-03-24 05:06:13 +09:00 |
|
syuilo
|
b85e2f9a7b
|
Merge pull request #1264 from syuilo/greenkeeper/chai-http-4.0.0
Update chai-http to the latest version 🚀
|
2018-03-23 02:15:11 +09:00 |
|
syuilo
|
857fcb8914
|
Merge pull request #1263 from syuilo/greenkeeper/eslint-plugin-vue-4.4.0
Update eslint-plugin-vue to the latest version 🚀
|
2018-03-23 02:15:03 +09:00 |
|