summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* #1294syuilo2018-03-289-8/+88
* Update README.mdsyuilo2018-03-281-1/+1
* Add watch commandsyuilo2018-03-281-0/+1
* Prepare new codenamesyuilo2018-03-288-15/+18
* Update dependencies :rocket:syuilo2018-03-281-23/+23
* Merge pull request #1318 from akihikodaki/remotesyuilo2018-03-2873-333/+734
|\
| * Implement remote account resolutionAkihiko Odaki2018-03-2773-333/+734
|/
* Merge pull request #1316 from akihikodaki/hostsyuilo2018-03-271-0/+6
|\
| * Describe host field of user entityAkihiko Odaki2018-03-271-0/+6
* | Merge pull request #1315 from akihikodaki/hostsyuilo2018-03-271-1/+1
|\|
| * Revert a change for AuthSess queryAkihiko Odaki2018-03-271-1/+1
* | Merge pull request #1314 from akihikodaki/hostsyuilo2018-03-273-0/+3
|\|
| * Add host_lower to UserAkihiko Odaki2018-03-273-0/+3
* | Update config.mdsyuilo2018-03-271-4/+1
* | しゅきsyuilo2018-03-271-1/+1
* | Bye bye subdomainssyuilo2018-03-278-74/+81
* | Merge pull request #1313 from akihikodaki/keysyuilo2018-03-2745-127/+127
|\ \
| * | Replace /:user endpoints with /@:userAkihiko Odaki2018-03-2745-127/+127
| |/
* / Update docssyuilo2018-03-272-57/+10
|/
* Bye bye secondary domainsyuilo2018-03-275-71/+2
* Merge pull request #1312 from syuilo/domainsyuilo2018-03-275-6/+8
|\
| * Destory api. subdomainsyuilo2018-03-275-6/+8
| * 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
|\