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
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -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
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
188db745fc
allow users to trigger "missed day" manually from Restore modal
2013-11-05 17:43:43 -08:00
63b4e5152e
better fix #1740
2013-11-04 15:21:05 +01:00
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
33c78c7168
more fixes for guild leaving
2013-11-03 12:12:43 +01:00
126fd55ec6
update guild member count
2013-11-03 12:00:57 +01:00
06f6dc0a43
better guild join/leave
2013-11-03 11:58:42 +01:00
d024470abe
update gem count after guild creation
2013-11-02 10:04:31 +01: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
898adfdc13
fix when leaving public guild
2013-11-02 09:34:56 +01:00
8ae75e09c5
[ #1716 ] use ui-router to collapse challenge participants (WIP)
2013-11-01 23:46:14 -07:00
87bc7fd722
[ #1710 ] fix to party-in-header
2013-11-01 20:32:43 -07:00
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
03b945d755
update memberCount & typo
2013-11-01 21:18:31 +01:00
f7dba5f323
avoid reloading for group operations
2013-11-01 21:08:36 +01:00
eccc9a7953
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-01 18:33:54 +01:00
3562079ba6
small design tweaks, fix #1682
2013-11-01 18:33:50 +01:00
7037e1c8eb
[ #1672 ] don't allow clicking checkboxes on challenge-editing page
2013-11-01 10:20:14 -07:00
dfeae89a07
challenges: minimum 1 gem for public challenges
2013-10-31 19:30:07 -07:00
0ce76ee689
[ #1673 ] challenges: better tag-syncing, show tag bull-horn
2013-10-31 17:49:51 -07:00
baf52db594
[ #1670 ] don't refresh on challenge create/join/leave (meh, workaround)
2013-10-31 16:39:26 -07:00
d8218927e5
add debug buttons back in, including +10 gems (@sabrecat)
2013-10-31 15:14:19 -07:00
39821752fa
challenges: move options/challenges to options/social/challenges
2013-10-31 14:37:04 -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
f6ebd9997e
challenge gems: popover for closing (delete or select winner)
2013-10-31 13:26:18 -07:00
13fa947c57
challenge prize: add to challenge creation form (including min/max validation)
2013-10-31 11:44:50 -07: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
931e8125b4
[ #1693 ] make revive available to /options too
2013-10-31 09:34:12 -07:00
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01:00
f5a1ec96f9
[ #1679 ] wrong cancel check
2013-10-31 01:24:47 -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
e2331e5194
added growl style notification for errors
2013-10-30 19:29:46 +01:00
ff3266bac8
get rid of ngRoute completely, depend on ui-router instead
2013-10-30 10:31:36 -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
6e71a76e22
challenges: back to dealing with taskLists from scopes, rather than the
...
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
2013-10-29 19:07:39 -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
Matteo Pagliazzi