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
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
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
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
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
e81193ef28
challenges: pull in updates from the old 0.5 branch
2013-10-28 11:34:07 -07:00
e0c95b3a86
port member modal to group members list, fix #1656
2013-10-28 18:27:03 +01:00
23c3bcfa32
add ability to group leader to remove members, fix #1639
2013-10-28 17:10:29 +01:00
c9ff96af6c
added small notice about password manager
2013-10-27 13:36:20 +01:00
a5af52a275
correctly award ultimategear achievement
2013-10-27 12:11:59 +01:00
5d14a1811f
Merge pull request #1637 from ozymandiasthegreat/manual-due-date
...
Manual due date
2013-10-24 12:45:42 -07:00
ef972bf70d
[ #1540 ] add restore option for streak achievement
2013-10-24 11:04:35 -07:00
c7c8338316
Merge pull request #1642 from Shaners/develop
...
Adds red hair option for web.
2013-10-24 10:10:27 -07:00
5fa398780f
Adds red hair option for web.
2013-10-24 00:03:09 -07:00
22b429242f
Merge remote-tracking branch 'upstream/develop' into manual-due-date
2013-10-23 14:34:36 -04:00
20f2d75bbf
add streak achievement notification
2013-10-23 17:57:02 +02:00
f56b76b5ae
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-10-23 16:38:37 +02:00
0c7ba32c6b
fix #1635
2013-10-23 16:38:05 +02:00
5c4c4ae252
typo in donate page
2013-10-22 20:55:55 -07:00
619a15b316
gem icon for unlock-set as well
2013-10-22 19:33:55 -07:00
077850b172
halloween: explicit gems instead of 'G'
2013-10-22 19:22:32 -07:00
44cb797063
migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean
2013-10-22 18:50:50 -07:00
f59d5b056c
Merge branch 'halloween' into develop
2013-10-22 17:57:57 -07:00
e7886e00b4
halloween: highlght limited skins, add description about limited, rename
...
to "rainbow" and "spooky" @lemoness
2013-10-22 17:56:46 -07:00
b90aadf7ab
update bailey notif
2013-10-22 16:52:54 -07:00
2c7fc72419
better modal indenting
2013-10-22 16:33:06 -07:00
b3853800a3
remove Ultra Mega Update (since we've been live for a long time). Add
...
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
2013-10-22 16:28:13 -07:00
2c1d8e1688
halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe)
2013-10-22 14:32:51 -07:00
6f32ac2a24
halloween: purchase full set
2013-10-22 13:59:30 -07:00
d184237c79
halloween: begin adding mechanic for the special skins
2013-10-22 13:24:31 -07:00
c4882942d6
fix chart shown below task edit form
2013-10-21 20:41:19 +02:00
b55cb1ccdb
bailey update for skin tones, 0.0.10, selling drops. @lemoness this is
...
the new format (jade), hit me offline for a tour
2013-10-20 00:13:50 -07:00
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
c882525150
eggs: add ability to sell potions / eggs
2013-10-19 20:04:26 -07:00
Tyler Renelle