Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,102 Commits 64 Branches 1,256 Tags
9daef15ce97b0586d589bc1e68e6dbdc47f44106
Commit Graph

55 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9daef15ce9 typo 2013-10-31 17:47:44 +01:00
Matteo Pagliazzi 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
Matteo Pagliazzi fc10e9d6e6 move party.removeSelf to client side 2013-10-31 15:41:22 +01:00
Tyler Renelle 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
Tyler Renelle 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
Tyler Renelle e8d812fbe9 groups: safety-check on removeSelf 2013-10-30 11:18:31 -07:00
Tyler Renelle 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
Tyler Renelle 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
Tyler Renelle 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
Tyler Renelle 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
Matteo Pagliazzi e07713d49c typo 2013-10-29 18:03:11 +01:00
Matteo Pagliazzi 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
Matteo Pagliazzi 6af71f0e44 better group invite handling 2013-10-29 16:50:28 +01:00
Tyler Renelle 219318b405 challenges: remove username(), since we're now using user.profile.name 2013-10-28 18:20:21 -07:00
Tyler Renelle 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
Matteo Pagliazzi 36229ac44c port assign group leader 2013-10-28 22:21:18 +01:00
Tyler Renelle fa25f3d300 challenges: WIP beginning challenges feature. some basic CRUD & some 
basic subscribe / unsubscribe functional (but buggy)
 2013-10-28 11:34:07 -07:00
Matteo Pagliazzi 34fedca239 always use removeSelf only for parties 2013-10-28 18:08:21 +01:00
Matteo Pagliazzi c444feb29c removeMember return whole group 2013-10-28 17:18:15 +01:00
Matteo Pagliazzi 23c3bcfa32 add ability to group leader to remove members, fix #1639 2013-10-28 17:10:29 +01:00
Matteo Pagliazzi e8173a4962 remove need to refresh after having accepted party invite 2013-10-28 16:21:53 +01:00
Matteo Pagliazzi 24f3ba7b5c fix for gems not removed after guild creation, fix #1186 2013-10-27 13:03:03 +01:00
Matteo Pagliazzi 29f5eb5293 remove self from group after sending invite, fix #1509 2013-10-24 21:38:25 +02:00
Matteo Pagliazzi 3a45e72138 fix group chat syncing 2013-10-24 14:44:08 +02:00
Tyler Renelle 9ec3c4aaed fix so admins can delete chat msgs 2013-09-18 09:06:51 -04:00
Tyler Renelle 2f8c9fea78 [#1516] fixes to handling user.invitations.guilds - both accept & reject 2013-09-11 17:16:23 -04:00
Matteo Pagliazzi 48c078a6ea various fixed 2013-09-11 20:08:53 +02:00
Matteo Pagliazzi 46363785c8 rever to query 2013-09-11 16:51:39 +02:00
Matteo Pagliazzi 9966d06c5a use slice 2013-09-11 16:47:57 +02:00
Matteo Pagliazzi 8e377d7343 fix various guilds issues 2013-09-11 16:28:14 +02:00
Tyler Renelle 20354c7d8a member-since and last-logged-in 2013-09-09 19:04:46 -04:00
Tyler Renelle 89fabc38cb add "member since" in modal 2013-09-09 18:56:46 -04:00
Tyler Renelle e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Matteo Pagliazzi bfe7aec583 fix error code 2013-09-08 18:02:28 +02:00
Matteo Pagliazzi e67bb5b9e8 fix delete chat message 2013-09-08 17:42:20 +02:00
Matteo Pagliazzi c9f3d3029c delete chat message 2013-09-08 17:22:03 +02:00
Tyler Renelle 91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
 2013-09-07 12:45:39 -04:00
Tyler Renelle 5113ed192a add GET /groups/:gid, champ/elite/master tiers, chat sync button 2013-09-06 21:03:44 -04:00
Tyler Renelle 479cd16835 [#1448] add resting flag to users 2013-09-06 15:10:47 -04:00
Tyler Renelle e10735d38e [#1448] add resting flag to users 2013-09-06 15:07:08 -04:00
Tyler Renelle 2d53844984 add note about populate + match in chatc 2013-09-04 13:22:22 -04:00
Tyler Renelle 41255dcc20 groups: return group members on chat 2013-09-04 13:13:43 -04:00
Tyler Renelle 3bd6771687 fix "already pending invite" 2013-09-01 23:07:50 -04:00
Tyler Renelle 4862968925 groups: proper joining & leaving groups 2013-09-01 22:08:01 -04:00
Tyler Renelle f5f6c957de groups: try to update GroupsCtrl scope to notify of joined / left 
groups, not working
 2013-09-01 21:31:38 -04:00
Tyler Renelle 306e4de7e7 groups: fix create & leave 2013-09-01 20:57:01 -04:00
Tyler Renelle 010995b38b api: createGroup 2013-09-01 20:50:36 -04:00
Tyler Renelle ac992ea865 groups: misc groups fixes 2013-09-01 20:24:44 -04:00
Tyler Renelle 633d6fdb52 api: group invitations, leave, join 2013-09-01 11:33:39 -04:00
Tyler Renelle 14ddad958e join & leave guilds 2013-08-31 23:35:53 -04:00