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
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
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
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
e07713d49c
typo
2013-10-29 18:03:11 +01:00
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
6af71f0e44
better group invite handling
2013-10-29 16:50:28 +01:00
219318b405
challenges: remove username(), since we're now using user.profile.name
2013-10-28 18:20:21 -07:00
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
633ce62313
set back some derby code
2013-10-28 22:24:13 +01:00
19433f7100
remove old code
2013-10-28 22:22:33 +01:00
36229ac44c
port assign group leader
2013-10-28 22:21:18 +01:00
5744146ff6
port group websites
2013-10-28 21:58:38 +01:00
f5777dc0d0
remove donate button from front page, fix #1617
2013-10-28 21:31:44 +01:00
4ac0ef4ac2
challenges: migration script for TaskSchema subdocs, cleanup tags, remove old challenges
2013-10-28 12:27:50 -07:00
6ee1b14e97
dismissable errors and warnings, fix #1580
2013-10-28 20:16:40 +01:00
35c4a62de0
challenges: switch from ngRoute to ui-router
2013-10-28 11:34:08 -07:00
f178eb2322
challenges: better lock-down on member's tasks (remove actionable items
...
except stats)
2013-10-28 11:34:08 -07:00
d62586ef0a
challenges: stats setup
2013-10-28 11:34:08 -07:00
44d67ac9f8
UserSchema: set default profile.name (either from facebook or username)
...
if not provided. This way we can remove the expensive username() helper
function throughout our html
2013-10-28 11:34:08 -07:00
a078889d58
challenges: sync score to challenge, lotsa bug fixes
2013-10-28 11:34:07 -07:00
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
d60a56432f
challenges: better unlinkig of tasks on unsubscribe
2013-10-28 11:34:07 -07:00
fa25f3d300
challenges: WIP beginning challenges feature. some basic CRUD & some
...
basic subscribe / unsubscribe functional (but buggy)
2013-10-28 11:34:07 -07:00
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
bobbyroberts99