02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
a78297f129
update chat if necessary after new message posted or deleted
2013-11-08 17:03:10 +01:00
4454cc502b
contrib: only show contrib alert if they've gained, not lost
2013-11-07 14:22:56 -08:00
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
f61c35975a
contrib: award profile Dragon-Hydra if admin sets level >= 6
2013-11-06 17:47:00 -08:00
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
3b18c322bc
return whole group.chat after chat message is sent
2013-11-06 21:27:24 +01:00
5ebab59780
return 204 on group.update
2013-11-06 21:19:23 +01:00
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
0d6d20b939
[ #1740 ] temp workaround to chat duplication
2013-11-03 23:39:09 -08:00
c9776b8857
fix to deleting chat message
2013-11-03 23:30:09 -08:00
8a9059aabf
[ #1723 ] send down pets array for clicked members for now (we'll eventually want to just
...
send count(items.pets) for better performance)
2013-11-02 16:22:42 -07:00
f784e2a0d2
remove blank line
2013-11-02 15:55:28 +01:00
567b69a0f1
fix #1669
2013-11-02 15:54:10 +01:00
3fa023452f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:56:32 +01:00
0a6eefe5c1
[ #1718 ] order of operations on group check. (false && false || true) ==
...
true... am I just a n00b?
2013-11-02 01:54:54 -07:00
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
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
f7dba5f323
avoid reloading for group operations
2013-11-01 21:08:36 +01: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
13fa947c57
challenge prize: add to challenge creation form (including min/max validation)
2013-10-31 11:44:50 -07:00
9daef15ce9
typo
2013-10-31 17:47:44 +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
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01: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
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
fd952701db
groups, list users invited with ability to remove their invitation, @lefnire i used group.invites from Group Schema which was already defined but not used by anything, fix #1523
2013-10-29 18:01:01 +01:00
6af71f0e44
better group invite handling
2013-10-29 16:50:28 +01:00
219318b405
challenges: remove username(), since we're now using user.profile.name
2013-10-28 18:20:21 -07:00
c5671550f1
challenges: add group.memberCount and ability to specifiy field projections in GET request /api/v1/groups?type=guild&fields=name,description,chat
2013-10-28 18:20:02 -07:00
36229ac44c
port assign group leader
2013-10-28 22:21:18 +01:00
fa25f3d300
challenges: WIP beginning challenges feature. some basic CRUD & some
...
basic subscribe / unsubscribe functional (but buggy)
2013-10-28 11:34:07 -07:00
34fedca239
always use removeSelf only for parties
2013-10-28 18:08:21 +01:00
c444feb29c
removeMember return whole group
2013-10-28 17:18:15 +01:00
23c3bcfa32
add ability to group leader to remove members, fix #1639
2013-10-28 17:10:29 +01:00
e8173a4962
remove need to refresh after having accepted party invite
2013-10-28 16:21:53 +01:00
24f3ba7b5c
fix for gems not removed after guild creation, fix #1186
2013-10-27 13:03:03 +01:00
Matteo Pagliazzi