7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
5612b4be6b
Only send "Quest Started" Notifications to users which accepted the quest
2015-06-02 20:02:14 +02:00
264a1e4b16
FIX: Quest Invitation Notification
...
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
5513061d80
Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string
2015-06-01 21:07:09 -05:00
766f3b6057
Merge pull request #5307 from HabitRPG/tutorial
...
Tutorial overhaul
2015-05-31 13:58:12 -07:00
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
91f93df7cc
Merge branch 'develop' into mixpanel
...
Conflicts:
config.json.example
2015-05-31 15:40:21 -05:00
8a6c49f002
feat(weekly-recap): track last date of weekly recap email
2015-05-31 12:10:03 +02:00
c1501db292
Refactor chat related things into own service
2015-05-30 12:08:32 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
a0f3e02f74
Set party.quest.key to null on quest reject and quest cancel
2015-05-27 11:52:53 -04:00
cc3d63b858
Fixed rewards on quest invite modal
2015-05-27 10:05:03 -04:00
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
30ef563534
Merge branch 'negue-anonymizedUser' into develop
2015-05-24 22:04:18 -05:00
abbfdaeda5
Adjust NotGonnaGitUs's PR
...
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
120872ffd2
Merge in develop
2015-05-24 15:46:57 -05:00
0c9576733e
Use moment to set startDate
2015-05-23 15:39:18 -05:00
3a8715f0a9
Set default startDate to today if task does not already have them
2015-05-23 15:29:36 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
4e8918818a
fix(pushNotifications): user null check
...
#5252
2015-05-21 23:24:10 +02:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
e7cd3ff533
Set DailySchema’s ‘frequency’ default to weekly to maintain backwards compatibility.
2015-05-15 20:24:47 -07:00
1ecf608408
Added support in daily tasks for specifying ’every X days’ and ‘every X weeks on specific days of the week’.
...
- shouldDo() now takes the entire task as an input instead of just the ‘repeat’ (days of the week) dictionary.
- the ‘start’ date for a task can be specified (and can also be in the future, in which case it will be greyed out until then.) ‘start’ date also affects ‘every X days’ and ‘every X weeks’.
- no migration code yet.
2015-05-15 20:24:46 -07:00
d7ce151500
Add translatable strings
2015-05-14 21:56:16 -05:00
023458b6e5
Add test for getting push notification when gifted a subscription
2015-05-13 19:31:26 -05:00
3cbd5fd9ff
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-13 19:11:57 -05:00
89d1d63b24
Merge pull request #5198 from SabreCat/pet-skins
...
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
05f6e5e14d
fix(flags): correctly send flag reports emails
2015-05-13 20:08:46 +02:00
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
4050e9ad0c
Fix guilds not loading ＼(^ω^＼)
2015-05-12 22:28:06 -05:00
8a4abc632f
Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift
2015-05-12 20:18:06 -05:00
9a84503aed
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-12 19:06:34 -05:00
ff41a2c240
Refactor group tests
2015-05-12 08:08:55 -05:00
d448ca3ac5
fix(groups): do not try to add members to a party when it does not exists
2015-05-11 22:13:31 +02:00
ae8b170446
fix(emails): remove base url from server
2015-05-11 20:44:52 +02:00
30fd8e26e6
revert last 2 commits
2015-05-11 17:02:36 +02:00
e966de7bf0
feat(emails): add field to keep track of weekly recap emails
2015-05-11 16:54:44 +02:00
fc1f6ba0b9
fix(emails): always use main site as base url
2015-05-11 15:43:35 +02:00
6d025330e9
Clean up spaces; remove console log
2015-05-10 16:48:48 -05:00
95a90723c8
Merge branch 'develop' into negue-WIP-Push-notifications
2015-05-10 16:27:58 -05:00
8badc7d1a9
Add coupon api tests
2015-05-10 14:54:45 -05:00
2bc13ea69a
delete newMessages
2015-05-10 21:26:55 +02:00
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02:00
f402e21a5c
delete more properties
2015-05-08 19:58:54 +02:00
1f674aab41
/user/anonymized - return user json without personal data
2015-05-08 18:52:29 +02:00
30546ccf12
remove extraneous comment
2015-05-07 17:51:51 -05:00
Blade Barringer