krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Blade Barringer
2015-12-29 08:07:04 -06:00
parent bce049a316 f3ae42e49a
commit ae9ec63229
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/script/index.js
View File

@@ -126,7 +126,7 @@ preenHistory = function(history) {
*/ */
api.preenTodos = function(tasks) { api.preenTodos = function(tasks) {
return _.where(tasks, function(t) { return _.filter(tasks, function(t) {
return !t.completed || (t.challenge && t.challenge.id) || moment(t.dateCompleted).isAfter(moment().subtract({ return !t.completed || (t.challenge && t.challenge.id) || moment(t.dateCompleted).isAfter(moment().subtract({
days: 3 days: 3
})); }));

2
common/script/src/content/helpers.js
View File

@@ -1,4 +1,4 @@
import {each, defaults, assign, capitalize, camelCase} from 'lodash'; import { each, defaults, assign, capitalize, camelCase } from 'lodash';
import i18n from '../i18n'; import i18n from '../i18n';

3
test/content/gear.js
View File

@@ -1,8 +1,7 @@
import { import {
expectValidTranslationString, expectValidTranslationString,
} from '../helpers/content.helper'; } from '../helpers/content.helper';
import { each } from 'lodash'; import { each, camelCase } from 'lodash';
import camelCase from 'lodash.camelcase';
import { tree as allGear } from '../../common/script/content/gear'; import { tree as allGear } from '../../common/script/content/gear';
import backerGear from '../../common/script/content/gear/sets/special/special-backer'; import backerGear from '../../common/script/content/gear/sets/special/special-backer';