Tyler Renelle
35e6f40cb6
challenge gems: deduct gems from group.balance & user.balance on the server
2013-10-31 12:39:10 -07:00
Tyler Renelle
13fa947c57
challenge prize: add to challenge creation form (including min/max validation)
2013-10-31 11:44:50 -07:00
Tyler Renelle
6c63608f83
[ #1681 ] add chal.description on creation form
2013-10-31 10:46:25 -07:00
Tyler Renelle
8b1ef412b2
[ #1692 ] don't sync score to challenge's rewards
2013-10-31 10:22:57 -07:00
Tyler Renelle
0892f93b75
[ #1683 ] typo
2013-10-31 10:21:36 -07:00
Tyler Renelle
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
Matteo Pagliazzi
bbf0194a7b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-31 17:48:04 +01:00
Matteo Pagliazzi
9daef15ce9
typo
2013-10-31 17:47:44 +01:00
Tyler Renelle
7b15a0055a
[ #1680 ] fix tavern chat
2013-10-31 09:44:47 -07:00
Tyler Renelle
1420fe8c03
Merge pull request #1694 from bobbyroberts99/patch-1
...
Clarify pet hatching instructions
2013-10-31 09:39:38 -07:00
Matteo Pagliazzi
70c630fcc9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-31 17:35:20 +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
bobbyroberts99
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
Tyler Renelle
931e8125b4
[ #1693 ] make revive available to /options too
2013-10-31 09:34:12 -07:00
Tyler Renelle
9e8cdac06f
[ #1676 ] show memberCount on challenges.list. will follow up on ticket for reasoning
2013-10-31 09:17:40 -07:00
Matteo Pagliazzi
8531fb33b2
revert lodash version
2013-10-31 16:39:03 +01:00
Matteo Pagliazzi
d4b3d239e9
upgrade lodash to 2.2.x
2013-10-31 16:10:20 +01:00
Matteo Pagliazzi
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01:00
Tyler Renelle
f5a1ec96f9
[ #1679 ] wrong cancel check
2013-10-31 01:24:47 -07:00
Tyler Renelle
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
Tyler Renelle
52a36a19e4
add agreement copy on registration.
2013-10-31 00:03:43 -07:00
Shane Lister
afcd2b3803
Rare Pets Layout
...
Shows rare pets header always.
Shows golden missing rare pet graphic if Hydra not obtained with link to how to obtain it.
2013-10-30 23:10:03 -07:00
Tyler Renelle
3a89c36366
Merge pull request #36 from Shaners/rewrite
...
Add golden paw graphic for missing but obtainable rare pets.
2013-10-30 21:33:55 -07:00
Shaners
d1de22f3e1
Add golden paw graphic for missing but obtainable rare pets.
2013-10-30 21:20:20 -07:00
Tyler Renelle
a90f37f35c
more migration fixes, fix up metrics.js
2013-10-30 18:58:09 -07:00
Tyler Renelle
4764bf738c
challenges: some more user cleanup in migration
2013-10-30 17:02:42 -07: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
Matteo Pagliazzi
da7ab9f1c3
remove loading indicator
2013-10-30 19:35:30 +01:00
Matteo Pagliazzi
8f82bd5cd7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-30 19:30:02 +01:00
Matteo Pagliazzi
e2331e5194
added growl style notification for errors
2013-10-30 19:29:46 +01:00
Tyler Renelle
e8d812fbe9
groups: safety-check on removeSelf
2013-10-30 11:18:31 -07:00
Matteo Pagliazzi
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
Tyler Renelle
ff3266bac8
get rid of ngRoute completely, depend on ui-router instead
2013-10-30 10:31:36 -07:00
Tyler Renelle
8b76b74d78
add profile.name in migration, ui-router in production grunt
2013-10-30 09:57:38 -07:00
Matteo Pagliazzi
2cd4bbb0ec
use profile.name for invited users
2013-10-30 15:54:39 +01:00
Tyler Renelle
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
Tyler Renelle
ea54f0aa75
challenges: implement basic filters on challenges tab
2013-10-30 01:21:44 -07:00
Tyler Renelle
1bfb6a88fd
Merge remote-tracking branch 'shaners/rewrite'
...
Conflicts:
dist/spritesheets.css
2013-10-29 23:15:03 -07:00
Tyler Renelle
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
Tyler Renelle
5c915547b0
Merge branch 'challenges'
2013-10-29 23:10:55 -07:00
Tyler Renelle
d116ac7b81
challenges: lots of misc. bug fixes
2013-10-29 22:30:58 -07:00
Tyler Renelle
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
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
9eecb977ea
add migration to add invited users to group.invites, @lefnire I tried with _.each(db.users.find()) but doesnt seem to work for db records so I ended up using db.users.find().forEach... which instead seems to work. My first migration to cleanup deleted tags used _.each so I rewrote it using native forEach, just wanted to let you know that it is updated now.
2013-10-29 19:06:01 +01: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
