Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,371 Commits 64 Branches 1,256 Tags
fa0813dc9e4093445fa77a70e5fa72f296ba84cd
Commit Graph

759 Commits

Author SHA1 Message Date
Tyler Renelle fa0813dc9e challenges: use tags fix (268157c) to allow guild info editing (not 
working for _party for some reason)
 2013-05-31 17:53:17 -04:00
Tyler Renelle fd7ae42a43 Merge branch 'develop' into challenges 
Conflicts:
	views/app/filters.html
	views/app/tasks.html
 2013-05-31 17:18:26 -04:00
Tyler Renelle 268157ca24 tags: use explicit {#each users[_userId].tags} instead of model.ref private path {#each _user.tags}. fixed many tags issues. see https://github.com/codeparty/derby/issues/267 2013-05-31 16:25:59 -04:00
Tyler Renelle 39d29f50f4 challenge: don't allow to create new challenge unless in group 2013-05-31 09:36:00 -04:00
Tyler Renelle 1411d04518 challenges: add basic task stats for challenge subscribers 2013-05-31 09:35:50 -04:00
Tyler Renelle 6e67207835 groups: fix leave button 2013-05-30 18:42:27 -04:00
Tyler Renelle 91c5331a28 challenges: couple bug fixes 2013-05-30 08:41:07 +01:00
Tyler Renelle 9ec369ea7a challenges: add in challenge prize, just for show-purposes for now 2013-05-29 23:40:13 +01:00
Tyler Renelle ea8f245b84 challenges: edit challenge title & description 2013-05-29 23:33:47 +01:00
Tyler Renelle 64a99e734f challenges: use bootstrap accordiong, much cleaner 2013-05-29 23:18:44 +01:00
Tyler Renelle 8ad2bf5687 groups: don't show websites twice when editing 2013-05-29 22:55:20 +01:00
Tyler Renelle a213d6e997 groups: accordion information on left side, more edit options for 
group information
 2013-05-29 22:47:07 +01:00
Tyler Renelle 88ff245aec challenges: add taskInChallenge() view helper and broken task.challenge link 2013-05-29 20:53:57 +01:00
Tyler Renelle cce03c8312 guilds: prettier group-creation 2013-05-29 18:19:38 +01:00
Tyler Renelle bd18667420 convert task-editing state to private path so we don't have 
conflicting ids
 2013-05-28 16:43:16 +01:00
Tyler Renelle 21b6cd952d challenges: guild listings in tabs, just like guilds-groups 2013-05-28 12:47:41 +01:00
Tyler Renelle 12fccbc99d challenges: move challenge-creation to their respective tabs, instead of separate "create" tab 2013-05-28 12:42:42 +01:00
Tyler Renelle 21a6ea19f5 challenges: remove "mine" challenges tab 2013-05-28 11:59:09 +01:00
Tyler Renelle 2fbff2a0bc challenges: lock down editing capabilities on certain task properties, 
instead showing the challenge's properties (in case they change
challenge-side).This includes editing the tag name
 2013-05-28 11:52:32 +01:00
Tyler Renelle 2666ebb1fc guilds: generic handling of invitations (incl. accept, reject, invite, etc) 2013-05-28 00:48:35 +01:00
Tyler Renelle e9eb509682 challenges: generalized listings for groups/parties/public 2013-05-27 21:14:04 +01:00
Tyler Renelle 1a0d9772a7 Merge branch 'develop' into challenges 2013-05-27 18:54:51 +01:00
Tyler Renelle 89160919f4 achievements: add "Helped Habit Grow" badge, including bailey notify 2013-05-27 16:10:55 +01:00
Tyler Renelle d3dd20cdf8 guilds: allow clicking guild-members for stats. needed to include 
_membersArray in model ref
 2013-05-26 22:36:30 +01:00
Tyler Renelle d4275867cc guilds: html & store.coffee bug fixes 2013-05-26 22:26:25 +01:00
Tyler Renelle ff35cbf1e7 guilds: generalize more groups stuff, creation invitation leaving, 
etc. also fixes party invite bugs
 2013-05-26 21:32:21 +01:00
Tyler Renelle 0f8dbd044e guilds: got all groups html generalized (using same party html as 
tavern, will add guilds soon)
 2013-05-26 20:21:07 +01:00
Tyler Renelle e32ee04baa guilds: bug fix on _tavern => _habitRPG 2013-05-26 15:38:49 +01:00
Tyler Renelle 9dfdb52c98 challenges: rename party.html to groups.html 2013-05-26 15:33:01 +01:00
Tyler Renelle 35049f7752 Merge branch 'develop' into challenges-tmp 
Conflicts:
	src/app/helpers.coffee
	src/app/index.coffee
 2013-05-26 15:29:59 +01:00
Tyler Renelle 079e7eb30f challenges: fix up htmls to use new party-member subscription methods 2013-05-26 15:09:41 +01:00
Tyler Renelle a141a02000 add bailey for habitrpg-shared 2013-05-25 19:01:43 +01:00
Tyler Renelle 258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle ff2fedda48 add ability to restore lost streaks, also add int() view helper 
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
 2013-05-21 14:33:31 +01:00
Slappybag d870325169 Margin on Buttons for #996 & 128eb8a 2013-05-20 09:59:36 +01:00
Tyler Renelle 128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 2013-05-19 20:43:48 +01:00
Tyler Renelle ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle e7558139e6 challenges: require challenge title, when user subscribe add new tag of challenge name. unsubscribe deletes tasks 2013-05-18 00:09:52 +01:00
Tyler Renelle 9b41712ca6 challenges: fix to not apply user's active tags to new challenge 
tasks, but also not apply filters except to main user's list
 2013-05-17 23:32:24 +01:00
Tyler Renelle 6507795d99 challenges: prevent some task options (such as scoring, check-marking, 
tags, etc) for challenge edits
 2013-05-17 20:59:29 +01:00
Tyler Renelle 0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn 2013-05-17 14:06:27 +01:00
Tyler Renelle ae8a283d0e challenges: chevron in collapsing title 2013-05-17 14:06:27 +01:00
Tyler Renelle 57f51048a1 challenges: basics for challenge subscription 2013-05-17 14:06:27 +01:00
Tyler Renelle b8ef0789df challneges: semi-functional challenge creation for parties 2013-05-17 14:06:27 +01:00
Tyler Renelle 5ea6e55e11 challenges: add assignTo option on challenge-creation 2013-05-17 14:06:27 +01:00
Tyler Renelle d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird 2013-05-17 14:06:27 +01:00
Tyler Renelle 0a37637daf challenges: fix up lists to use new list templates 2013-05-17 14:06:26 +01:00
Tyler Renelle 836787906d bstart building challenges 2013-05-17 14:06:26 +01:00
Tyler Renelle 92e8e5b597 done trying to futz with user-menu css for maintaining visibility when 
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
 2013-05-17 12:09:43 +01:00