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

207 Commits

Author SHA1 Message Date
Kevin Gisi c82e5a885d Put memory check back in 2015-07-12 13:51:22 -04:00
Kevin Gisi be420a67a0 Remove apdex check from middleware until NR is back 2015-07-12 13:39:16 -04:00
Blade Barringer 305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth 
maxHealth refactor
 2015-07-11 00:18:15 -05:00
Blade Barringer cdcc085530 Adjust test 2015-07-10 23:21:23 -05:00
TheHollidayInn acb82f99ce Remove user's group msg notification when they are kicked from the group 2015-07-10 22:39:17 -05:00
Matteo Pagliazzi 2fb25207bb fix(amazon-payments): use lastBillingDate 2015-07-05 11:17:40 +02:00
Will 9bcb3b5cbe update model maxHealth 2015-07-03 22:22:28 -07:00
Will 512d248255 update getUser to use shared.maxHealth 2015-07-03 22:22:28 -07:00
Matteo Pagliazzi fb912313b9 fix(amazon-payments): handle declined payments 2015-07-03 16:54:57 +02:00
Matteo Pagliazzi 313ac91020 improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true 2015-07-03 14:56:19 +02:00
Sabe Jones d4b5620ada Merge branch 'sabrecat/summer-splash' into develop 2015-07-01 13:13:23 -05:00
Sabe Jones 25dd82ffa0 feat(event): Summer Splash cont'd 
Summer backgrounds, the Seafoam transformation item, and announcements for same.
 2015-07-01 13:11:53 -05:00
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 78cca423f0 feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi e38f8bf4ef amazon payments: wip 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi a377501f64 feat(amazon-payments): wip on donations 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi b0643e7177 WIP: start working on amazon payments 2015-06-30 17:59:30 +02:00
Alys 03d1f12a7c fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518 2015-06-29 19:42:22 +10:00
Blade Barringer b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Blade Barringer 5c4732304a Merge pull request #5504 from Alys/cid-2015-06-25 
prevent challenge tasks being deleted when challenge ID has been lost
 2015-06-27 17:07:10 -05:00
Alys 0fc14f129d prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466 2015-06-27 14:19:40 +10:00
Kevin Gisi e93cb817be Disable NR to check memory issues 2015-06-25 19:21:45 -04:00
Sabe Jones 8b04768b37 fix(analytics): Resolve errors 
Should correct 400 Bad Request errors with Amplitude and cannot read undefined errors in tmp_static_front.
 2015-06-23 09:30:18 -05:00
Blade Barringer 54509d234c Clean up groups controller 
* Put nullifying variables back in per https://github.com/HabitRPG/habitrpg/pull/5437/files#r32896108
* converted questStart to a hoisted function
 2015-06-21 14:02:40 -05:00
Blade Barringer 19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -05:00
Blade Barringer 95f1c01b01 Removed more variable assignments that were never getting set 2015-06-20 16:54:33 -05:00
Blade Barringer 68f764bca6 Removed var assignment that is never reached 2015-06-20 16:50:48 -05:00
hairlessbear 02acad9dfc Removed unused 'armorSet' attribute in user model 2015-06-20 01:38:47 -04:00
Blade Barringer ddc8508816 Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo 2015-06-19 23:00:18 -05:00
Alys 07b41d16b6 Revert "Revert "new GSalvadi audio theme, created by NomindTR"" 
This reverts commit 30a091e14e.
 2015-06-18 22:19:35 +10:00
Alys 30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
Alys 910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Matteo Pagliazzi b12ee725f4 incrementally enable weekly recap emails 2015-06-16 20:26:58 +02:00
Matteo Pagliazzi 95b481b31d use discriminator field to distinguish users with weekly recap emails enabled 2015-06-16 17:51:24 +02:00
Matteo Pagliazzi a82270fbaa feat(weekly-recap): enable for new users who sign in 2015-06-16 11:15:03 +02:00
Alys 14983cb996 replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet 2015-06-16 13:10:49 +10:00
Blade Barringer ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth 
Removed 'freeRebirth' from user model and everywhere else in codebase
 2015-06-15 08:00:18 -05:00
Phillip Thelen 39adff0e2c improve error reporting for iOS IAP 2015-06-15 13:09:22 +02:00
Alys b6b2873faf add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015 2015-06-15 20:33:14 +10:00
Blade Barringer bb2f97e802 Added android tests for iap 2015-06-14 18:35:19 -05:00
Blade Barringer 5b6afde475 Remove console.logs 2015-06-14 18:08:00 -05:00
Blade Barringer cd45fc06c6 Collapse return and res.json statements 2015-06-14 18:07:23 -05:00
Blade Barringer 14fe29dd4a Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-14 16:33:38 -05:00
Phillip Thelen 6997783037 Check that iOS IAP is of correct type 2015-06-14 15:59:43 +02:00
Phillip Thelen 7ccf246119 Enable authentication for iOS IAP route 2015-06-14 15:28:30 +02:00
hairlessbear 4bf1b94c1d Removed 'freeRebirth' from user model and all uses in codebase 2015-06-13 14:18:03 -04:00
Blade Barringer 54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-11 19:47:46 -05:00