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
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
93290ec6d5
Merge branch 'release' into develop
2019-02-05 15:44:40 -06:00
6ab3bac96c
feat(content): Armoire and BGs
2019-02-05 15:42:33 -06:00
f590c485dc
Merge branch 'release' into develop
2019-02-04 16:52:53 -06:00
0910f65fc0
chore(news): Bailey
2019-02-04 16:52:17 -06:00
dddd8269b6
Merge branch 'release' into develop
2019-02-02 13:04:35 -06:00
5b329db357
chore(event): end Winter Wonderland
2019-02-02 13:03:04 -06:00
c1cad5c0a9
Merge branch 'release' into develop
2019-01-31 17:12:21 -06:00
b1f42dcac9
feat(content): Habitica Birthday 2019
2019-01-31 17:10:56 -06:00
c86da9783b
Merge branch 'release' into develop
2019-01-30 09:06:42 -06:00
00a686dcf6
feat(content): subscriber items Jan 2019
2019-01-28 16:10:22 -06:00
2f699e24d7
update test to use the correct author_name format
2019-01-27 19:05:00 +01:00
faa0611ab2
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
2019-01-27 18:14:51 +01:00
08c8f26b80
Merge branch 'develop' into 10954-wikiafix
2019-01-26 18:03:50 +00:00
87923b7f0d
Add username to challenge csv export ( #10956 )
...
- Adds the member's username to the challenge csv
- Updates to unit tests
- Issue #10955
Supports the ability for challenge owners to judge challenge winners
after the added functionality enabling users to modify their name
(display name). The added field ties the user to their results by
their username.
2019-01-26 18:44:48 +01:00
5fac4a943c
chore(news): Bailey
2019-01-24 13:35:32 -06:00
5d0be7bc72
Merge branch 'release' into develop
2019-01-24 13:14:19 -06:00
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00:00
6ea4d96830
add extra condition to skip ssl check
2019-01-23 17:19:57 +01:00
04a7fd25a6
allow skipping SSL check with secret key ( #10962 )
2019-01-23 17:10:11 +01:00
f8d799d55c
chore(news): Bailey
2019-01-18 15:13:25 -06:00
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
40060e8ff5
update ssl check
2019-01-18 11:43:02 +01:00
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
962662fe7c
chore(news): Bailey
2019-01-14 12:38:35 -06:00
f63d2e47f0
do not show "Notification not found" error messages ( #10931 )
...
* start fixing #10391
* do not show snackbars for notifications not found
* revert message changes
* update tests
* add new test
* fix property
2019-01-13 11:43:02 +01:00
Sabe Jones