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

2026 Commits

Author SHA1 Message Date
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 e21230f8c2 Revert "small fix" 
This reverts commit f3401e72c2.
 2014-09-30 21:42:48 -06:00
Tyler Renelle 0fa7277cf0 Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have" 
This reverts commit a6631f5d36.
 2014-09-30 21:28:47 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle a6631f5d36 fix(tasks): tmp fix for #4066, minimize:false on tasks so they have 
tags:{} default empty object
 2014-09-27 15:53:42 -06:00
Tyler Renelle f3401e72c2 small fix 2014-09-26 11:24:29 -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
Tyler Renelle 562f593c8f fix(spells): temp fix to #4067, for some reason _v is undefined after 
casting spells?
 2014-09-24 13:07:40 -06: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
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
Tyler Renelle 09e43a3560 Merge pull request #4024 from Alys/seedjs 
comment-out seed.js because it's no longer required
 2014-09-12 13:39:12 -06:00
Alice Harris 85498d8257 adjust comments 2014-09-12 13:12:42 +10:00
Alice Harris 1503924a2e comment-out seed.js because it's no longer required - https://github.com/HabitRPG/habitrpg/issues/3852#issuecomment-55334572 2014-09-12 13:09:08 +10: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 801753b37a add Cancel option to API for quests that have not been started (invitation stage) 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
Matteo Pagliazzi 81b96b0f7e fix(i18n): add support for latin american spanish 2014-08-18 19:17:40 +02:00
Matteo Pagliazzi 15641b5f37 fix(i18n): add moment support for chinese 2014-08-16 20:16:44 +02:00
Tyler Renelle 39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just 
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
 2014-08-15 18:13:59 -06:00
Adrien Lemaire e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
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