sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6320 commits 3 branches 0 tags 1.6 GiB
Commit graph

161 commits

Author SHA1 Message Date
Tyler Renelle
0c99976bf5 fix(event-tracking): stripe sub, not pp 2014-02-10 18:54:29 -07:00
Tyler Renelle
d89fb17b03 feat(event-tracking): track ecommerce events 2014-02-10 14:14:45 -07:00
Tyler Renelle
f7b4a04a59 feat(event-tracking): add server-side GA tracking for ecommerce events 2014-02-10 11:35:33 -07:00
Tyler Renelle
0c21f54c67 fix(user): make sure next is passed to all routes, and is available in 
err-back of batch updates
 2014-02-05 21:28:46 -07:00
Tyler Renelle
4c3c4b2ae7 perf(user): save user.save till very end of ops queue 2014-02-05 21:22:25 -07:00
Tyler Renelle
bf5e9016a4 fix(errors): return next(err) when experiencing errors, instead of res.json(500,{err:err}). Let the top-level error handler handle this (needed for upcoming versionerror discarding) 2014-02-05 17:28:59 -07:00
Cole Gleason
4494600d92 chore(logging): replace console.* with new logging module 2014-02-01 02:01:19 -06:00
Tyler Renelle
179316e10f feat(restore): add restore-gp back in. Parly to end the winter event, 
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
 2014-01-31 12:54:37 -07:00
Tyler Renelle
ab86ba11bd fix(user): if need to upgrade site, send 501, not 400 2014-01-31 10:27:02 -07:00
Tyler Renelle
0aec4caa78 fix(user): PUT user retricted path errors are 401, not 500 2014-01-30 21:39:19 -07:00
Tyler Renelle
f967962996 fix(batch-update): send errors to client if batch-update found an error, 
crash pid.
 2014-01-30 21:33:28 -07:00
Tyler Renelle
3660f1a85c feat(premium): backport server code for premium subs (it's just ccard 
handling & uer model stuff)
 2014-01-30 10:51:32 -07:00
Tyler Renelle
241d04140f fix(spells): temp workaround for spell & task being undefined. #2649 #2640 2014-01-29 21:37:59 -07:00
Tyler Renelle
6878596cb4 Merge branch 'lefnire/spells' into develop 2014-01-22 00:32:29 -08:00
Tyler Renelle
e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle
c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is 
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
 2014-01-21 23:04:01 -08:00
Cole Gleason
187ea1c739 chore(VersionError): add debug code to emails showing completed ops 
This adds a field to the email if there is an error on batchUpdate. This
field contains all the attempted operations. So the last item in the
list would be the operation that we encountered the error at. @lefnire,
mind taking a look at this and pushing if you feel comfortable with
adding more to the emails?
 2014-01-22 00:50:14 -06:00
Tyler Renelle
b1afc177aa fix(todos): add dateCompleted to todos so they're archived 3 days after 
completion, not 3 days after creation. Fixes #2478
 2014-01-19 17:12:33 -08:00
Tyler Renelle
6536b855c9 instead of clearing completed on cron, simply hide them from the angular 
apps (which only use batch-update API route) @colegleason
 2014-01-14 18:03:16 -07:00
Tyler Renelle
5e321b0205 apiv2 swagger fixes to paypal, and send admin emails 2014-01-03 12:50:03 -07:00
Tyler Renelle
6d8e4ed8a2 tests: api.mocha.coffee cleanup WIP 2014-01-03 10:26:46 -07:00
Tyler Renelle
580279eeda #2217 apiv2 update documentation 2014-01-01 22:26:59 -07:00
Sabe Jones
9a32cfd7e1 Remove extraneous techy characters from boss fight and spellcasting chat notifications 2013-12-30 08:46:40 -06:00
Tyler Renelle
2f4fd2faca fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know 
if you need it in other locations
 2013-12-29 17:13:39 -07:00
Sabe Jones
47c4b1dbe5 Don't need angle brackets anymore for party cast notifications 2013-12-28 17:46:18 -06:00
Tyler Renelle
827d04e4dc APIv2: send response for user.ops 2013-12-28 12:06:24 -07:00
Tyler Renelle
f8b7d313da typo on req.body.notes 2013-12-27 15:39:49 -07:00
Tyler Renelle
2a63dfe687 quests: temporary fix to users who have left a party mid-quest 2013-12-26 15:39:09 -07:00
Tyler Renelle
8aacb37e2c API: safe-guarding against POSTing to create 3rd-party tasks with no {type} value 2013-12-25 10:59:52 -07:00
Tyler Renelle
f2f1d6621e rename user.party.tally => user.party.progress 2013-12-24 21:57:56 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Tyler Renelle
f538a91538 bosses: no models, performance improvements 2013-12-23 14:17:08 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
faeeecdf04 add GET /api/v2/content which lists all item definitions @magicmicky 2013-12-22 12:09:44 -07:00
Tyler Renelle
9518cd1b51 winter: add salt spell to remove snowball buff 2013-12-20 18:35:50 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
41c80b9433 fix #2061 "on the party" => "for the party" 2013-12-19 18:13:33 -07:00
Tyler Renelle
06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message 
for party / member casts (@wc8 @sabrecat)
 2013-12-17 19:16:31 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle
91e1287d06 APIv2: some finalization of APIv2. Add new routes, re-rigg 
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
 2013-12-15 16:53:06 -07:00
Tyler Renelle
d0b07ba4db apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops) 2013-12-15 14:16:04 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -07:00
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
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Tyler Renelle
1bcdcf8590 [#1444] bug fix 2013-09-09 00:13:11 -04:00
Tyler Renelle
4caec6f737 [#1444] implement delete-tag (incl server route). run tags-cleanup migration 2013-09-09 00:04:02 -04:00
Tyler Renelle
f99b496a29 [#1444] add filters back to use schema. Allow editing of top-level tags 
object in PUT /user, WARNING! We want to get away from that ASAP and
instead have a nested resource for managing tags. Set default task tags
if not present, will revisit after tasks are a subdoc too
 2013-09-08 23:28:34 -04:00
Tyler Renelle
ecc442285b [#1491] add user.loggedin on cron, some comments on remove-staging-users 2013-09-08 21:45:46 -04:00
Tyler Renelle
5c5212eb0e [#1477] add delete account 2013-09-08 15:17:49 -04:00
Tyler Renelle
f250a98fb7 [#1477] add reset account 2013-09-08 15:11:04 -04:00