Commit Graph

93 Commits

Author SHA1 Message Date
Matteo Pagliazzi bca346e616 use _.isFunction 2013-11-20 18:56:40 +01:00
Matteo Pagliazzi 56437d499e hotfix for pet count on server 2013-11-20 18:55:03 +01:00
Matteo Pagliazzi 4bedefbc57 use helpers.countPets on server, fix client side pet count 2013-11-20 18:48:48 +01:00
Adrien Lemaire 7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Tyler Renelle 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
Tyler Renelle 550ca394a9 groups: remove _v for now, it's causing issues (cast to Number failed
for Object) and I don't know why
2013-11-14 20:30:48 -08:00
Tyler Renelle 224cbe2277 pets: better fix than 64ac920 , and unsets beastmaster if wrongly set 2013-11-14 13:49:59 -08:00
Tyler Renelle 64ac920ca7 pets: fix to beastmaster with new pet system 2013-11-14 13:25:00 -08:00
Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop
Conflicts:
	views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle 10e9c205e6 Merge branch 'translations' into develop
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
2013-11-13 23:37:29 -08:00
Adrien Lemaire 153d1957a8 clean code from websites
Need review !
2013-11-14 15:20:35 +11:00
Matteo Pagliazzi 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
Tyler Renelle 244fe63bdd mounts: add support for rare mounts 2013-11-10 14:36:40 -08:00
Tyler Renelle 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
Matteo Pagliazzi 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
Tyler Renelle 7c94b4b6d3 contrib: add contributor achievement modal 2013-11-07 13:42:29 -08:00
Tyler Renelle d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor 2013-11-06 15:59:56 -08:00
Tyler Renelle cde3bb4c69 user._v & group._v fixes 2013-11-04 13:43:24 -08:00
Tyler Renelle 15d9e33252 [#1745] task.date as string instead of date 2013-11-04 09:12:32 -08:00
Tyler Renelle 7161ddf70e bug fix on saving chal 2013-11-04 09:08:30 -08:00
Tyler Renelle aa8cdfb198 bug fix to challenge.tasks._id out of sync 2013-11-03 22:47:20 -08:00
Tyler Renelle 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
Tyler Renelle 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
Tyler Renelle 14fac02a52 [#1738] add due date to taskSchema 2013-11-03 17:53:51 -08:00
Tyler Renelle c5d3d142d9 [#1711] taskSchema back to doc so we can use .id(). The performacne hit isn't
drastic, it was the history entries that was hurting us
2013-11-02 17:09:24 -07:00
Tyler Renelle ba8a8d2494 add .id back to task schema 2013-11-02 16:40:00 -07:00
Tyler Renelle 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
Tyler Renelle 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
Tyler Renelle c0292d0842 [#1711] back to Schema.Types.Mixed for user.tasks, this makes me sad :( 2013-11-02 11:41:34 -07:00
Tyler Renelle 2f83ac27ae [#1702] much more thorough migration of tasks to new schema, providing defaults
where task attrs fail type checks
2013-11-01 10:43:24 -07:00
Tyler Renelle 37027ac874 [#1672] assign tasks.id = tasks._id for challenges, fixes html ids & for lables 2013-11-01 09:48:22 -07:00
Tyler Renelle 58fa97fb19 challenges: shortcode for tag names & task tooltips 2013-10-31 18:18:34 -07:00
Tyler Renelle 0ce76ee689 [#1673] challenges: better tag-syncing, show tag bull-horn 2013-10-31 17:49:51 -07:00
Tyler Renelle b3804c4d1f [#1675] fixes to populating Group.challenges, and display challenges in party
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
2013-10-31 16:20:48 -07:00
Tyler Renelle 9d15e724e2 challenge prize: award winner 1 achievement and challenge.prize
gems. then close challenge.
2013-10-31 13:49:31 -07:00
Tyler Renelle 13fa947c57 challenge prize: add to challenge creation form (including min/max validation) 2013-10-31 11:44:50 -07:00
Tyler Renelle 9e8cdac06f [#1676] show memberCount on challenges.list. will follow up on ticket for reasoning 2013-10-31 09:17:40 -07:00
Tyler Renelle a90f37f35c more migration fixes, fix up metrics.js 2013-10-30 18:58:09 -07:00
Tyler Renelle 4764bf738c challenges: some more user cleanup in migration 2013-10-30 17:02:42 -07: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 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 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
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 5744146ff6 port group websites 2013-10-28 21:58:38 +01:00
Tyler Renelle 4ac0ef4ac2 challenges: migration script for TaskSchema subdocs, cleanup tags, remove old challenges 2013-10-28 12:27:50 -07:00
Tyler Renelle 35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Tyler Renelle 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
Tyler Renelle a078889d58 challenges: sync score to challenge, lotsa bug fixes 2013-10-28 11:34:07 -07:00