55d0a0a94d
classes: fix customizations based on habitrpg-shared#9821a88
2013-12-04 15:09:56 -07:00
19b6eb73e0
Merge branch 'develop' into classes
...
Conflicts:
public/css/index.styl
src/models/user.js
views/options/profile.jade
views/shared/header/avatar.jade
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
91c141140d
classes: armory WIP
2013-11-30 16:33:21 -07:00
9bb4e2c272
update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45
2013-11-29 09:06:13 -08:00
7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
d3eed2282c
fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it
2013-11-27 16:08:34 +01:00
2b128f71f4
[ #1532 ] add better validation on preferences.dayStart, and a migration to
...
cleanup corrupt ones
2013-11-26 15:18:20 -07:00
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
83e3a6aff2
classes WIP
2013-11-23 16:59:41 -07:00
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
123c515cbb
challenges: only push history for dailies / habits
2013-11-22 23:22:24 -07:00
c2b8a62749
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:12:43 -07:00
18d6bed3b8
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:07:27 -07:00
bca346e616
use _.isFunction
2013-11-20 18:56:40 +01:00
56437d499e
hotfix for pet count on server
2013-11-20 18:55:03 +01:00
4bedefbc57
use helpers.countPets on server, fix client side pet count
2013-11-20 18:48:48 +01:00
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
b762ecba81
admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes
2013-11-15 19:27:23 -08:00
224cbe2277
pets: better fix than 64ac920 , and unsets beastmaster if wrongly set
2013-11-14 13:49:59 -08:00
64ac920ca7
pets: fix to beastmaster with new pet system
2013-11-14 13:25:00 -08:00
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11:00
154a652726
middleware.locals back to a middleware, use user specified language if avalaible, list of avalaible languages avalaible in window.env
2013-11-12 15:57:46 +01:00
244fe63bdd
mounts: add support for rare mounts
2013-11-10 14:36:40 -08:00
60421a85cc
mounts: revamp UserSchema.items to store all animal-related items as
...
objects rather than arrays. Preparation for the mount system
2013-11-09 20:14:35 -08:00
3a332c4c45
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
2013-11-08 22:33:48 +01:00
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
cde3bb4c69
user._v & group._v fixes
2013-11-04 13:43:24 -08:00
aa8cdfb198
bug fix to challenge.tasks._id out of sync
2013-11-03 22:47:20 -08:00
452c4e1ece
[ #1729 ] move most chal-user syncing logic to their models rather than
...
controllers. don't sync task.value or task.history over to user on
challenge.join()! some work-arounds for the task._id/id mismatch (still
not perfect, need to work on some more)
2013-11-03 22:33:53 -08:00
7060f75c83
[ #1741 ] remove _id from TaskSchema (we're too deep in our legacy task.id
...
requirement, we can revisit later)
2013-11-03 21:17:33 -08:00
838108d579
[ #1711 ] got it! task.*.history & user.history as defined schemas was the
...
problem, since they're arrays of >100 each
2013-11-02 12:49:08 -07:00
01536a2e29
Revert "[ #1711 ] back to Schema.Types.Mixed for user.tasks, this makes me sad :("
...
This reverts commit c0292d0842
2013-11-02 12:24:05 -07:00
c0292d0842
[ #1711 ] back to Schema.Types.Mixed for user.tasks, this makes me sad :(
2013-11-02 11:41:34 -07:00
0ce76ee689
[ #1673 ] challenges: better tag-syncing, show tag bull-horn
2013-10-31 17:49:51 -07:00
9d15e724e2
challenge prize: award winner 1 achievement and challenge.prize
...
gems. then close challenge.
2013-10-31 13:49:31 -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
4ac0ef4ac2
challenges: migration script for TaskSchema subdocs, cleanup tags, remove old challenges
2013-10-28 12:27:50 -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
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
8cdcbcf685
added comment for minimze: false
2013-10-27 10:55:43 +01:00
c90b1e757c
better fix for #1647
2013-10-27 10:49:32 +01:00
110986951b
fix #1647
2013-10-27 10:18:23 +01:00
44cb797063
migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean
2013-10-22 18:50:50 -07:00
619c00fb5c
halloween: some unlocking bug fixes (appears a markModified was required)
2013-10-22 13:37:55 -07:00
d184237c79
halloween: begin adding mechanic for the special skins
2013-10-22 13:24:31 -07:00
Tyler Renelle