Commit graph

68 commits

Author SHA1 Message Date
Tyler Renelle
d9bef28c5d migrate flags.rest => preferences.sleep 2013-12-12 20:59:16 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since
we dynamically swap it sometimes)
2013-12-12 20:03:32 -07:00
Tyler Renelle
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
caa2f26003 [#1977] [#1616] move sortTask to user.ops 2013-12-12 17:32:54 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
d4e0ae85a0 [#1977] port pet-feeding to user.ops, so that it's now available in the API. Also add handling of 200 errors to simply notify and continue on up to server (friendly messages) 2013-12-12 15:58:17 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
Tyler Renelle
4e9b3f8522 fix 4323443 [#1977] thanks @toote 2013-12-11 08:54:54 -07:00
Tyler Renelle
4323443dbd [#1977] stricter PUT /user set-path validation, require they're setting on a
leaf-path (except for tasks.* - we still need to handle that properly)
2013-12-10 09:10:00 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle
62d50a1f4d classes: fixes to buying items 2013-12-04 23:10:14 -07:00
Tyler Renelle
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
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Matteo Pagliazzi
8e5edbbef8 fix #1611, @lefnire added a migration for deleted tags, this time it should not delete all of them ;) 2013-11-22 20:23:41 +01:00
Matteo Pagliazzi
1a388fa994 fix #1803, when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code? 2013-11-20 21:36:18 +01:00
Matteo Pagliazzi
98f3902224 deleteTag wasModified not necessary anymore 2013-11-18 17:03:09 +01:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Tyler Renelle
f35df8a47f [#1726] remove updateTasks() batch api route. That's not how we're using
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
2013-11-08 14:01:29 -08:00
Tyler Renelle
3dde30076c [#1726] fix PUT /api/v1/user/tasks/:tid . Something was really strange
when fully overriding an embedded mongoose doc, still don't know what
the issue was...
2013-11-05 17:43:43 -08:00
Tyler Renelle
cde3bb4c69 user._v & group._v fixes 2013-11-04 13:43:24 -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
7e811b9998 safety-check task removal 2013-11-02 18:29:53 -07:00
Tyler Renelle
e84aa13d62 fix reroll 2013-11-02 16:58:24 -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
0638888e4b make sure task._id == task.id (we should put this in pre(save) or something) 2013-11-01 13:38:46 -07:00
Tyler Renelle
57116d949a [#1709] fix to 'user is not defined' (for whomever is using this route, not
us. we need to clean up our api)
2013-11-01 13:38:46 -07:00
Tyler Renelle
fbbcecc6e2 [#1708] fix to taskDefault when creating a task and scoring 2013-11-01 13:38:46 -07:00
Tyler Renelle
751ae60342 [#1701] don't sync chal scoring for broken chals 2013-10-31 20:37:56 -07:00
Tyler Renelle
d8218927e5 add debug buttons back in, including +10 gems (@sabrecat) 2013-10-31 15:14:19 -07:00
Tyler Renelle
8b1ef412b2 [#1692] don't sync score to challenge's rewards 2013-10-31 10:22:57 -07:00
Tyler Renelle
a078889d58 challenges: sync score to challenge, lotsa bug fixes 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
Matteo Pagliazzi
1f8915f5de add api.deleteTag to batch update operations 2013-10-24 18:21:34 +02:00
Tyler Renelle
44cb797063 migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean 2013-10-22 18:50:50 -07:00
Tyler Renelle
f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle
6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle
619c00fb5c halloween: some unlocking bug fixes (appears a markModified was required) 2013-10-22 13:37:55 -07:00
Tyler Renelle
d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi
cc05926e6b do not log "Reply sent" after every user update 2013-10-21 17:51:14 +02:00
Tyler Renelle
33549971f9 paypal: fix retrying by responding to IPN with 200 first 2013-10-13 09:46:22 -07:00
Tyler Renelle
4c018d84c1 Merge branch 'paypal' into develop
Conflicts:
	bower.json
2013-10-12 19:23:44 -07:00
Tyler Renelle
09cd132420 paypal: begin adding paypal alternative to credit-card payments 2013-10-12 15:24:35 -07:00
Matteo Pagliazzi
2d02e49e06 always send _v 2013-09-20 16:09:55 +02:00
Matteo Pagliazzi
0c0e0834be send response only if modified or drop 2013-09-20 16:01:09 +02:00
Tyler Renelle
402e2aedb0 [#1397 #1543 #1540] misc bug fixes 2013-09-17 14:44:02 -04:00