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

1987 Commits

Author SHA1 Message Date
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Alice Harris a8ad9f89e8 reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-07 13:50:29 +10:00
Tyler Renelle 33b2e8c4fe fix(flower): remove default on flower for now, #1529 @Alys 2014-08-05 13:08:40 -06:00
Matteo Pagliazzi 40fb17fdaf fix(console): remove console.log 2014-08-03 18:32:25 +02:00
Matteo Pagliazzi 1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Alice Harris 2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 13:20:51 +10:00
Jeremy Lee 79bd088589 add correct styling to moderator names in message above Tavern chat 2014-08-02 07:28:29 +10: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 bf29a19d33 chore(errors): allow disabling error emails (getting too many 
VersionError, which maxes our limit and people can't use "Forgot
Password" feature)
 2014-07-21 19:09:05 -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 016d99a4a7 fix(dilatory): dont' modify original user.progress on world boss dmg, 
fixes #3737
 2014-07-14 20:52:37 -06:00
Tyler Renelle 7dfce54454 Revert "fix(quests): prevent very high damage for all quests" (@lemoness 
@deilann - now it's just world boss, capped 900)

This reverts commit 89369e21a3.
 2014-07-12 16:13:27 -06:00
Tyler Renelle 89369e21a3 fix(quests): prevent very high damage 2014-07-12 15:16:32 -06:00
Tyler Renelle 860b3acc52 fix(dilatory): tmp fix to prevent high damage #3712 2014-07-12 15:06:07 -06:00
Tyler Renelle 496618c665 fix(quests): don't reset quest progress when world boss defeated 2014-07-12 14:32:12 -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 b71767d1d8 Merge pull request #3686 from vIiRuS/apiDoc 
document content of _tmp on task up/down fixes #3012
 2014-07-07 13:59:31 -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
Phillip Thelen de7bfce953 document content of _tmp on task up/down fixes #3012 2014-07-06 15:01:46 +02:00
Matteo Pagliazzi 0efb74eaed fix(swagger): rollback unwanted changes 2014-07-03 18:51:40 +02:00
Matteo Pagliazzi e72a6668fc fix(swagger): correct API docs, fix #3679 2014-07-03 18:44:56 +02:00
Tyler Renelle e5c002bcdb feat(chat): dynamic list of tavern mods (see http://goo.gl/9XhIZ6) 2014-06-29 16:20:38 -06:00
Tyler Renelle 14c6019258 fix(dilatory): misc chat fixes for better formatting of neglect strikes 2014-06-25 21:35:22 -06:00
Tyler Renelle 9f1035c317 feat(dilatory): scene damage + boss def/str. bug fixes, tests 2014-06-25 14:12:30 -06:00
Tyler Renelle 79df201c66 feat(dilatory): load tavern boss on each cron, removing caching for now (was too buggy) 2014-06-25 13:34:45 -06:00
Tyler Renelle 850f67cd29 feat(bosses): add limit-break for bosses 2014-06-25 13:34:45 -06:00
Tyler Renelle fad4e5bb02 feat(dilatory): model updates for tavern bosses 2014-06-25 13:34:45 -06:00
Tyler Renelle 1a7530d6e4 Merge pull request #3636 from vIiRuS/fixApiDoc 
Fix api documentation
 2014-06-21 13:19:43 -06:00
Phillip Thelen c6d24853f0 Fix api documentation 
correctly display swagger-ui and change old api documentation
 2014-06-21 19:31:52 +02:00
Phillip Thelen 8175f01f23 create new static view for news 2014-06-21 18:38:30 +02:00
3onyc 5025c4bac6 Implement "Change username" feature 2014-06-14 20:54:07 +02:00
Tyler Renelle eb5d47f604 chore(angular): upgrade to angular 1.3.0-beta.11 2014-06-11 15:58:07 -06:00
Tyler Renelle e3aeaab641 feat(backgrounds): i18n for backgrounds 2014-06-10 18:32:21 -06:00
Tyler Renelle c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06: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
Tyler Renelle 38a2c8d0f4 Merge pull request #3535 from OverloadUT/fix-spells-mana-check 
API rejects spell cast if not enough mana
 2014-06-06 15:56:34 -06:00
Tyler Renelle 5a73923d0a Merge pull request #3540 from vIiRuS/patch-1 
Update API Parameter documentation for Equip call
 2014-06-04 14:56:28 -04:00
deilann f290840995 Merge pull request #3554 from Gaelan/dry_routes 
DRY up src/routes/pages.js.
 2014-06-03 23:29:03 -07:00