Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,106 Commits 64 Branches 1,256 Tags
3ba057258f566f4f7b40407c523a9904a8b32a67
Commit Graph

482 Commits

Author SHA1 Message Date
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
Tyler Renelle fad4e5bb02 feat(dilatory): model updates for tavern bosses 2014-06-25 13:34:45 -06:00
3onyc 5025c4bac6 Implement "Change username" feature 2014-06-14 20:54:07 +02:00
Tyler Renelle b7cf71773a fix(quests): refunding scrolls. add .exec() to User.update() without callback 2014-06-08 18:28:04 -06:00
Phillip Thelen 3aa8c885cf remove callback from user update 
This way it continues to evaluate and also execute the group update.
 2014-06-08 18:37:43 +02:00
Phillip Thelen e01ff99610 Only refund quest scroll to leader if quest was active 
otherwise quest leader gets more quest scrolls than they had to begin with.
 2014-06-08 16:08:14 +02: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
Tyler Renelle af74ff9da0 feat(chat): allow banning problem users from chat rooms 2014-05-14 16:01:39 -06:00
Tyler Renelle 35ef88c6c0 fix(quests): temporarily send error email on questStart (if already 
started), see #3451. Revert later
 2014-05-14 10:29:14 -06:00
Tyler Renelle 9a4e8d38b4 fix(quests): don't allow questStart on already-started quests 2014-05-14 10:21:15 -06:00
Matteo Pagliazzi 4ac10585bb fix(i18n): use everywhere i18n.getUserLanguage middleware - part 2 2014-05-12 16:56:39 +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 70ecad3c65 fix(i18n): user creation does not override preferences 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi b887127fb0 refactor(i18n): refactor & fix 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi 62637cf676 refactor(i18n): add comments 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi 12fa87ef31 refactor(i18n): add language detection to new user 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Tyler Renelle b0eb12bb5f feat(subscriptions): allow one month after sub start-date before it's terminated. Fixes #3180 2014-05-06 09:18:44 -06: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
Tyler Renelle 6d00289d99 Merge pull request #3304 from jbutz/todo_archive_flag_ui 
feat(archive_todo): Update batchUpdate
 2014-05-03 21:44:24 -06:00
Matteo Pagliazzi a9f80bd860 fix(notifications): check for group id to be sent with seenMessage 2014-04-22 14:19:56 +02: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 1067c82418 feat(convention): temporary solution to disable dailies for signups 
during conventions (have to be on con.habitrpg.com)
 2014-04-18 08:58:45 -07:00
Tyler Renelle 8d4652b6b9 feat(coupons): better formatting for wondercon 2014-04-17 21:38:38 -07:00