Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,594 Commits 64 Branches 1,256 Tags
2cecce5eec648be6d35549e3cbcac7942e7ef906
Commit Graph

154 Commits

Author SHA1 Message Date
Tyler Renelle cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop 
Conflicts:
	src/controllers/user.js
 2014-11-16 15:24:15 -08:00
Tyler Renelle 5fab3881a2 feat(invite-friends): allow specifying inveter's name (#4238 @lemoness) 2014-11-13 16:33:09 -07:00
Matteo Pagliazzi 02328fcf58 fix(invite-friend): change variables 2014-11-13 20:11:43 +01:00
Tyler Renelle 0da391df59 fix(intive-friends): only invite set invitation if user hasn't already 
been invited to a party
 2014-11-13 11:42:56 -07:00
Tyler Renelle 2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Tyler Renelle 9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06:00
Tyler Renelle 2a8128872d fix(moment): fix deprecated warnings, use updated moment syntax 2014-10-08 17:37:30 -06:00
Tyler Renelle 57a5a62d7c fix(memleak): possible improvements to leaked vars #4079 2014-10-06 17:59:07 -06:00
Matteo Pagliazzi 704a8658f3 require moment where necessary 2014-10-03 19:38:18 +02:00
Tyler Renelle ead42e7cef fix(memleak): temp, wonky fix to #4079 . Sets closure vars user to 
null in api.batchUpdate(). More will be needed
 2014-10-02 16:38:01 -06:00
Negue 8fa565e9a0 get a list of buyable gear 2014-08-25 18:23:04 +02:00
Tyler Renelle 88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop 
Conflicts:
	public/js/directives/directives.js
 2014-08-19 15:00:36 -06:00
Tyler Renelle ba8cda2e51 Merge pull request #3425 from denis-sokolov/user-findtask-patch 
chore(user): tiny cleanup in findTask function
 2014-08-19 13:12:51 -06:00
Adrien Lemaire e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Tyler Renelle 34236536df feat(admin): allow admins to update user's items (restoring lost items, 
granting quest scrolls, etc). @deilann :)
 2014-07-17 14:09:39 -06:00
Tyler Renelle 973732421a fix(delete account): allow deleting account after they've canceled 
subscription, before it terminates
 2014-07-07 13:37:16 -06:00
Tyler Renelle fad4e5bb02 feat(dilatory): model updates for tavern bosses 2014-06-25 13:34:45 -06:00
Greg Laabs 6b7925b227 API rejects spell cast if not enough mana 
Fix #3493 “API does not validate if user has enough mana”
 2014-05-26 09:28:23 -07:00
Tyler Renelle e77f667a98 Revert "feat(todo_archive)" (see http://goo.gl/mCygbz) 2014-05-15 23:47:38 -06:00
Matteo Pagliazzi 01c9307cd1 fix(i18n): fix /content api call 2014-05-15 23:15:57 +02:00
Denis Sokolov 611a385f23 chore(user): tiny cleanup in findTask function 2014-05-07 19:55:52 +09:00
Matteo Pagliazzi 57e93d6623 fix(i18n): misc 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi ddf5ad8ec9 fix(i18n): pass req.language when using batchUpdate 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Tyler Renelle 83fa2716a6 Merge pull request #3426 from denis-sokolov/user-cleanup-double-payment 
chore(user): cleanup payments configuration, left behind in 440a2e288
 2014-05-06 09:12:38 -06:00
Denis Sokolov 2f92171aa4 chore(user): cleanup payments configuration, left behind in 440a2e288 2014-05-06 21:49:12 +09:00
Denis Sokolov 8888322ded chore(validator): update to 3.11.2 2014-05-05 19:22:34 +09:00
Jason Butz 601e94cb43 feat(archive_todo): Update batchUpdate 
This is part 3 of habitrpg#3062. It makes batchUpdate look at the archived flag
not the completed date

Part 1: habitrpg/habitrpg#3302
Part 2: habirrpg/habitrpg-shared#198
 2014-04-18 12:36:22 -04:00
Tyler Renelle 56ab7384cf feat(premium): disallow deleting accounts until they've cancelled 
payment plans
 2014-04-14 23:07:30 -06:00
Tyler Renelle 440a2e2884 refactor(subscriptions): move all payments stuff to it's own controller 2014-03-24 21:51:20 -06:00
Tyler Renelle 0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle b686b56282 feat(subscriptions): refactor subscription & gem-purchase code, misc bug fixes 2014-03-24 20:47:22 -06:00
Tyler Renelle 10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle d1a2fbbbd9 feat(subscriptions): implement partial paypal-recurring. It's having issues with cookies 2014-03-24 20:47:10 -06:00
Tyler Renelle 16977bc108 fix(api): sortTask positive on score route definition, not going 
next(). Fixes #3118
 2014-03-21 20:28:41 -06:00
Tyler Renelle 13094c127a feat(premium): unlock mystery items within timeframe of sub sign-on 2014-02-22 21:43:44 -08:00
Tyler Renelle a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
Tyler Renelle a50f025132 feat(donations): add txnCount for each purchase 2014-02-18 17:17:56 -08:00
Tyler Renelle 78fcdd20c9 chore(tests): tests to go along with #1883 challenges fix 2014-02-14 20:37:16 -07:00
Tyler Renelle 33b326b596 fix(challenges): better handling of deleted challenges. If !chal, break the task.challenge. Move the function into userController#score so we have access to next, etc. fixes #1883 2014-02-14 19:49:34 -07:00
Tyler Renelle fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle 9217b5174a feat(event-tracking): pass ga to server user.ops 2014-02-11 17:49:19 -07:00
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