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

411 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9ccf2c8d11 upgrade moment 2014-10-07 21:30:00 +02:00
Tyler Renelle 57a5a62d7c fix(memleak): possible improvements to leaked vars #4079 2014-10-06 17:59:07 -06:00
Matteo Pagliazzi fda93773c7 feat(emails): add subscription cancelled email 2014-10-06 20:03:55 +02:00
Tyler Renelle 0bb1de680c fix(challenges): since we're setting {minimize:false} on tasks, don't 
overwrite user tasks.*.challenges in the _.merge()
 2014-10-03 14:34:58 -06:00
Matteo Pagliazzi 704a8658f3 require moment where necessary 2014-10-03 19:38:18 +02:00
Matteo Pagliazzi 0f2c773bcb Merge pull request #4058 from Feriority/codeclimate_improvements 
small payments refactor for better codeclimate
 2014-10-03 17:44:15 +02:00
Tyler Renelle 4925882804 Merge pull request #4028 from Verabird/challengecvsalt 
Make export to csv button on challenges export all tasks (issue #2947)
 2014-10-02 23:40:41 -06:00
Tyler Renelle 6ab1e70440 Revert "Revert "perf(challenges): WIP" (see #4085)" 
This reverts commit efbf151c11.
 2014-10-02 23:23:39 -06: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
Tyler Renelle efbf151c11 Revert "perf(challenges): WIP" (see #4085) 
This reverts commit 632726fe02.

Conflicts:
	src/controllers/challenges.js
 2014-09-25 20:47:44 -06:00
Tyler Renelle 351e220b83 feat(mystery): 201409 2014-09-24 23:15:46 -06:00
Tyler Renelle 632726fe02 perf(challenges): WIP 2014-09-24 21:50:14 -06:00
Aneesh Goel 0dc20b4b08 small payments refactor for better codeclimate 2014-09-20 14:53:14 -07:00
Matteo Pagliazzi 292d2455ba fix(emails): try multiple attemps (delay not avalaible in api because in not yet released version) 2014-09-18 18:43:55 +02:00
Alice Harris f6e1e091f4 Merge pull request #4010 from negue/group_returnMembers 
return group members on questAccept / questAbort
 2014-09-18 18:39:38 +10:00
Matteo Pagliazzi 900d8e7dfa fix(emails): re-add emails for payments, @lefnire should be ok now I had used req.user but it did not exist. There is a way to test payments locally? Because even now I can not verify it is really ok 2014-09-17 15:55:19 +02:00
Tyler Renelle ad146d6d88 fix(payments): revert payments.js to 5cc4c60, see #2454 cc @paglias 2014-09-16 21:31:52 -06:00
negue c348d72142 fix payments.js compile 2014-09-15 21:20:41 +02:00
Matteo Pagliazzi 3118508e9c fix(emails): send only if email found 2014-09-14 19:35:51 +02:00
Matteo Pagliazzi fca45a3c0b feat(emails): add emails on signup, subscription begin and donation 2014-09-13 14:28:11 +02:00
Tyler Renelle 84d1bf9e27 tmp(challenges): remove STW chal from tavern, revert with 4c6bcb5444 2014-09-12 19:15:11 -06:00
Vera Pavel 70a409cb4a fix challenge export to csv to export all tasks (issue #2947) 2014-09-12 20:44:51 -04:00
Vera Pavel 35a8351739 Revert "making export to csv export everything (issue #2947)" 
This reverts commit bf28019465.
 2014-09-12 17:51:22 -04:00
Tyler Renelle 4c6bcb5444 tmp(challenges): temporarily remove STW challenge from the list until we 
can fix the bug
 2014-09-12 14:13:06 -06:00
Vera Pavel bf28019465 making export to csv export everything (issue #2947) 2014-09-11 11:09:12 -04:00
Negue cc17c3cfef return group members on questAccept / questAbort 2014-09-09 18:35:32 +02:00
Alice Harris b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris 0e163034cf semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-09 06:00:23 +10:00
Tyler Renelle 6229b2c79e perf(auth): exclude unecessary auth fields 2014-09-02 15:54:56 -06:00
Tyler Renelle 772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Negue 8fa565e9a0 get a list of buyable gear 2014-08-25 18:23:04 +02:00
Alice Harris 1ca981d90a allow notification icon to go grey by deleting seen message data instead of setting to false 2014-08-23 14:51:34 +10: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
Matteo Pagliazzi 6340312695 fix(fbAuth): get user email @lefnire this should be all we need but not having the keys i can not test before going live 2014-08-19 04:41:04 +02:00
Adrien Lemaire e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Tyler Renelle a2df27d7f2 fix(forgot-password): allow aliases (x+y@z.com) in email lookup, fixes #3805 2014-07-29 12:58:31 -06:00
Tyler Renelle a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out 2014-07-25 12:14:48 -06:00
Tyler Renelle 6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness 2014-07-25 12:14:48 -06:00
Tyler Renelle 5c309444e0 fix(coupons): fix to limit 2014-07-22 18:35:55 -06:00
Tyler Renelle ca31d46e0e tmp(coupons): just export c._id to csv 2014-07-21 22:39:36 -06:00
Tyler Renelle 439828d2b1 feat(coupons): update wording @veeeeeee 2014-07-21 22:27:25 -06:00
Tyler Renelle dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall 5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Tyler Renelle acc874c60d Merge pull request #3597 from 3onyc/feature/username-change 
Implement "Change username" feature
 2014-07-19 16:48:20 -06: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 80dbc1111e fix(quests): when leaving group, if leader or quest.leader is leaving, 
re-assign to most senior member. #3709
 2014-07-11 16:29:42 -06:00
Tyler Renelle a8b2b32557 refactor(groups): cleanup leave-group code 2014-07-11 14:43:11 -06:00
Tyler Renelle 327482f0b0 fix(password): case-insensitive emails in forgot-password 2014-07-10 21:11:58 -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