mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 12:02:13 +00:00
Merge branch 'develop' of github.com:lefnire/habitrpg into backer-gear
This commit is contained in:
commit
8137e4b2a6
2 changed files with 6 additions and 2 deletions
|
|
@ -23,10 +23,14 @@ module.exports.app = (appExports, model) ->
|
|||
tags = user.get('tags')
|
||||
tagId = $(el).attr('data-tag-id')
|
||||
model.del "_user.filters.#{tagId}"
|
||||
#TODO remove tag from each task
|
||||
_.each tags, (tag, i) ->
|
||||
if tag.id is tagId
|
||||
tags.splice(i,1)
|
||||
model.del "_user.filters.#{tag.id}"
|
||||
|
||||
# remove tag from all tasks
|
||||
_.each user.get("tasks"), (task) ->
|
||||
user.del "tasks.#{task.id}.tags.#{tagId}"
|
||||
|
||||
model.set "_user.tags", tags , -> browser.resetDom(model)
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@
|
|||
<span class='label'>Contributor</span>
|
||||
{{/}}
|
||||
</h5>
|
||||
<small>Has contributed to HabitRPG (code, design, pixel art, legal advice, etc)</small>
|
||||
<small>Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)</small>
|
||||
</app:avatar:achievement>
|
||||
|
||||
<app:avatar:achievement unlocked={{@profile.backer.tier}} classes='achievement-heart' unlockable=false profile={{@profile}}>
|
||||
|
|
|
|||
Loading…
Reference in a new issue