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
Tyler Renelle
931e8125b4
[ #1693 ] make revive available to /options too
2013-10-31 09:34:12 -07:00
Matteo Pagliazzi
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01: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
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
e2331e5194
added growl style notification for errors
2013-10-30 19:29:46 +01: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
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
Matteo Pagliazzi
f5777dc0d0
remove donate button from front page, fix #1617
2013-10-28 21:31:44 +01:00
Matteo Pagliazzi
6ee1b14e97
dismissable errors and warnings, fix #1580
2013-10-28 20:16:40 +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
Matteo Pagliazzi
c9ff96af6c
added small notice about password manager
2013-10-27 13:36:20 +01:00
Matteo Pagliazzi
a5af52a275
correctly award ultimategear achievement
2013-10-27 12:11:59 +01:00
Tyler Renelle
5d14a1811f
Merge pull request #1637 from ozymandiasthegreat/manual-due-date
...
Manual due date
2013-10-24 12:45:42 -07:00
Tyler Renelle
ef972bf70d
[ #1540 ] add restore option for streak achievement
2013-10-24 11:04:35 -07:00
Tyler Renelle
c7c8338316
Merge pull request #1642 from Shaners/develop
...
Adds red hair option for web.
2013-10-24 10:10:27 -07:00
Shaners
5fa398780f
Adds red hair option for web.
2013-10-24 00:03:09 -07:00
J. Ozymandias Fallick
22b429242f
Merge remote-tracking branch 'upstream/develop' into manual-due-date
2013-10-23 14:34:36 -04:00
Matteo Pagliazzi
20f2d75bbf
add streak achievement notification
2013-10-23 17:57:02 +02:00
Matteo Pagliazzi
f56b76b5ae
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-10-23 16:38:37 +02:00
Matteo Pagliazzi
0c7ba32c6b
fix #1635
2013-10-23 16:38:05 +02:00
Tyler Renelle
5c4c4ae252
typo in donate page
2013-10-22 20:55:55 -07:00
