Compare commits

...

8 Commits
7.1.0 ... 7.1.2

Author SHA1 Message Date
3fb98e808f 7.1.2 2018-08-20 23:49:27 +09:00
2c9bacfcea Fix bug? 2018-08-20 23:49:00 +09:00
a542765cf8 Merge pull request #2352 from acid-chicken/patch-2
Update README.md
2018-08-20 07:45:35 +09:00
fd3f8d43db Merge pull request #2356 from acid-chicken/patch-3
Fix z-index
2018-08-20 07:44:57 +09:00
4f4496078a Update user.vue 2018-08-20 02:05:57 +09:00
8f4f5b4ce0 7.1.1 2018-08-20 01:42:56 +09:00
bdc6718ae5 Fix bug 2018-08-20 01:41:53 +09:00
09d1f1c20d Update README.md 2018-08-19 23:14:22 +09:00
5 changed files with 18 additions and 12 deletions

View File

@ -39,9 +39,15 @@ please see [Setup and installation guide](./docs/setup.en.md).
----------------------------------------------------------------
**[PR](https://github.com/syuilo/misskey/pulls)s welcome!**
If you want to...
* i18n ... please see [Translation guide](./docs/translate.en.md).
* l10n ... please visit https://crowdin.com/project/misskey
### i18n
Please see [Translation guide](./docs/translate.en.md).
### l10n
Misskey is using Crowdin for l10n.
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)](https://crowdin.com/project/misskey)
:heart: Backers & Sponsors
----------------------------------------------------------------

View File

@ -1,8 +1,8 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "7.1.0",
"clientVersion": "1.0.8685",
"version": "7.1.2",
"clientVersion": "1.0.8693",
"codename": "nighthike",
"main": "./built/index.js",
"private": true,

View File

@ -36,8 +36,7 @@ export default Vue.extend({
password: '',
token: '',
apiUrl,
host,
twitterIntegration
host
};
},
methods: {
@ -54,8 +53,9 @@ export default Vue.extend({
this.signing = true;
(this as any).api('signin', {
username: this.username,
password: this.password,
// password という名前(または username とのペア?)では何らかのフィルタリングがされるっぽい?
x: this.username,
y: this.password,
token: this.user && this.user.twoFactorEnabled ? this.token : undefined
}).then(() => {
location.reload();

View File

@ -247,7 +247,7 @@ root(isDark)
top 47px
box-shadow 0 4px 4px isDark ? rgba(#000, 0.3) : rgba(#000, 0.07)
background-color $bg
z-index 1
z-index 2
> .nav-container
display flex

View File

@ -12,8 +12,8 @@ export default async (ctx: Koa.Context) => {
ctx.set('Access-Control-Allow-Credentials', 'true');
const body = ctx.request.body as any;
const username = body['username'];
const password = body['password'];
const username = body['username'] || body['x'];
const password = body['password'] || body['y'];
const token = body['token'];
if (typeof username != 'string') {