From af095d8450d0c458faa31c84d205cbbb2cb1c059 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Sat, 2 Dec 2017 08:35:31 -0600 Subject: [PATCH 1/3] Revert query optimization (#9636) --- website/server/controllers/api-v3/tasks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js index 7bbb10948d..0d5fc7e4d9 100644 --- a/website/server/controllers/api-v3/tasks.js +++ b/website/server/controllers/api-v3/tasks.js @@ -262,7 +262,7 @@ api.createChallengeTasks = { api.getUserTasks = { method: 'GET', url: '/tasks/user', - middlewares: [authWithHeaders(false, '_id preferences tasksOrder')], + middlewares: [authWithHeaders()], async handler (req, res) { let types = Tasks.tasksTypes.map(type => `${type}s`); types.push('completedTodos', '_allCompletedTodos'); // _allCompletedTodos is currently in BETA and is likely to be removed in future @@ -517,7 +517,7 @@ api.updateTask = { api.scoreTask = { method: 'POST', url: '/tasks/:taskId/score/:direction', - middlewares: [authWithHeaders(false, '_id stats profile preferences tasksOrder _ABtests webhooks party guilds items flags')], + middlewares: [authWithHeaders()], async handler (req, res) { req.checkParams('direction', res.t('directionUpDown')).notEmpty().isIn(['up', 'down']); From 95f9479d7a9ea0253a53dc20fb7e10c5d29e2fbd Mon Sep 17 00:00:00 2001 From: thehollidayinn Date: Sat, 2 Dec 2017 08:37:36 -0600 Subject: [PATCH 2/3] 4.12.6 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 427474e3c7..919f63970f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.12.5", + "version": "4.12.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6019f568bd..daf346d261 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.12.5", + "version": "4.12.6", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", From 1fc84c2357792f258d895d283139548e8c0d9943 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Mon, 4 Dec 2017 11:24:04 -0600 Subject: [PATCH 3/3] Added calculated property (#9637) --- website/client/components/groups/group.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 4d145bc57f..f1da880bb7 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -186,7 +186,7 @@ @media (min-width: 1300px) { .standard-page { - max-width: 80%; + max-width: calc(100% - 430px); } .sidebar {