Matteo Pagliazzi
02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
Matteo Pagliazzi
a78297f129
update chat if necessary after new message posted or deleted
2013-11-08 17:03:10 +01:00
Tyler Renelle
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
Tyler Renelle
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
Matteo Pagliazzi
3b18c322bc
return whole group.chat after chat message is sent
2013-11-06 21:27:24 +01:00
Matteo Pagliazzi
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
Matteo Pagliazzi
63b4e5152e
better fix #1740
2013-11-04 15:21:05 +01:00
Matteo Pagliazzi
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
Matteo Pagliazzi
33c78c7168
more fixes for guild leaving
2013-11-03 12:12:43 +01:00
Matteo Pagliazzi
126fd55ec6
update guild member count
2013-11-03 12:00:57 +01:00
Matteo Pagliazzi
06f6dc0a43
better guild join/leave
2013-11-03 11:58:42 +01:00
Matteo Pagliazzi
d024470abe
update gem count after guild creation
2013-11-02 10:04:31 +01:00
Matteo Pagliazzi
b08a30a76b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:54:44 +01:00
Matteo Pagliazzi
5a103db716
upgrade lodash to 2.2.1
2013-11-02 09:52:48 +01:00
Tyler Renelle
08498e37ac
[ #1718 ] don't 404 for group not found
2013-11-02 01:38:51 -07:00
Matteo Pagliazzi
898adfdc13
fix when leaving public guild
2013-11-02 09:34:56 +01:00
Tyler Renelle
62b2d5780b
[ #1710 ] some simplification on Groups memoization. No need for all that
...
special handling of Header Party, just have it's own controller and do
specific-handling. Also, removing MenuCtrl & StatsCtrl - they weren't
used TMK, I think twas a vestige of mobile. @paglias give that a gander
2013-11-01 20:15:04 -07:00
Matteo Pagliazzi
03b945d755
update memberCount & typo
2013-11-01 21:18:31 +01:00
Matteo Pagliazzi
f7dba5f323
avoid reloading for group operations
2013-11-01 21:08:36 +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
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
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
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
Matteo Pagliazzi
19433f7100
remove old code
2013-10-28 22:22:33 +01:00
Matteo Pagliazzi
36229ac44c
port assign group leader
2013-10-28 22:21:18 +01:00
Matteo Pagliazzi
5744146ff6
port group websites
2013-10-28 21:58:38 +01:00
Tyler Renelle
35c4a62de0
challenges: switch from ngRoute to ui-router
2013-10-28 11:34:08 -07:00
Matteo Pagliazzi
23c3bcfa32
add ability to group leader to remove members, fix #1639
2013-10-28 17:10:29 +01:00
Matteo Pagliazzi
9e21974108
revert previous commit, reload after party invite accept
2013-10-28 16:24:40 +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
Tyler Renelle
5de0c928fe
paypal: conslidate buy gems modals
2013-10-12 16:51:01 -07:00
Matteo Pagliazzi
93aab9d459
typo
2013-09-21 16:14:19 +02:00
Matteo Pagliazzi
2c32095924
confirmation when leaving party or guilds, fix #866
2013-09-18 20:09:35 +02:00
Tyler Renelle
9ec3c4aaed
fix so admins can delete chat msgs
2013-09-18 09:06:51 -04:00
Tyler Renelle
dc303f83c1
[ #1221 ] misc bug fixes on backer.* doesn't exist in chat, default backer &
...
preference attrs in user model
2013-09-13 15:10:47 -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
1342a2cb89
fix reject guild function
2013-09-11 17:07:38 +02:00
Matteo Pagliazzi
8e377d7343
fix various guilds issues
2013-09-11 16:28:14 +02: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
Tyler Renelle
09963ee30a
[ #1489 ] WIP start adding group edit. remove angular-ui-bootstrap accordion as it
...
was causing problems.
2013-09-09 16:15:57 -04:00
Matteo Pagliazzi
c9f3d3029c
delete chat message
2013-09-08 17:22:03 +02:00
Tyler Renelle
5cb8238b7c
change badge from master => royal
2013-09-07 15:31:36 -04:00
Tyler Renelle
a960d310f7
[ #1465 ] allow clicking self for modal
2013-09-07 13:59:49 -04:00
Tyler Renelle
69faa27f68
[ #1465 ] bug fixes to achievements listing
2013-09-07 13:38:43 -04:00
