b53c03bca8
Merge branch 'release' into develop
2018-01-10 16:42:13 +00:00
0112bd9b5a
chore(i18n): update locales
2018-01-10 16:40:59 +00:00
3d5d5da933
feat(content): Pept quest
2018-01-10 16:31:56 +00:00
9b19477e2f
adjust wording for Keys to Kennels
...
Also moves the new Keys text strings to the same place as the old ones in the locales file.
Also fixes minor typos in code that was preventing the new text from being displayed.
2018-01-10 21:21:58 +10:00
126d90f471
Added keys to the kennel ( #9772 )
...
* Added keys to the kennel
* Added titles and descriptions
2018-01-08 13:15:19 -06:00
98d4fb0f34
Chat flag inbox ( #9761 )
...
* Refactored chat reporting
* Added inbox flag chat
* Added flag chat to inbox
* Added you have flagged message
2018-01-08 13:13:25 -06:00
6a109adbc5
Task Modal Improvements ( #9560 )
...
* start adding advanced options
* new imput
* partial colors
* update deps
* misc adds
* fix text color
* add advanced options
* initial reordering of task modal labels
* start to fix colors in the modal
* wip colors
* update package-lock.json
* fix merge
* finish modal
* refactor colors
* fix quick add
* fix colors
* new icon colors
* add markdown formatting help
* fix habits colors
* fix rewards colors
* fixed remaining colors
* start to inline inputs
* fix typ
* fixes
* habits hover state
* wip new task modal inputs
* bootstrap: upgrade to v4-beta3
* finish reward edit modal
* fix attributes allocation, checklists and add help tooltips for attributes and difficulty
* lots of fixes
* update datepicker
* misc fixes
2018-01-08 18:43:57 +01:00
7842cd8a41
chore(i18n): update locales
2018-01-08 17:18:12 +00:00
daa796454c
Added Farvoid Theme (new, clean branch) ( #9634 )
...
* Added Farvoid Theme
* Updated generic.json and index.js
* fix(merge): address conflicts
2018-01-05 14:34:19 -06:00
f6ac7b890a
Both eggs and potions should hatch pets from Items ( #9645 )
...
* Show click on hatching potion when egg is clicked
* Fix translation parameter name
* Show egg as active when clicked
* Remove itemDragStart event handler from egg items
* Change isHatchable to take in potion and egg objects
* Add margin to item popover content
2018-01-05 13:31:34 -06:00
75b00ce2df
Fixed Challenge Winner Text (partial fix for #9629 ) ( #9664 )
...
* Fixed Challenge Winner Text (#9629 )
* Fixing typo
2018-01-05 13:29:00 -06:00
4576353f26
inital commit to add confirmation to animalEars ( #9666 )
2018-01-05 13:26:45 -06:00
005ffe850a
chore(i18n): update locales
2018-01-04 21:44:47 +00:00
71cb4e8510
feat(content): enable Wintery Skins and Hair
2018-01-04 21:35:26 +00:00
7e241bb76f
Merge branch 'release' into develop
2018-01-03 00:07:42 +00:00
0069aee5b0
chore(i18n): update locales
2018-01-03 00:00:07 +00:00
88e6b2da7c
feat(content): Armoire and BGs 2018-01
...
Also ends New Year's hat fanciness
2018-01-02 23:49:50 +00:00
da73c5c418
Merge branch 'release' into develop
2017-12-31 02:45:04 +00:00
0e404ad6ba
chore(i18n): update locales
2017-12-31 02:43:40 +00:00
d57c525fab
feat(event): New Year's 2017-18
2017-12-31 02:34:52 +00:00
446e0422c7
Merge branch 'release' into develop
2017-12-22 21:57:43 +00:00
5220cc1bf3
fix(market): add broken Armoire items
2017-12-22 21:56:39 +00:00
e8976b40f4
Merge branch 'release' into develop
2017-12-22 21:42:02 +00:00
bbbdd89ade
chore(i18n): update locales
2017-12-22 21:41:18 +00:00
a20c1ba751
Include seasonal gear in Market class lists ( #9739 )
...
* fix(shops): include seasonal gear in Market class lists
* fix(market): display non-seasonal broken special items
Also fixes a bug where if a current seasonal item was broken, it would show up twice.
2017-12-22 15:29:51 -06:00
d725b5be19
fix typo in loading screen tip 8
2017-12-22 20:45:35 +00:00
762e87a82a
chore(i18n): update locales
2017-12-21 23:19:35 +00:00
4764f115b1
feat(content): Subscriber Items Dec 2017
2017-12-21 23:10:54 +00:00
8f744565e2
chore(i18n): update locales
2017-12-20 19:28:22 +00:00
9538c86d02
fix(seasonal): include current season gear in Shop
2017-12-20 18:31:10 +00:00
9435a3089a
chore(i18n): update locales
2017-12-20 02:43:00 +00:00
98bb6fd7ce
feat(content): Winter Wonderland 2017-18
...
and Starry Night Hatching Potions
2017-12-20 02:23:11 +00:00
7fccf59f50
Merge branch 'release' into develop
2017-12-15 15:54:09 +00:00
fbdcd4b0a3
chore(i18n): update locales
2017-12-15 15:01:52 +00:00
e229bc5042
Merge branch 'release' into develop
2017-12-15 05:37:04 +00:00
dc3d694d0e
WIP: Buy-1-Get-1 Gift Subs ( #9719 )
...
* feat(promo): Buy-1-Get-1 Gift Subs
* feat(promo): add explanatory text to subscription screens
Also adds some add'l test coverage and creates a test context for this event
2017-12-14 23:09:02 -06:00
4f0ce77205
Winter Quest Bundle ( #9718 )
...
* feat(content): Winter Quest Bundle
* fix(sprites): revert spritesheet changes
2017-12-14 22:40:42 -06:00
c28ec24c33
Added notification for when leader is updated ( #9674 )
...
* Added notification for when leader is updated
* Abstracted challenge member search component
* Added challenge member search modal to challenge detail
* Added group search
2017-12-14 12:12:43 -06:00
e7fd2b4c79
[WIP] Added initial inapp loading screen with tips ( #9710 )
...
* Added initial inapp loading screen with tips
* Added new tips and styles
* Removed unrelated readme
2017-12-14 09:35:10 -06:00
05640f513e
Added test to recreate early cron issue ( #9668 )
...
* Added test to recreate early cron issue
* Gave user extra time based on reverse timezone change
2017-12-14 09:09:11 -06:00
ec179182e7
submit initial working solution to disallow selling of Saddle ( #9663 )
2017-12-05 14:22:59 -06:00
b886d7bb33
Added MAFL Theme ( #9633 )
2017-12-05 14:20:58 -06:00
a8f8f4f544
Added Pizilden's Theme ( #9632 )
2017-12-05 14:14:45 -06:00
444d6889de
add subscription cancellation instructions for free Group Plans subscriptions ( #9606 )
2017-12-05 14:10:15 -06:00
c56c69d464
market fixes 28th nov ( #9593 )
...
* list special gear by the `specialClass` - fixes #9485
* only disable the currencly label + value not the amount input - fixes #9492
* disable transformations on equipment previews - fixes #9497
* show boss strength - fixes #9522
* pin time travelers animals - closes #9382
* clean up + package-lock ?
* fix quest info
2017-12-05 14:09:34 -06:00
d4bc7c77a9
Check previous gear owned before purchasing next level gear ( fixes #9071 ) ( #9466 )
...
* add another check if previous gear is owned
* respect gear purchase order
* catch error with miscalculation of equipment number floor
* add integration test for proper equipment purchasing order
* fix syntax
* add 'previousGearNotOwned' string
* rewrite logic for different starting levels for wep vs others
* separate and add tests for armor and weapon
* rename variable for clarification
* skip check if itemIndex is NaN
* change obscure NaN check for readability
* change conditional from checking NaN to Int
2017-12-05 13:58:12 -06:00
401067bfed
chore(i18n): update locales
2017-12-05 19:46:40 +00:00
9e8807c40d
Armoire and Backgrounds December 2017 ( #9659 )
...
* feat(content): Armoire and Backgrounds 2017/12
* chore(sprites): compile
* chore(news): Bailey
2017-12-05 19:29:00 +00:00
56d09411d9
Merge branch 'release' into develop
2017-12-01 00:31:23 +00:00
5b06b28c97
chore(event): end Thunderstorm Potions
2017-12-01 00:30:06 +00:00
Sabe Jones