f4ac5dfe8c
fix unit tests
2013-10-31 22:35:35 -03: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
baf52db594
[ #1670 ] don't refresh on challenge create/join/leave (meh, workaround)
2013-10-31 16:39:26 -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
39821752fa
challenges: move options/challenges to options/social/challenges
2013-10-31 14:37:04 -07:00
012dabf8b6
challenges: visually collapse members list (still loads the full thing, revisit later)
2013-10-31 14:26:48 -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
f6ebd9997e
challenge gems: popover for closing (delete or select winner)
2013-10-31 13:26:18 -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
6c63608f83
[ #1681 ] add chal.description on creation form
2013-10-31 10:46:25 -07:00
8b1ef412b2
[ #1692 ] don't sync score to challenge's rewards
2013-10-31 10:22:57 -07:00
0892f93b75
[ #1683 ] typo
2013-10-31 10:21:36 -07:00
398c52f3b0
[ #1683 ] ugly workaround to fix save/delete/cancel flashing. Problem is
...
$scope.challenge isn't resolved yet, so ._locked isn't set
immediately. Well we could use $state.resolve instead of
$state.controller, but it's just not resolving (ui-router not working
with ng-resoure?)
2013-10-31 10:14:46 -07:00
bbf0194a7b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-31 17:48:04 +01:00
9daef15ce9
typo
2013-10-31 17:47:44 +01:00
7b15a0055a
[ #1680 ] fix tavern chat
2013-10-31 09:44:47 -07:00
1420fe8c03
Merge pull request #1694 from bobbyroberts99/patch-1
...
Clarify pet hatching instructions
2013-10-31 09:39:38 -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
5b09bd30b4
Clarify pet hatching instructions
...
This is my first PR. Hope I'm in the right place.
2013-10-31 09:34:43 -07:00
931e8125b4
[ #1693 ] make revive available to /options too
2013-10-31 09:34:12 -07: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
f5a1ec96f9
[ #1679 ] wrong cancel check
2013-10-31 01:24:47 -07: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
52a36a19e4
add agreement copy on registration.
2013-10-31 00:03:43 -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
da7ab9f1c3
remove loading indicator
2013-10-30 19:35:30 +01:00
8f82bd5cd7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-30 19:30:02 +01:00
e2331e5194
added growl style notification for errors
2013-10-30 19:29:46 +01:00
e8d812fbe9
groups: safety-check on removeSelf
2013-10-30 11:18:31 -07:00
1490380e53
@lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think
2013-10-30 19:13:21 +01:00
ff3266bac8
get rid of ngRoute completely, depend on ui-router instead
2013-10-30 10:31:36 -07:00
8b76b74d78
add profile.name in migration, ui-router in production grunt
2013-10-30 09:57:38 -07:00
2cd4bbb0ec
use profile.name for invited users
2013-10-30 15:54:39 +01:00
0151484279
merge @paglias migrations into our one big migration, so I can run it
...
all at once when the time comes. Had to make some changes (will comment
no github)
2013-10-30 01:46:49 -07:00
ea54f0aa75
challenges: implement basic filters on challenges tab
2013-10-30 01:21:44 -07:00
96f7db3d8a
switching habitrpg-shared over from #rewrite to #master, will remove
...
rewrite branch soon after we're launched with challenges @shaners @paglias
2013-10-29 23:12:38 -07:00
Dušan Juretić