summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/origin/master' into domainsyuilo2018-03-271-9/+34
|\
| * Fix bugsyuilo2018-03-271-9/+34
* | Merge remote-tracking branch 'refs/remotes/origin/master' into domainsyuilo2018-03-274-3/+4
|\|
| * Merge pull request #1311 from akihikodaki/keysyuilo2018-03-271-3/+1
| |\
| | * Fix keypair assignment in a migration scriptAkihiko Odaki2018-03-271-3/+1
| * | Merge pull request #1309 from akihikodaki/keysyuilo2018-03-273-0/+3
|/| | | |/
| * Add host field to UserAkihiko Odaki2018-03-273-0/+3
* | Merge branch 'master' of https://github.com/syuilo/misskeysyuilo2018-03-2716-1/+325
|\ \
| * \ Merge pull request #1304 from rinsuki/features/implement-media-videosyuilo2018-03-276-1/+179
| |\ \
| | * | mobile version of media-videorinsuki2018-03-262-0/+38
| | * | implement mk-media-videorinsuki2018-03-264-1/+141
| * | | Merge pull request #1303 from akihikodaki/keysyuilo2018-03-2710-0/+146
| |\ \ \ | | |/ / | |/| / | | |/
| | * Add keypair to local accountAkihiko Odaki2018-03-2710-0/+146
| |/
* / Refactorsyuilo2018-03-271-6/+8
|/
* Merge branch 'master' of https://github.com/syuilo/misskeysyuilo2018-03-2617-86/+81
|\
| * Merge pull request #1300 from rinsuki/i18n/mobile.tags.mk-user-timeline.load-...syuilo2018-03-262-0/+2
| |\
| | * add mobile.tags.mk-user-timeline.load-more translationrinsuki2018-03-262-0/+2
| * | Merge pull request #1299 from rinsuki/features/media-list-grid-js-to-csssyuilo2018-03-261-42/+35
| |\ \ | | |/ | |/|
| | * media-listのgridの処理をJSからCSSに移行rinsuki2018-03-261-42/+35
| |/
| * Merge pull request #1298 from rinsuki/features/mk-mediasyuilo2018-03-2614-32/+32
| |\
| | * :mediaList -> :media-listrinsuki2018-03-267-7/+7
| | * mk-images -> mk-media-list, mk-images-image -> mk-media-imagerinsuki2018-03-2614-32/+32
| |/
* / Implement packForApsyuilo2018-03-261-0/+51
|/
* Merge pull request #1297 from rinsuki/fix/1296-brokensyuilo2018-03-261-1/+1
|\
| * #1296 で壊してしまったのを直したrinsuki2018-03-261-1/+1
|/
* Merge pull request #1296 from rinsuki/features/revived-twitter-login-link-on-...syuilo2018-03-261-2/+5
|\
| * デスクトップ版にTwitterでログインするリンクを復活させたrinsuki2018-03-261-2/+5
|/
* Merge pull request #1295 from rinsuki/features/user-tab-position-stickysyuilo2018-03-261-5/+12
|\
| * モバイル版のユーザーページの表示切り変えnavを上につ...rinsuki2018-03-261-5/+12
* | Merge pull request #1287 from akihikodaki/accountsyuilo2018-03-2670-279/+354
|\ \
| * | Introduce account document to user documentAkihiko Odaki2018-03-2670-279/+354
* | | Merge pull request #1293 from rinsuki/fix/using-hostname-insteadof-hostsyuilo2018-03-261-3/+3
|\ \ \ | | |/ | |/|
| * | document.domainをチェックする際に、hostのかわりにhostnameを...rinsuki2018-03-261-3/+3
|/ /
* | Merge pull request #1292 from akihikodaki/configsyuilo2018-03-262-10/+8
|\ \
| * | Define hostname and secondary_hostname in configAkihiko Odaki2018-03-262-10/+8
|/ /
* | Merge pull request #1291 from rinsuki/fix/using-whatwg-url-apisyuilo2018-03-261-2/+4
|\ \
| * | using WHATWG URL APIrinsuki2018-03-261-2/+4
|/ /
* | Merge pull request #1290 from akihikodaki/cookiesyuilo2018-03-264-3/+6
|\ \
| * | Specify Cookie domain with hostnameAkihiko Odaki2018-03-264-3/+6
|/ /
* | Merge pull request #1286 from akihikodaki/mastersyuilo2018-03-252-3/+2
|\|
| * Allow to use domain whose prefix is not misskeyAkihiko Odaki2018-03-252-3/+2
* | Merge pull request #1284 from akihikodaki/mastersyuilo2018-03-251-3/+10
|\|
| * Pass hostname instead of host to vhost moduleAkihiko Odaki2018-03-251-3/+10
* | Merge pull request #1283 from akihikodaki/mastersyuilo2018-03-254-17/+682
|\|
| * Fix the order of setup procedureAkihiko Odaki2018-03-254-17/+682
|/
* Update DONORS.mdsyuilo2018-03-241-0/+1
* Update donate.ja.mdsyuilo2018-03-241-0/+2
* Create donate.ja.mdsyuilo2018-03-241-0/+24
* Merge pull request #1264 from syuilo/greenkeeper/chai-http-4.0.0syuilo2018-03-231-1/+1
|\
| * fix(package): update chai-http to version 4.0.0greenkeeper[bot]2018-03-221-1/+1