93290ec6d5
Merge branch 'release' into develop
2019-02-05 15:44:40 -06:00
e6bd67a53a
chore(sprites): compile
2019-02-05 15:42:46 -06:00
6ab3bac96c
feat(content): Armoire and BGs
2019-02-05 15:42:33 -06:00
ee97da1112
Merge branch 'release' into develop
2019-02-05 17:49:22 +00:00
3c948beb84
chore(i18n): update locales
2019-02-05 17:43:50 +00: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
fdc0e0f5fe
Merge branch 'release' into develop
2019-02-02 13:11:25 -06:00
5b7c4bf03f
fix(event): end Cake
2019-02-02 13:10:56 -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
0ac976e8c1
chore(sprites): compile
2019-01-31 17:11:44 -06:00
b1f42dcac9
feat(content): Habitica Birthday 2019
2019-01-31 17:10:56 -06:00
ed8bd84257
Merge branch 'release' into develop
2019-01-30 09:14:11 -06:00
e294ed836d
fix(subscription): correct mystery set
2019-01-30 09:13:17 -06:00
c86da9783b
Merge branch 'release' into develop
2019-01-30 09:06:42 -06:00
767f844cea
chore(sprites): compile
2019-01-28 16:10:38 -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
8904c58510
Make profile modal nav tabs better responsive ( #10946 )
...
* Make profile modal nav tabs better responsive
Remove offset & specific width and use flexbox centering
Fixes #10944
* Change profile modal nav height to min-height
So that height changes accordingly if nav elements wrap to second row
2019-01-26 18:59:17 +01:00
e28992060c
Staff sweetness duplicated two handed description ( #10936 )
...
* Creating default encryption test to improve coverage
* Revert "Creating default encryption test to improve coverage"
This reverts commit 5d5f8efabb
2019-01-26 18:48:21 +01:00
df860c9401
fix(quests): repair negative quest scrolls on purchase ( #10953 )
2019-01-26 18:46:52 +01: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
84cafc4081
Special Pets that you don't own will only show GreyPaw print | Fixes #10866 ( #10949 )
...
* Added isSpecial function to determine wether a pet is special or not
* Special pets that you don't own show only grey pawprint
* PetEgg HatchingPotion icon only visible if the pet is not special
2019-01-18 14:58:38 -06:00
d77a17112c
setting new password using Return key ( #10937 )
2019-01-18 14:58:18 -06:00
40060e8ff5
update ssl check
2019-01-18 11:43:02 +01:00
fd125352b7
fix(g1g1): remove additional banner
2019-01-16 10:22:00 -06:00
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
c66d2cb469
refactor properties - added another "inbox" check
2019-01-14 23:17:26 +01: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
476131835d
chore(i18n): update locales
2019-01-11 19:59:54 +00:00
8237b7f2de
chore(news): Bailey
2019-01-11 13:37:58 -06:00
6ee2b3690a
chore(i18n): update locales
2019-01-10 23:28:33 +00:00
8c51f36784
chore(i18n): update locales
2019-01-09 01:35:24 +00:00
d35f81cdae
chore(sprites): compile
2019-01-08 19:30:49 -06:00
1d1b25391f
feat(content): customizations and dinosaurs
2019-01-08 19:30:41 -06:00
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
166da3c2f8
chore(i18n): update locales
2019-01-04 20:04:12 +00:00
23b72a673d
chore(sprites): compile
2019-01-04 13:59:27 -06:00
Sabe Jones