Commit graph

129 commits

Author SHA1 Message Date
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
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
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
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
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
2cd4bbb0ec use profile.name for invited users 2013-10-30 15:54:39 +01:00
Tyler Renelle
ea54f0aa75 challenges: implement basic filters on challenges tab 2013-10-30 01:21:44 -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
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
633ce62313 set back some derby code 2013-10-28 22:24:13 +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
Tyler Renelle
f178eb2322 challenges: better lock-down on member's tasks (remove actionable items
except stats)
2013-10-28 11:34:08 -07:00
Tyler Renelle
d62586ef0a challenges: stats setup 2013-10-28 11:34:08 -07:00
Tyler Renelle
a078889d58 challenges: sync score to challenge, lotsa bug fixes 2013-10-28 11:34:07 -07:00
Tyler Renelle
e52d0a156a challenges: better syncing of new, updated, & deleted tasks from
challenge to user. start with task.challenge.broken code
2013-10-28 11:34:07 -07:00
Tyler Renelle
d60a56432f challenges: better unlinkig of tasks on unsubscribe 2013-10-28 11:34:07 -07: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
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks =>
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07:00
Tyler Renelle
e81193ef28 challenges: pull in updates from the old 0.5 branch 2013-10-28 11:34:07 -07:00
Matteo Pagliazzi
e0c95b3a86 port member modal to group members list, fix #1656 2013-10-28 18:27:03 +01:00
Matteo Pagliazzi
23c3bcfa32 add ability to group leader to remove members, fix #1639 2013-10-28 17:10:29 +01:00
Shaners
5fa398780f Adds red hair option for web. 2013-10-24 00:03:09 -07:00
Tyler Renelle
619a15b316 gem icon for unlock-set as well 2013-10-22 19:33:55 -07:00
Tyler Renelle
077850b172 halloween: explicit gems instead of 'G' 2013-10-22 19:22:32 -07:00
Tyler Renelle
e7886e00b4 halloween: highlght limited skins, add description about limited, rename
to "rainbow" and "spooky" @lemoness
2013-10-22 17:56:46 -07:00
Tyler Renelle
2c1d8e1688 halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe) 2013-10-22 14:32:51 -07:00
Tyler Renelle
6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Tyler Renelle
2cf814acd6 drops: description on combining eggs/potions, selling to
alex. de-selectable drops. sell in a button of alex's dialog
2013-10-19 23:44:03 -07:00
Tyler Renelle
c882525150 eggs: add ability to sell potions / eggs 2013-10-19 20:04:26 -07:00
Tyler Renelle
017398eb83 eggs: some cleanup and passing around of $index so we can retrieve
egg/pot value
2013-10-19 19:58:11 -07:00
Tyler Renelle
378d158a44 pegs: restructure inventory/market html so we market is aware of
inventory and we can sell items
2013-10-19 19:36:59 -07:00
Tyler Renelle
be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00
Matteo Pagliazzi
066364e3c9 fix refresh chat button sending message 2013-10-16 21:36:56 +02:00
Matteo Pagliazzi
a56242d1a7 working chat refresh button 2013-10-16 21:02:57 +02:00
Matteo Pagliazzi
68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02:00
Matteo Pagliazzi
c3086c6194 fix not showing veteran wolf 2013-10-13 19:40:07 +02:00