limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-16 06:57:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
4745 commits 22 branches 21 tags 1.6 GiB
Commit graph

4745 commits

This branch
This branch
All branches
Author SHA1 Message Date
syuilo
f06e5d1c61 Fix bug 2018-03-27 12:33:51 +09:00
syuilo
f8dbc52fcd Merge remote-tracking branch 'refs/remotes/origin/master' into domain 2018-03-27 12:23:51 +09:00
syuilo
e7b2eec23a Merge pull request #1311 from akihikodaki/key 
Fix keypair assignment in a migration script
 2018-03-27 12:20:37 +09:00
Akihiko Odaki
3eb659b649 Fix keypair assignment in a migration script 2018-03-27 12:18:22 +09:00
syuilo
ce50b3a8a3 Merge pull request #1309 from akihikodaki/key 
Add host field to User
 2018-03-27 12:03:48 +09:00
Akihiko Odaki
27ca691543 Add host field to User 2018-03-27 12:02:43 +09:00
syuilo
8f2ca781bb Merge branch 'master' of https://github.com/syuilo/misskey 2018-03-27 11:47:17 +09:00
syuilo
ad515f1cba Refactor 2018-03-27 11:47:13 +09:00
syuilo
ff5ae26f1a Merge pull request #1304 from rinsuki/features/implement-media-video 
Implement mk-media-video
 2018-03-27 04:43:18 +09:00
syuilo
9bc9fa336e Merge pull request #1303 from akihikodaki/key 
Add keypair to local account
 2018-03-27 04:42:08 +09:00
Akihiko Odaki
bfe6fc9ebb Add keypair to local account 2018-03-27 00:26:25 +09:00
rinsuki
677a213208 mobile version of media-video 2018-03-26 22:04:34 +09:00
rinsuki
61e9bdba52 implement mk-media-video 2018-03-26 21:54:38 +09:00
syuilo
c18dafae7d Merge branch 'master' of https://github.com/syuilo/misskey 2018-03-26 17:54:13 +09:00
syuilo
dfdb5647a1 Implement packForAp 2018-03-26 17:54:10 +09:00
syuilo
f13f71cb65 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
abb386141b add mobile.tags.mk-user-timeline.load-more translation 2018-03-26 17:33:29 +09:00
syuilo
afaf1664c1 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
abbb03f1e8 media-listのgridの処理をJSからCSSに移行 2018-03-26 17:26:21 +09:00
syuilo
73839d68bc 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
0b91abc8dd :mediaList -> :media-list 2018-03-26 17:03:20 +09:00
rinsuki
ec9c693d8c mk-images -> mk-media-list, mk-images-image -> mk-media-image 2018-03-26 16:56:46 +09:00
syuilo
2eb9e6ed6f Merge pull request #1297 from rinsuki/fix/1296-broken 
#1296 で壊してしまったのを直した
 2018-03-26 16:22:35 +09:00
rinsuki
6dd71c2770 #1296 で壊してしまったのを直した 2018-03-26 16:22:00 +09:00
syuilo
3170a5b75b Merge pull request #1296 from rinsuki/features/revived-twitter-login-link-on-desktop 
デスクトップ版にTwitterでログインするリンクを復活させた
 2018-03-26 16:19:08 +09:00
rinsuki
c0ea6939e3 デスクトップ版にTwitterでログインするリンクを復活させた 2018-03-26 16:18:40 +09:00
syuilo
e049e51c40 Merge pull request #1295 from rinsuki/features/user-tab-position-sticky 
モバイル版のユーザーページの表示切り変えnavを上についてくるように
 2018-03-26 16:11:04 +09:00
rinsuki
9648cca8e9 モバイル版のユーザーページの表示切り変えnavを上についてくるように 2018-03-26 15:56:31 +09:00
syuilo
bc00ae4620 Merge pull request #1287 from akihikodaki/account 
Introduce account document to user document
 2018-03-26 14:51:03 +09:00
syuilo
0d4446373d Merge pull request #1293 from rinsuki/fix/using-hostname-insteadof-host 
document.domainをチェックする際に、hostのかわりにhostnameを使うように
 2018-03-26 14:32:22 +09:00
rinsuki
ab6fa2fb8b document.domainをチェックする際に、hostのかわりにhostnameを使うように 2018-03-26 14:27:42 +09:00
syuilo
e5af8bb62c Merge pull request #1292 from akihikodaki/config 
Define hostname and secondary_hostname in config
 2018-03-26 14:15:19 +09:00
Akihiko Odaki
dff27ab5b7 Define hostname and secondary_hostname in config 
This is missing part of commit 0109e0811c4142153ae3f915295e62630653909e.
 2018-03-26 14:12:14 +09:00
Akihiko Odaki
0b12d87896 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
1c29b17067 Merge pull request #1291 from rinsuki/fix/using-whatwg-url-api 
using WHATWG URL API
 2018-03-26 13:58:50 +09:00
rinsuki
d2a85aebe9 using WHATWG URL API 2018-03-26 13:57:28 +09:00
syuilo
4da6968f15 Merge pull request #1290 from akihikodaki/cookie 
Specify Cookie domain with hostname
 2018-03-26 13:22:38 +09:00
Akihiko Odaki
b397fe1c2e Specify Cookie domain with hostname 2018-03-26 13:21:41 +09:00
syuilo
d3da1a95fb 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
d8e754acbe Allow to use domain whose prefix is not misskey 2018-03-25 23:10:31 +09:00
syuilo
d6a1b91aaa 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
a0c778f5c9 Pass hostname instead of host to vhost module 2018-03-25 22:49:30 +09:00
syuilo
385126dd68 Merge pull request #1283 from akihikodaki/master 
Fix the order of setup procedure
 2018-03-25 20:24:38 +09:00
Akihiko Odaki
397792cd53 Fix the order of setup procedure 2018-03-25 20:21:00 +09:00
syuilo
9b9668311b Update DONORS.md 2018-03-24 15:35:14 +09:00
syuilo
d294924d85 Update donate.ja.md 2018-03-24 05:09:30 +09:00
syuilo
8ee957a032 Create donate.ja.md 2018-03-24 05:06:13 +09:00
syuilo
1558f644e2 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
7cb2286b2f 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
syuilo
36cf0825a6 Merge pull request #1265 from syuilo/greenkeeper/is-root-2.0.0 
Update is-root to the latest version 🚀
 2018-03-23 02:14:51 +09:00