Commit Graph

2330 Commits

Author SHA1 Message Date
Tyler Renelle 2fbff2a0bc challenges: lock down editing capabilities on certain task properties,
instead showing the challenge's properties (in case they change
challenge-side).This includes editing the tag name
2013-05-28 11:52:32 +01:00
Tyler Renelle 2666ebb1fc guilds: generic handling of invitations (incl. accept, reject, invite, etc) 2013-05-28 00:48:35 +01:00
Tyler Renelle fa9e6f5453 challenges: migrated drop groups collection if exists (mostly for debugging) 2013-05-27 21:14:22 +01:00
Tyler Renelle e9eb509682 challenges: generalized listings for groups/parties/public 2013-05-27 21:14:04 +01:00
Tyler Renelle 1a0d9772a7 Merge branch 'develop' into challenges 2013-05-27 18:54:51 +01:00
Tyler Renelle 89160919f4 achievements: add "Helped Habit Grow" badge, including bailey notify 2013-05-27 16:10:55 +01:00
Tyler Renelle 2c8112cd61 Merge branch 'develop' into challenges 2013-05-27 15:15:18 +01:00
Tyler Renelle 67643f796a challenges: underscore => lodash 2013-05-27 15:14:21 +01:00
Tyler Renelle 3d6dafb368 set derby-ui-boot dependency to
f04ba2c7e7b3a8f1462a6e70fe4f81055d74c4b2 (new versions are for racer 0.5)
2013-05-27 14:51:56 +01:00
Tyler Renelle 0360de2505 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-27 14:43:06 +01:00
Tyler Renelle fc14eadc08 habitrpg-shared: fix cron, so it doesn't run fully for new users 2013-05-27 14:37:57 +01:00
Tyler Renelle d3dd20cdf8 guilds: allow clicking guild-members for stats. needed to include
_membersArray in model ref
2013-05-26 22:36:30 +01:00
Tyler Renelle d4275867cc guilds: html & store.coffee bug fixes 2013-05-26 22:26:25 +01:00
Tyler Renelle ff35cbf1e7 guilds: generalize more groups stuff, creation invitation leaving,
etc. also fixes party invite bugs
2013-05-26 21:32:21 +01:00
Tyler Renelle 619b92563e guilds: rename party.coffee => groups.coffee 2013-05-26 20:25:15 +01:00
Tyler Renelle 0f8dbd044e guilds: got all groups html generalized (using same party html as
tavern, will add guilds soon)
2013-05-26 20:21:07 +01:00
Tyler Renelle e32ee04baa guilds: bug fix on _tavern => _habitRPG 2013-05-26 15:38:49 +01:00
Tyler Renelle 9dfdb52c98 challenges: rename party.html to groups.html 2013-05-26 15:33:01 +01:00
Tyler Renelle 35049f7752 Merge branch 'develop' into challenges-tmp
Conflicts:
	src/app/helpers.coffee
	src/app/index.coffee
2013-05-26 15:29:59 +01:00
Tyler Renelle 079e7eb30f challenges: fix up htmls to use new party-member subscription methods 2013-05-26 15:09:41 +01:00
Tyler Renelle 03c40c1571 challenges: migration & store: rename parties to groups, create habitrpg guild, move tavern into habitrpg, overhaul of motifs and subscriptions 2013-05-26 15:09:21 +01:00
Tyler Renelle 3499b436f4 Merge pull request #1046 from SyntaxPickax/master
Spelling: Enforced Shield -> Reinforced Shield
2013-05-26 02:54:52 -07:00
Brandon McPhail 389314b325 Enforced Shield -> Reinforced Shield
Changed spelling
2013-05-26 00:37:11 -06:00
Tyler Renelle f0c50e1cfe fix api + tests 2013-05-25 19:42:59 +01:00
Tyler Renelle 20addd24c7 parties: fetch pary-members synchronously, instead of async, to
mitigate the faceless party-members bug
2013-05-25 19:06:40 +01:00
Tyler Renelle a141a02000 add bailey for habitrpg-shared 2013-05-25 19:01:43 +01:00
Tyler Renelle e0f63860a9 typo in package.json 2013-05-25 18:31:47 +01:00
Tyler Renelle 955c2841ea tests: get rid of user.mocha.coffee, now it's in habitrpg-shared 2013-05-25 18:29:42 +01:00
Tyler Renelle c894f87310 habitrpg-shared: fix cron to work with habitrpg-shared d293f74 2013-05-24 18:49:18 +01:00
Tyler Renelle 467741570a pet selection bug fix with lodash (_.findWhere => _.find), fixes #902 2013-05-24 12:25:32 +01:00
Tyler Renelle 62c9e45e2e habitrpg-shared: use newUser from shared helpers instead of in character.coffee 2013-05-24 11:34:17 +01:00
Tyler Renelle 3ed2412f87 habitrpg-shared: bug fix in API 2013-05-23 18:35:32 +01:00
Tyler Renelle 9e2c9045c5 habitrpg-shared: move task.score => misc.score so api can use it too 2013-05-23 17:35:24 +01:00
Tyler Renelle 32cf11b533 use lodash in tests for consistency 2013-05-23 17:34:27 +01:00
Tyler Renelle fee39a8b7e habitrpg-shared: add streakBonus back in 2013-05-23 17:00:54 +01:00
Tyler Renelle 69e1f991b7 habitrpg-shared: put drops back in 2013-05-23 16:53:13 +01:00
Tyler Renelle 73fe8ebfdd fix preen_cron 2013-05-23 15:06:42 +01:00
Tyler Renelle 60a4ce5888 update find_unique_user to use lodash 2013-05-23 14:40:34 +01:00
Tyler Renelle 77e37804e8 habitrpg-shared: bug fixes on hydrate() 2013-05-22 13:57:10 +01:00
Tyler Renelle 258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle 1596808c25 move everything to lodash, since we're using it for other things
anyway (cloneDeep, findIndex, etc). make sure to return `true`
explicitly after all _.each functions! if you accidently return
false (happens more often than you'd think), it kills the loop. As a
result, I'm using .forEach() native function where i can for
simplicity, but many of our _.each iterate object keys
2013-05-22 11:29:24 +01:00
Tyler Renelle a31eb184a2 habitrpg-shared: don't forget the package req! 2013-05-22 11:27:16 +01:00
Tyler Renelle 5a25244096 Merge branch 'habitrpg-shared' into develop
Conflicts:
	src/app/helpers.coffee
	src/app/items.coffee
2013-05-22 11:13:27 +01:00
Tyler Renelle 598f2f6c46 habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get() 2013-05-22 11:08:05 +01:00
Tyler Renelle 2230ce6688 habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116) to prevent data-loss on user.get() 2013-05-22 00:40:54 +01:00
Tyler Renelle bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle ff2fedda48 add ability to restore lost streaks, also add int() view helper
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
2013-05-21 14:33:31 +01:00
Tyler Renelle e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-21 12:57:40 +01:00
Tyler Renelle cc097c32f7 clean up of preen_cron, which I'm re-enstating 2013-05-21 12:54:06 +01:00
Philip How b77a62e915 Merge pull request #1002 from MrConcept/master
Merge Master
2013-05-20 11:09:37 -07:00