95e541ae75
Merge branch 'release' into develop
2019-04-01 10:27:24 -05:00
07e4b2c463
fix(event): include stable
2019-04-01 10:24:55 -05:00
e749e42665
feat(event): April Fools 2019
2019-04-01 10:17:05 -05:00
0b82722d27
performance: private messages - API ( #11077 )
...
* paging for inbox
* clean up
2019-03-31 20:52:53 +02:00
0d12686a10
chore(news): Bailey
2019-03-29 13:57:02 -05:00
e58fbcc34c
chore(news): Bailey
2019-03-28 16:23:11 -05:00
fc08b753cd
Merge branch 'release' into develop
2019-03-26 20:23:22 -05:00
50278db1d6
feat(content): Mystery Items March 2019
2019-03-26 20:22:26 -05:00
abb8dc4dc1
Merge pull request #11078 from ChesterSng/11602-display-message-when-social-auth-acc-uses-password
...
Fixes #11062 Display information message when social authentication account uses password to login
2019-03-23 18:36:12 +01:00
2f792d51f8
Merge pull request #11069 from randi2kewl/11047-hall-search-case-insensitive
...
Fixes #11047 Hall search case insensitive
2019-03-23 18:22:53 +01:00
6cc925b535
Merge pull request #10988 from HabitRPG/sabrecat/platform-analytics-tweak
...
Set registered platform on analytics only once
2019-03-23 18:19:15 +01:00
3e45f5af41
Add check for the existence of user's password before attempting to authenticate
2019-03-22 19:30:00 +08:00
928327e02a
feat(content): Magic Hatching Potions March 2019
2019-03-21 16:34:19 -05:00
e0291cf432
feat(event): Spring Fling 2019
2019-03-19 19:52:59 -05:00
d178928c45
fix(analytics): remove excess promise layer
2019-03-18 15:51:49 -05:00
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
2a225c2376
chore(event): end Pi Day
2019-03-15 10:31:08 -05:00
3f04c8abf5
chore(email): next split test iteration
2019-03-14 12:21:46 -05:00
0d374d817c
chore(email): end split test
2019-03-14 07:02:45 -05:00
ae2d50c5b8
feat(pie): immediate pie for new users
2019-03-14 06:51:47 -05:00
8bcd93075b
chore(news): Bailey
2019-03-12 19:29:51 -05:00
6668aae89b
feat(event): Pi Day
2019-03-12 17:10:38 -05:00
201085651b
Merge branch 'release' into develop
2019-03-05 15:44:04 -06:00
9c797e6a54
feat(content): Armoire and Backgrounds March 2019
2019-03-05 15:43:19 -06:00
e6c3d00665
fix(emails): send split-test mailings for social reg accounts
2019-03-05 14:55:45 -06:00
080c4b3e20
Merge branch 'develop' into negue/flagpm
2019-03-03 17:12:11 +01:00
55bd35d7d3
chore(monthly): announce Challenges, end potions
2019-03-01 16:22:19 -06:00
75f6398de2
chore(news): Bailey
2019-02-28 16:02:46 -06:00
45a9d6d17b
ios: cancel invalid subscriptions without errors ( #11035 )
2019-02-27 18:48:13 +01:00
cc766d2260
gcp stackdriver tracing: attach user id ( #11033 )
2019-02-27 18:47:33 +01:00
ccb088e127
Merge branch 'sabrecat/email-split' into release
2019-02-26 17:52:48 -06:00
4a4d48aed8
chore(email): expand to 4 variants
2019-02-26 10:14:55 -06:00
fe04b56ecc
feat(content): February Mystery Items
2019-02-25 16:58:56 -06:00
901d11c61f
fix(logging): move Stackdriver init higher up ( #11025 )
2019-02-24 14:05:59 +01:00
78b49b9c7e
gcp: add stackdriver tracing ( #11024 )
2019-02-23 18:20:09 +01:00
ea5ce64db6
fix(email): use updated slugs
...
and genericize logic for easier tweaking later
2019-02-22 15:47:24 -06:00
10b69986c0
chore(email): split test for welcome message
2019-02-22 15:13:32 -06:00
d267f09d04
Enable Username to be searched in Hall of Heroes - fixes #10972 ( #10980 )
...
* Add if block to search for username if not valid uuid
* Add validationError check
* Modify test case and added test case for username
* Update description of API
* Update Test
* Correct test
* Change placeholder text in heroes.vue
* Refactor code
* Add quotes
* Update hall.js
2019-02-21 13:33:15 -06:00
b21cd4a2b6
feat(content): Mythical Marvels Bundle
...
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
ca2f2ba9ce
Merge branch 'develop' into release
2019-02-14 13:39:52 -06:00
165ca8737b
chore(news): Blog Bailey
2019-02-14 13:25:40 -06:00
f137342d88
fix(analytics): still more registeredThrough cleanup
2019-02-12 16:12:53 -06:00
94db493974
fix(analytics): don't also send prop along with event
2019-02-12 16:07:14 -06:00
ee5c761680
fix(analytics): set reg platform only once
2019-02-12 16:04:14 -06:00
b711c1672b
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:53 -06:00
d675e80555
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:13 -06:00
2c1ca7629d
Merge branch 'release' into develop
2019-02-12 07:35:56 -06:00
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06:00
0cbd6fb4d7
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/header/menu.vue
2019-02-07 19:16:10 +01:00
b35bd18282
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
2019-02-07 18:20:05 +01:00
Sabe Jones