Alys
bde4eafc05
add mountText for all drop eggs and quest eggs ( #8678 )
...
I've checked that all these added strings do exist in locales/en/content.json
2017-04-22 14:00:18 -05:00
Travis
5a2ba27808
Creating api for gifting Hall Of Heroes Item Reference ( #8118 )
...
* Creating specific api to vend item reference for gifting items to a user through the hall of heroes. closes #8100
* removed 'When in doubt, ask Tyler' from the hall of heroes line
* Moving hall of heroes item path call from server side to client side
* updating let to var
* Addressing PR comments
2017-04-22 13:57:41 -05:00
Keith Holliday
024268a51e
Added wintery skins to content ( #8645 )
...
* Added wintery skins to content
* Removed features json
* Fixed some name issues
2017-04-22 13:54:57 -05:00
MathWhiz
f7281e71e8
Change icon for NPC achievement ( #8628 )
...
* Change icon for NPC achievement
* Add npc icon
2017-04-22 13:52:45 -05:00
SabreCat
91438aff90
Merge branch 'release' into develop
2017-04-20 22:21:33 +00:00
Sabe Jones
0c3f40716b
3.87.0
2017-04-20 21:29:01 +00:00
Sabe Jones
ec306b614a
chore(news): Bailey
2017-04-20 20:02:37 +00:00
Sabe Jones
a6d8beff9d
chore(i18n): update locales
2017-04-20 19:48:09 +00:00
SabreCat
bebf03ee91
chore(sprites): compile
2017-04-20 19:39:19 +00:00
SabreCat
2ea35c673a
fix(quest): strings and fetch items
2017-04-20 19:35:16 +00:00
SabreCat
90d15b18f8
feat(content): Fairy Potions, Mistiflying Quests
2017-04-20 19:01:51 +00:00
Sabe Jones
91ed55cf66
Release mergeback v3.86.0 ( #8685 )
...
* 3.85.0
* New User Tasks for Mobile (#8682 )
* feat(mobile): different default tasks
* fix(linting): missing space
* fix(user): correct client type logic
* test(integration): tasks by platform
* fix(test): remove only
* test(user): deeper checks on tasks
* refactor(test): whitespace for readability
* feat(subs): Jackalope Pets (#8684 )
* chore(sprites): compile
* chore(i18n): update locales
* 3.86.0
2017-04-18 19:23:24 -05:00
Sabe Jones
93aa37a164
3.86.0
2017-04-18 22:57:50 +00:00
Alys
4275da0a2e
fix Shiny Seeds info about achievement (not given to caster) ( #8679 )
...
Ref: https://habitica.slack.com/archives/C02RK7DKF/p1492032261365388
2017-04-19 08:56:15 +10:00
Sabe Jones
f782687609
chore(i18n): update locales
2017-04-18 22:50:18 +00:00
Sabe Jones
164fb69108
chore(sprites): compile
2017-04-18 22:43:33 +00:00
Sabe Jones
b1678e1769
feat(subs): Jackalope Pets ( #8684 )
2017-04-18 17:38:53 -05:00
Sabe Jones
7f8851c72b
New User Tasks for Mobile ( #8682 )
...
* feat(mobile): different default tasks
* fix(linting): missing space
* fix(user): correct client type logic
* test(integration): tasks by platform
* fix(test): remove only
* test(user): deeper checks on tasks
* refactor(test): whitespace for readability
2017-04-18 15:50:50 -05:00
Mateus Etto
d9f48dcbb0
Fixed text of check-in prize when it is a set of backgrounds ( #8599 )
...
* Fixed text of check-in prize when it is a set of backgrounds
* Use existing i18n string for BGs name
* Added user.preferences.language as second parameter
2017-04-17 14:39:05 +10:00
Tyler Nychka
bd6f901ccf
Fix for automatic allocation not persisting #8641 ( #8661 )
2017-04-17 06:49:16 +10:00
SabreCat
884bf02961
Merge branch 'sabrecat/butterflies' into develop
2017-04-13 20:31:19 +00:00
SabreCat
4aad44e29e
3.85.0
2017-04-13 20:29:51 +00:00
Sabe Jones
b40ee88165
chore(i18n): update locales
2017-04-13 20:28:14 +00:00
SabreCat
5d90aff51b
chore(sprites): compile
...
Also add promo images to Bailey
2017-04-13 20:19:57 +00:00
SabreCat
9e36a531ea
feat(content): Butterfly Pet Quest
2017-04-13 20:11:36 +00:00
Sabe Jones
f9b40a699a
3.84.3
2017-04-12 21:09:05 +00:00
Alys
33380f63f6
add comment to warn about keeping INVITES_LIMIT low
...
If INVITES_LIMIT is allowed to be greater than MAX_EMAIL_INVITES_BY_USER
then the inviter can send more than MAX_EMAIL_INVITES_BY_USER invitations
at once.
2017-04-12 21:07:46 +00:00
Alys
2f010e4689
fix test error message to use variable in locales string
2017-04-12 21:07:35 +00:00
Alys
fbda3a87ef
change error message for sending too many invitations to instruct them to email us
2017-04-12 21:07:25 +00:00
TheHollidayInn
8a2e6a98c2
Added email invite limit
2017-04-12 21:03:10 +00:00
Keith Holliday
7d42e8fc71
Added email invite limit ( #8664 )
...
* Added email invite limit
* change error message for sending too many invitations to instruct them to email us
* fix test error message to use variable in locales string
* add comment to warn about keeping INVITES_LIMIT low
If INVITES_LIMIT is allowed to be greater than MAX_EMAIL_INVITES_BY_USER
then the inviter can send more than MAX_EMAIL_INVITES_BY_USER invitations
at once.
2017-04-12 15:54:35 -05:00
SabreCat
0442b87608
fix(news): merge conflict
2017-04-11 22:23:27 +00:00
SabreCat
c1d1a3e14e
fix(translation): resolve merge conflict
2017-04-11 22:04:55 +00:00
SabreCat
dd5a9aa6cc
Merge branch 'sabrecat/egg-quest' into develop
2017-04-11 20:10:49 +00:00
Alys
0bb6e5f3fc
edit the new issue template to emphasise that the Report a Bug guild should be used first ( #8659 )
2017-04-11 14:52:19 -05:00
SabreCat
ad0a51167d
3.84.2
2017-04-11 19:23:42 +00:00
SabreCat
b7f1001b1a
chore(news): Bailey
2017-04-11 19:23:28 +00:00
Sabe Jones
81ea1a0f9e
chore(i18n): update locales
2017-04-11 19:02:17 +00:00
SabreCat
a466d20935
Revert "Unlimit parties ( #8653 )"
...
This reverts commit a4feae4dbb
2017-04-11 18:54:30 +00:00
SabreCat
635c0cf3d1
feat(event): enable Egg Hunt
2017-04-11 18:54:07 +00:00
Matteo Pagliazzi
69347df050
Merge branch 'Yutsuten-orb-rebirth' into develop
2017-04-11 17:10:50 +02:00
Matteo Pagliazzi
9cad5525e6
Merge branch 'orb-rebirth' of https://github.com/Yutsuten/habitica into Yutsuten-orb-rebirth
2017-04-11 17:10:42 +02:00
Matteo Pagliazzi
b1e6aceffe
Merge branch 'Yutsuten-checkin-complete-msg' into develop
2017-04-11 17:08:51 +02:00
Matteo Pagliazzi
17068875f4
Merge branch 'checkin-complete-msg' of https://github.com/Yutsuten/habitica into Yutsuten-checkin-complete-msg
2017-04-11 17:08:43 +02:00
Matteo Pagliazzi
342fc2e344
Merge branch 'paglias/fix-wrong-subs' into develop
2017-04-11 17:07:15 +02:00
Matteo Pagliazzi
b8b1557e49
Merge branch 'develop' into paglias/fix-wrong-subs
2017-04-11 17:07:05 +02:00
Matteo Pagliazzi
f90ef04e83
Merge branch 'eastwood-develop' into develop
2017-04-11 17:03:20 +02:00
Matteo Pagliazzi
d0561512de
Merge branch 'develop' of https://github.com/eastwood/habitica into eastwood-develop
2017-04-11 17:03:09 +02:00
Matteo Pagliazzi
b84c672f33
remove wrong subscriptions from gift modal
2017-04-11 10:15:54 +02:00
Mateus Etto
aafbb889be
Merge branch 'develop' into checkin-complete-msg
2017-04-09 19:58:53 -03:00
