2c1ca7629d
Merge branch 'release' into develop
2019-02-12 07:35:56 -06:00
13af1fa88d
chore(sprites): compile
2019-02-12 07:20:11 -06:00
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06:00
b8aacc03e3
Upgrade to NPM Amplitude package ( #10952 )
...
* chore(analytics): upgrade to NPM Amplitude pkg
* chore(build): run package-lock on Linux
* refactor(analytics): use preferred Amplitude v3+ syntax
* refactor(analytics): more v3+ syntax
* chore(npm): attempt updating package lock
2019-02-10 19:34:52 +01:00
844d3fbf37
refresh gear overview ( #10971 )
...
* refresh bought seasonal gear
* just "subscribe" to the _v change instead of returning the value
* subscribe in vue instead of lib
2019-02-10 19:32:14 +01:00
b9aaccdf13
refactored the highlightUsers-method, only matches mentions and not emails ( #10982 )
2019-02-10 19:27:22 +01:00
ef412c7185
Merge branch 'release' into develop
2019-02-08 06:08:05 -06:00
28ddebf4a9
fix(sprites): load new spritesheet in Vue
2019-02-08 06:06:58 -06:00
b35bd18282
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
2019-02-07 18:20:05 +01:00
732a46d2db
Add else block so items with warning notes will not display sell options ( #10965 )
2019-02-07 18:02:38 +01:00
4f1d4aa73a
Move hr to be contained within hasClass div ( #10964 )
2019-02-07 17:58:46 +01:00
92f2079b76
fix emails in chat ( #10912 )
...
* additional regex checks to ignore the <tag attribute="content">
* extract highlightUsers method - add test
* refactor highlight regex
* refactor the regex without `lookbehind`
* remove unneeded regex
2019-02-07 17:55:36 +01:00
63f5773172
Implement URL handling for profile modal ( #10844 )
...
* Implement URL handling for profile modal
* Fix issue where paths would break when using back button
* move tiers import to index
2019-02-07 17:25:30 +01:00
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
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
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
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
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
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
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
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
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
8237b7f2de
chore(news): Bailey
2019-01-11 13:37:58 -06:00
d35f81cdae
chore(sprites): compile
2019-01-08 19:30:49 -06:00
23b72a673d
chore(sprites): compile
2019-01-04 13:59:27 -06:00
d22b4bb2f7
feat(content): Armoire and Backgrounds Jan 2019
2019-01-04 13:58:51 -06:00
b1aeb8ed87
Merge branch 'release' into develop
2019-01-02 17:08:50 -06:00
af40c437be
chore(news): Bailey
...
also fix erroneously active hatching potion and remove concluded bundle
from pinned items
2019-01-02 16:10:57 -06:00
4f3536e887
Merge branch 'release' into develop
2018-12-31 23:48:59 +00:00
f7983f39eb
feat(event): New Year's 2018-19
2018-12-31 17:44:13 -06:00
2335ad4167
fix(gems modal): remove duplicate id property, fix #10919
2018-12-27 15:04:14 +01:00
d84631255b
extract site urls from translations ( #10909 )
2018-12-23 19:56:21 +01:00
0b352b9103
Unit Tests; 1 fix to appFooter debug menu ( #10894 )
...
* Built
* Update .editorconfig
* Fixed filename ('translaotr.js' => 'translator.js')
* Fixed Filename
* User Unit Tests
* Writing tests for avatar.vue
* writing tests for getters/user.js
* Writing Tests for avatar.vue
* Writing Tests for avatar.vue
* writing tests for store/getters/user.js
* renamed file
* Integrated test into user.test.js
* Reverting
* Fetching most recent version
* +1 Level now adds a level
* updating to current version
* Minor edits to pass lint test
* Removing non-functional Tests
* Cleaning up
2018-12-23 19:45:59 +01:00
19b75c6257
drag tags to reorder ( #10911 )
...
* drag tags to reorder
* change color, remove unneeded sortTag-call
2018-12-23 19:45:05 +01:00
b66904a3a7
notification click always shows the modal, setting only controls the notification timeout ( #10913 )
2018-12-23 19:35:30 +01:00
4d2510e322
fix(sprites): add missing dragon icon
2018-12-20 16:36:57 -06:00
Sabe Jones