Commit Graph

1101 Commits

Author SHA1 Message Date
Sabe Jones ecbf39cee4 feat(event): Fall Festival 2018 2018-09-20 16:19:29 -05:00
Sabe Jones 44cd4d0708 chore(i18n): update locales 2018-09-18 23:10:30 +00:00
Sabe Jones a622a3ebe3 chore(i18n): update locales 2018-09-13 22:21:02 +00:00
Sabe Jones 1034675184 Merge branch 'release' into develop 2018-09-11 20:44:08 +00:00
Sabe Jones dc265e26b3 chore(i18n): update locales 2018-09-11 20:43:05 +00:00
Sabe Jones 80e92a8767 feat(content): Forest Friends Quest Bundle 2018-09-11 15:38:12 -05:00
negue 92e4d5cd68 Refactor/market vue (#10601)
* extract inventoryDrawer from market

* show scrollbar only if needed

* extract featuredItemsHeader / pinUtils

* extract pageLayout

* extract layoutSection / filterDropdown - fix sortByNumber

* rollback sortByNumber order-fix

* move equipment lists out of the layout-section (for now)

* refactor sellModal

* extract checkbox

* extract equipment section

* extract category row

* revert scroll - remove sellModal item template

* fix(lint): commas and semis

* Created category item component (#10613)

* extract filter sidebar

* fix gemCount - fix raising the item count if the item wasn't previously owned

* fixes #10659

* remove unneeded method
2018-09-09 12:05:33 +02:00
Sabe Jones dbaae4183e chore(i18n): update locales 2018-09-06 19:30:35 +00:00
Sabe Jones 3fc9501bac Merge branch 'release' into develop 2018-09-04 17:29:40 -05:00
Sabe Jones c3db59aae8 chore(i18n): update locales 2018-09-04 21:29:10 +00:00
Sabe Jones 4e2c08cfed feat(content): Armoire and Backgrounds 201809 2018-09-04 16:24:04 -05:00
legitmaxwu 5c50a40f39 Added Contributor Titles to Names on Hover (fixes #10611) (#10624)
* Added Contributor Titles to Names on Hover

* Added Contributor Titles to Names on Hover

* added contributor title text on hover

* added contributor titles on hover in chat

* added contributor titles to text on hover

* Delete .project
2018-08-30 14:52:37 -05:00
Matteo Pagliazzi 84329e5fad New inbox client (#10644)
* new inbox client

* add tests for sendPrivateMessage returning the message

* update DELETE user message tests

* port v3 GET-inbox_messages

* use v4 delete message route

* sendPrivateMessage: return sent message

* fix
2018-08-30 14:50:03 -05:00
Phillip Thelen 64507a161e Add android FAQ answers to content call (#10649) 2018-08-30 14:49:36 -05:00
Sabe Jones 410355c3f1 chore(i18n): update locales 2018-08-30 18:59:45 +00:00
Sabe Jones 972631e7ac Merge branch 'release' into develop 2018-08-29 20:26:39 +00:00
Sabe Jones 031783b1d7 chore(i18n): update locales 2018-08-29 20:25:24 +00:00
Sabe Jones f802a41f75 feat(content): Animal Tails 2018-08-29 15:20:09 -05:00
Matteo Pagliazzi 39847893d2 remove use mobile apps banner (#10634) 2018-08-25 15:02:44 +02:00
Sabe Jones b0ff35a8f1 chore(i18n): update locales 2018-08-23 20:04:40 +00:00
Sabe Jones 5b7ea8ec5c feat(content): Mystery Items Aug 2018 2018-08-23 14:57:11 -05:00
Sabe Jones 5cfd0c863e Merge branch 'release' into develop 2018-08-22 16:46:44 +00:00
Sabe Jones 20e65be8bf chore(i18n): update locales 2018-08-22 16:45:38 +00:00
Sabe Jones 8bac324ba7 fix(content): September end date for Ember Potions 2018-08-22 11:42:38 -05:00
Sabe Jones b7ef4c50b2 Merge branch 'release' into develop 2018-08-21 18:32:52 +00:00
Sabe Jones b0200026aa chore(i18n): update locales 2018-08-21 18:32:13 +00:00
Sabe Jones e6c8b977c8 feat(content): enable Ember Potions 2018-08-21 13:29:52 -05:00
Sabe Jones c78b5ecf7c Analytics: More / improved tracking (#10608)
* WIP(analytics): add / improve tracking

* fix(groups): revert attempt at tracking on group model

* fix(analytics): track questing based on user data

* each buy-operation now has a getItemType method - typo getItemKey - removed unneeded overrides
2018-08-20 14:13:22 -05:00
Sabe Jones f27e9b02d8 Merge branch 'release' into develop 2018-08-20 14:16:36 +00:00
Sabe Jones d5d894b8a9 chore(i18n): update locales 2018-08-20 14:15:23 +00:00
Sabe Jones 3c602351f9 Merge branch 'release' into develop 2018-08-18 03:32:39 +00:00
Sabe Jones fbc1044100 chore(i18n): update locales 2018-08-18 03:32:02 +00:00
Brian Fenton 53405aa586 Handleless wheelchair options (#10572)
* removing duplicate keys

* adding chair assets and wiring them to customize screen

* adding customization data for new wheelchair types

* removing an unused locale key and moving the code style override closer to the affected area

* explicitly re-enabilng linting rule

* adding button-sized chair assets

* updating assets to new resolution

* moving chair keys into component data
2018-08-17 12:23:43 +02:00
Rene Cordier 7630c02e13 Fixing healing light not being castable when user full hp (#10603)
* Fixing healing light not being castable on server and client sides when user has already full health

Adding integration test for spell cast of healing light when full health

Adding test for heal cast if user has full health

* Fixing ESLint syntax in the spells test files
2018-08-17 12:06:58 +02:00
Isabelle Lavandero ec444384f4 Add error notification for deleted user (#10600)
* snackbar notification for deleted user

* check for 404

* localize text
2018-08-17 12:02:43 +02:00
Sabe Jones dbd295e35b chore(i18n): update locales 2018-08-16 19:45:45 +00:00
Sabe Jones b5428f4ac9 Merge branch 'develop' into release 2018-08-16 14:41:09 -05:00
Sabe Jones 0142e332e8 feat(content): Kangaroo Pet Quest 2018-08-16 14:40:09 -05:00
Alys 2c921609c1 improve apidocs related to allocating Stat Points and user/unlock - fixes #10557 (#10592)
* correct curl parameter (-X for request method; -x for proxy information)

* fix typo in error message

* fix mistakes in apidocs for allocating Stat Points
2018-08-12 12:11:01 +02:00
Sabe Jones 0e346f7050 chore(i18n): update locales 2018-08-09 19:07:37 +00:00
Sabe Jones 1eb1fe76a8 Merge branch 'release' into develop 2018-08-08 16:55:21 -05:00
Sabe Jones 5f37b9727a chore(i18n): update locales 2018-08-08 21:06:54 +00:00
Alys b87ff03210 remove unused messageGroupNotFound string (has been replaced with groupNotFound) 2018-08-07 13:01:02 +10:00
Alys 9d994f8a77 allow notification screen text to be translated (#10576)
The `noNotifications` string was not being used so changing it for
this purpose makes sense. Non-English users will see meaningful
text even before the new text is translated.
2018-08-05 10:48:36 +02:00
Sabe Jones 729ba36ed3 chore(i18n): update locales 2018-08-02 18:45:32 +00:00
Sabe Jones 4ec5df170c feat(content): Backgrounds, Armoire, minor sprite fixes 2018-08-02 13:38:51 -05:00
Sabe Jones 0910ca7470 chore(i18n): update locales 2018-08-01 19:51:43 +00:00
Sabe Jones 4f34443b84 chore(event): end Summer Splash + Potions
Also Bailey news
2018-08-01 14:48:38 -05:00
Sabe Jones 6ade7b08c8 chore(i18n): update locales 2018-07-31 19:13:36 +00:00
Sabe Jones c88b9b80b5 feat(event): Habitica Naming Day
and Bailey announcements
2018-07-31 14:08:56 -05:00