Merge branch 'develop' into party-chat-translations

This commit is contained in:
Mateus Etto
2018-03-12 22:35:13 +09:00
216 changed files with 5546 additions and 4694 deletions
+1 -2
View File
@@ -50,7 +50,7 @@ schema.plugin(baseModel, {
timestamps: true,
});
schema.pre('init', function ensureSummaryIsFetched (next, chal) {
schema.pre('init', function ensureSummaryIsFetched (chal) {
// The Vue website makes the summary be mandatory for all new challenges, but the
// Angular website did not, and the API does not yet for backwards-compatibilty.
// When any challenge without a summary is fetched from the database, this code
@@ -59,7 +59,6 @@ schema.pre('init', function ensureSummaryIsFetched (next, chal) {
if (!chal.summary) {
chal.summary = chal.name ? chal.name.substring(0, MAX_SUMMARY_SIZE_FOR_CHALLENGES) : ' ';
}
next();
});
// A list of additional fields that cannot be updated (but can be set on creation)
+1 -2
View File
@@ -140,7 +140,7 @@ schema.plugin(baseModel, {
},
});
schema.pre('init', function ensureSummaryIsFetched (next, group) {
schema.pre('init', function ensureSummaryIsFetched (group) {
// The Vue website makes the summary be mandatory for all new groups, but the
// Angular website did not, and the API does not yet for backwards-compatibilty.
// When any guild without a summary is fetched from the database, this code
@@ -151,7 +151,6 @@ schema.pre('init', function ensureSummaryIsFetched (next, group) {
if (!group.summary) {
group.summary = group.name ? group.name.substring(0, MAX_SUMMARY_SIZE_FOR_GUILDS) : ' ';
}
next();
});
// A list of additional fields that cannot be updated (but can be set on creation)
-2
View File
@@ -140,8 +140,6 @@ function _setUpNewUser (user) {
user.items.quests.dustbunnies = 1;
user.purchased.background.violet = true;
user.preferences.background = 'violet';
user.items.gear.owned.armor_special_birthday = true; // eslint-disable-line camelcase
user.items.gear.equipped.body = 'armor_special_birthday';
if (user.registeredThrough === 'habitica-web') {
taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];