Commit Graph

4530 Commits

Author SHA1 Message Date
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
syuilo
de3b3baa99 Merge pull request #1266 from syuilo/greenkeeper/webpack-cli-2.0.13
Update webpack-cli to the latest version 🚀
2018-03-23 02:14:04 +09:00
greenkeeper[bot]
b4e7df47b2 fix(package): update webpack-cli to version 2.0.13 2018-03-22 16:26:20 +00:00
greenkeeper[bot]
2b53044daf fix(package): update is-root to version 2.0.0 2018-03-22 15:26:46 +00:00
greenkeeper[bot]
be9d2c0e75 fix(package): update chai-http to version 4.0.0 2018-03-22 13:58:05 +00:00
greenkeeper[bot]
5bd340a0f5 fix(package): update eslint-plugin-vue to version 4.4.0 2018-03-22 05:51:21 +00:00
syuilo
5bf7c525ce Merge pull request #1262 from syuilo/greenkeeper/eslint-4.19.1
Update eslint to the latest version 🚀
2018-03-22 11:41:04 +09:00
greenkeeper[bot]
a4e19c8d06 fix(package): update eslint to version 4.19.1 2018-03-22 02:05:11 +00:00
syuilo
d29170f118 Merge pull request #1261 from syuilo/greenkeeper/pug-2.0.3
Update pug to the latest version 🚀
2018-03-21 21:13:27 +09:00
syuilo
0e558cb76d Merge pull request #1260 from syuilo/greenkeeper/webpack-4.2.0
Update webpack to the latest version 🚀
2018-03-21 21:13:13 +09:00
greenkeeper[bot]
6bc1b31eeb fix(package): update pug to version 2.0.3 2018-03-21 11:46:57 +00:00
greenkeeper[bot]
ad1c7b38d9 fix(package): update webpack to version 4.2.0 2018-03-21 09:43:05 +00:00
syuilo
9596525c05 Merge pull request #1259 from syuilo/greenkeeper/is-url-1.2.3
Update is-url to the latest version 🚀
2018-03-21 08:24:35 +09:00
greenkeeper[bot]
5b07f11d6e fix(package): update is-url to version 1.2.3 2018-03-20 23:22:05 +00:00
syuilo
54bf69f4b6 Merge pull request #1257 from syuilo/greenkeeper/pug-2.0.2
Update pug to the latest version 🚀
2018-03-20 23:58:59 +09:00
syuilo
f65b71e30b Merge pull request #1258 from syuilo/greenkeeper/license-checker-18.0.0
Update license-checker to the latest version 🚀
2018-03-20 21:51:34 +09:00