65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
e38f8bf4ef
amazon payments: wip
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
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
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
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
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
e93cb817be
Disable NR to check memory issues
2015-06-25 19:21:45 -04:00
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
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
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
95f1c01b01
Removed more variable assignments that were never getting set
2015-06-20 16:54:33 -05:00
68f764bca6
Removed var assignment that is never reached
2015-06-20 16:50:48 -05:00
02acad9dfc
Removed unused 'armorSet' attribute in user model
2015-06-20 01:38:47 -04:00
ddc8508816
Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo
2015-06-19 23:00:18 -05:00
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e
2015-06-18 22:19:35 +10:00
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
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
b12ee725f4
incrementally enable weekly recap emails
2015-06-16 20:26:58 +02:00
95b481b31d
use discriminator field to distinguish users with weekly recap emails enabled
2015-06-16 17:51:24 +02:00
a82270fbaa
feat(weekly-recap): enable for new users who sign in
2015-06-16 11:15:03 +02:00
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
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
39adff0e2c
improve error reporting for iOS IAP
2015-06-15 13:09:22 +02:00
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
bb2f97e802
Added android tests for iap
2015-06-14 18:35:19 -05:00
5b6afde475
Remove console.logs
2015-06-14 18:08:00 -05:00
cd45fc06c6
Collapse return and res.json statements
2015-06-14 18:07:23 -05:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
6997783037
Check that iOS IAP is of correct type
2015-06-14 15:59:43 +02:00
7ccf246119
Enable authentication for iOS IAP route
2015-06-14 15:28:30 +02:00
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
8dde41d18a
Wrie and refactor guild tests
2015-06-10 23:39:46 -05:00
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
3a3d5b3731
Merge pull request #5353 from gisikw/only-mixpanel-prod
...
Server-side mixpanel should only load in a production env
2015-06-10 08:52:08 -05:00
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
1d18f53a67
Merge branch 'develop' into blade-Finish_weeklies_pr
...
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
c2614c0447
Moved if statement to assign task completion before saving task to user
2015-06-09 18:48:03 -05:00
9fa39d99ae
perf(i18n): load only the language preference, not the whole user
2015-06-07 14:27:07 +02:00
58a816d584
Server-side mixpanel should only load in a production env
2015-06-05 20:54:47 -04:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
90015134da
Fixed 'group.leader.profile.name' issue and changed all instances of 'group.leader' to 'group.leader._id'
2015-06-04 15:18:09 -04:00
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
Matteo Pagliazzi