3e4d245eba
chore(sprites): compile
2019-02-19 18:06:30 -06:00
b21cd4a2b6
feat(content): Mythical Marvels Bundle
...
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
98fd509530
Hotfix: correct issues from PRs rollout ( #10993 )
...
* fix(various): correct issues from PRs rollout
1. Send Gems modal opens from profiles again
2. Contributor titles appear on hover again
3. Tags dropdown in tasks appears again
4. Only user's own @mentions get highlighted again
* fix(test): correct order of css classes in expect
2019-02-15 16:01:33 -06:00
be4c777382
fix(hall): bogus msg reference and undef fn
...
Also couple of styling fixes
2019-02-14 15:51:15 -06:00
ca2f2ba9ce
Merge branch 'develop' into release
2019-02-14 13:39:52 -06:00
165ca8737b
chore(news): Blog Bailey
2019-02-14 13:25:40 -06:00
b711c1672b
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:53 -06:00
d675e80555
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:13 -06:00
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
4d1b239231
Track specific items dropped by Armoire ( #10977 )
...
* feat(analytics): track specific items dropped by Armoire
* fix(lint): remove console log
* fix(analytics): address test failures
* fix(analytics): add missed if block
* fix(analytics): seriously tho actually fix
2019-02-10 19:30:49 +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
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
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
Sabe Jones