b08a30a76b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:54:44 +01:00
5a103db716
upgrade lodash to 2.2.1
2013-11-02 09:52:48 +01:00
08498e37ac
[ #1718 ] don't 404 for group not found
2013-11-02 01:38:51 -07:00
8ae75e09c5
[ #1716 ] use ui-router to collapse challenge participants (WIP)
2013-11-01 23:46:14 -07:00
43eafb3cb7
[ #1711 ] refactored handling of group population
2013-11-01 22:45:26 -07:00
b512f16223
[ #1711 ] more limiting fields returned by party/guild queries
2013-11-01 22:45:26 -07:00
65b18f3af1
[ #1711 ] limit number of members that get sent down with group, limit profile
...
fields sent down
2013-11-01 19:27:08 -07:00
a143cf09f0
Merge pull request #1710 from HabitRPG/paglias/no-reloading
...
Paglias/no reloading
2013-11-01 17:07:03 -07:00
0638888e4b
make sure task._id == task.id (we should put this in pre(save) or something)
2013-11-01 13:38:46 -07:00
57116d949a
[ #1709 ] fix to 'user is not defined' (for whomever is using this route, not
...
us. we need to clean up our api)
2013-11-01 13:38:46 -07:00
fbbcecc6e2
[ #1708 ] fix to taskDefault when creating a task and scoring
2013-11-01 13:38:46 -07:00
f7dba5f323
avoid reloading for group operations
2013-11-01 21:08:36 +01:00
2f83ac27ae
[ #1702 ] much more thorough migration of tasks to new schema, providing defaults
...
where task attrs fail type checks
2013-11-01 10:43:24 -07:00
37027ac874
[ #1672 ] assign tasks.id = tasks._id for challenges, fixes html ids & for lables
2013-11-01 09:48:22 -07:00
cc5126f09b
challenges: 404 challenge not foudn on GET /challenge/:cid
2013-11-01 00:30:39 -07:00
751ae60342
[ #1701 ] don't sync chal scoring for broken chals
2013-10-31 20:37:56 -07:00
dfeae89a07
challenges: minimum 1 gem for public challenges
2013-10-31 19:30:07 -07:00
58fa97fb19
challenges: shortcode for tag names & task tooltips
2013-10-31 18:18:34 -07:00
0ce76ee689
[ #1673 ] challenges: better tag-syncing, show tag bull-horn
2013-10-31 17:49:51 -07:00
287beb363f
challenges: chal creator auto-joins
2013-10-31 16:50:22 -07:00
b3804c4d1f
[ #1675 ] fixes to populating Group.challenges, and display challenges in party
...
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
2013-10-31 16:20:48 -07:00
4afcd406f5
[ #1675 ] GET /challenges retrieves challenges in groups I belong to. As a result,
...
we need to be sure to manage adding/removing Group.challenges properly
2013-10-31 15:48:21 -07:00
14b5044fd7
[ #1695 ] add access control to update/deleting challenges
2013-10-31 15:32:30 -07:00
d8218927e5
add debug buttons back in, including +10 gems (@sabrecat)
2013-10-31 15:14:19 -07:00
238d796ec4
[ #1677 ] only set TASK_DELETED on tasks in current challenge (don't clobber other
...
challenges)
2013-10-31 14:52:24 -07:00
4a442d924e
challenge: small tweaks on descriptions
2013-10-31 14:16:01 -07:00
d5e78266e5
challenge prize: various fixes. Woo, challenge prizes work now!
...
@sabrecat @lemoness @wc8 (still some bugs & cleanup, but it's mostly there)
2013-10-31 14:06:18 -07:00
693061c77b
challenge prize: award winner 1 achievement and challenge.prize gems. then close challenge.
2013-10-31 13:57:12 -07:00
9d15e724e2
challenge prize: award winner 1 achievement and challenge.prize
...
gems. then close challenge.
2013-10-31 13:49:31 -07:00
35e6f40cb6
challenge gems: deduct gems from group.balance & user.balance on the server
2013-10-31 12:39:10 -07:00
13fa947c57
challenge prize: add to challenge creation form (including min/max validation)
2013-10-31 11:44:50 -07:00
8b1ef412b2
[ #1692 ] don't sync score to challenge's rewards
2013-10-31 10:22:57 -07:00
9daef15ce9
typo
2013-10-31 17:47:44 +01:00
70c630fcc9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-31 17:35:20 +01:00
904677e3a6
try to limit need to refresh after party operations, @lefnire this is only for parties and I got it working only for removeMember and leave party because I could not get join & create working
2013-10-31 17:35:04 +01:00
9e8cdac06f
[ #1676 ] show memberCount on challenges.list. will follow up on ticket for reasoning
2013-10-31 09:17:40 -07:00
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01:00
bbb4a9152b
[ #1674 ] don't sync challenge to user until after challenge is
...
saved (delete still not working)
2013-10-31 01:24:13 -07:00
a90f37f35c
more migration fixes, fix up metrics.js
2013-10-30 18:58:09 -07:00
4764bf738c
challenges: some more user cleanup in migration
2013-10-30 17:02:42 -07:00
d2c50dc02f
challenges: GET /groups now returns a merged array of groups, rather
...
than structured object of {public,guilds,party,tavern}. I was having
trouble with ngResource without doing this, @paglias let me know what
you think
2013-10-30 15:14:08 -07:00
28cdeb0ac6
challenges: fixed joining / leaving groups. Back to the old method of Group.query({type:'public'}), etc - since ngResource can only work with top-level objects. This approach is bad performance (two calls), I'll fix when I can think of a better way of organizing groups requested at GET /groups
2013-10-30 14:50:49 -07:00
e8d812fbe9
groups: safety-check on removeSelf
2013-10-30 11:18:31 -07:00
ea54f0aa75
challenges: implement basic filters on challenges tab
2013-10-30 01:21:44 -07:00
d116ac7b81
challenges: lots of misc. bug fixes
2013-10-29 22:30:58 -07:00
02ebc536ca
challenges: get Challenges (mostly) working along the same ui-router
...
principles as groups. Having some $scope variable resolution timing issues
2013-10-29 17:49:49 -07:00
77fee06fdb
gMerge branch 'challenges' into develop
...
Conflicts:
migrations/20131028_cleanup_deleted_tags.js
src/controllers/groups.js
views/options/groups/group.jade
views/options/profile.jade
2013-10-29 15:38:47 -07:00
d9d769a0e1
challenges: much better implemntation of ui-router for nested groups. No
...
need to specify fields or populate members at /groups - instead, provide
that functionality at /groups/:gid
2013-10-29 15:25:50 -07:00
be657a76e0
challenges: pass down if user is member of group (group._isMember) for
...
performance. some bug fixes
2013-10-29 12:26:13 -07:00
e07713d49c
typo
2013-10-29 18:03:11 +01:00
Matteo Pagliazzi