Sabe Jones
ada09f3d5a
fix(challenges): use b-dropdown-form
2019-02-20 14:17:34 -06:00
Sabe Jones
b21cd4a2b6
feat(content): Mythical Marvels Bundle
...
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
Sabe Jones
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
Sabe Jones
be4c777382
fix(hall): bogus msg reference and undef fn
...
Also couple of styling fixes
2019-02-14 15:51:15 -06:00
Sabe Jones
2c1ca7629d
Merge branch 'release' into develop
2019-02-12 07:35:56 -06:00
Sabe Jones
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06:00
negue
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
Matteo Pagliazzi
b35bd18282
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
2019-02-07 18:20:05 +01:00
Chester Sng
732a46d2db
Add else block so items with warning notes will not display sell options ( #10965 )
2019-02-07 18:02:38 +01:00
Justin Horner
4f1d4aa73a
Move hr to be contained within hasClass div ( #10964 )
2019-02-07 17:58:46 +01:00
negue
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
Phillip Thelen
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
Sabe Jones
dddd8269b6
Merge branch 'release' into develop
2019-02-02 13:04:35 -06:00
Sabe Jones
5b329db357
chore(event): end Winter Wonderland
2019-02-02 13:03:04 -06:00
Giacomo Lawrance
08c8f26b80
Merge branch 'develop' into 10954-wikiafix
2019-01-26 18:03:50 +00:00
Carl Vuorinen
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
Giacomo Lawrance
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00:00
Sabe Jones
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
Alessio Libardi
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
andrzejZdobywca
d77a17112c
setting new password using Return key ( #10937 )
2019-01-18 14:58:18 -06:00
Sabe Jones
fd125352b7
fix(g1g1): remove additional banner
2019-01-16 10:22:00 -06:00
Sabe Jones
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
Sabe Jones
d22b4bb2f7
feat(content): Armoire and Backgrounds Jan 2019
2019-01-04 13:58:51 -06:00
Sabe Jones
b1aeb8ed87
Merge branch 'release' into develop
2019-01-02 17:08:50 -06:00
Sabe Jones
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
Sabe Jones
4f3536e887
Merge branch 'release' into develop
2018-12-31 23:48:59 +00:00
Sabe Jones
f7983f39eb
feat(event): New Year's 2018-19
2018-12-31 17:44:13 -06:00
Matteo Pagliazzi
2335ad4167
fix(gems modal): remove duplicate id property, fix #10919
2018-12-27 15:04:14 +01:00
negue
d84631255b
extract site urls from translations ( #10909 )
2018-12-23 19:56:21 +01:00
Raymond Grumney
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
negue
19b75c6257
drag tags to reorder ( #10911 )
...
* drag tags to reorder
* change color, remove unneeded sortTag-call
2018-12-23 19:45:05 +01:00
negue
b66904a3a7
notification click always shows the modal, setting only controls the notification timeout ( #10913 )
2018-12-23 19:35:30 +01:00
Sabe Jones
f74b4d3e73
Merge branch 'develop' into release
2018-12-20 17:24:59 +00:00
Sabe Jones
a6cea47789
feat(event): Winter Wonderland 2018
2018-12-20 11:11:50 -06:00
Sabe Jones
0ed7c7596a
Merge branch 'release' into develop
2018-12-18 21:32:39 +00:00
Sabe Jones
8220199e49
Gift 1 Get 1 Promo 2018-19! ( #10915 )
...
* feat(subscription): promo banner in modal
* feat(subscription): promo banner on main page
* fix(banners): remove extraneous margin adjustment
* fix(banners): various
* feat(promotion): gift 1, get 1
* fix(promo): various
* chore(promo): add Bailey
* fix(promo): use different email template for promo beneficiary
* fix(promo): turns out Winter is meaningful
2018-12-18 15:28:53 -06:00
Matteo Pagliazzi
7348145b7d
fix(success-modal): misc fixes
2018-12-16 15:39:37 +01:00
Sabe Jones
a2c8b8b05c
Usernames Misc: Bulk Email and New Party Modal ( #10898 )
...
* feat(migrations): genericize bulk email
* chore(migrations): archive one-offs
* feat(usernames): change create party modal to copy username
* fix(modal): styling
* fix(modal): add Chrome clipboard implementation
2018-12-11 14:47:50 -06:00
Matteo Pagliazzi
0667695390
Payments: Success Messages ( #10903 )
...
* fix v-once
* gems purchase success dialog
* amazon and stripe support for gems message, translations
* subscriptions success message
* subscriptions success message
* group plans success message and many fixes
* finish success messages for payments
* add success modal when gifting from balance
2018-12-09 20:08:01 +01:00
Sabe Jones
bb01475e02
Merge branch 'release' into develop
2018-12-03 22:54:08 +00:00
Matteo Pagliazzi
b9e12aca3e
success modal and fix redirects
2018-12-02 17:33:21 +01:00
Matteo Pagliazzi
e212842b50
fix redirects and basic success message
2018-12-02 15:44:52 +01:00
Sabe Jones
727041f020
fix(chat): escape regexes so parentheses etc. don't bust it
2018-11-30 16:19:22 -06:00
Matteo Pagliazzi
2cbd78b139
Merge branch 'develop' into payments/paypal-amazon-checkout
2018-11-29 10:55:13 +01:00
Phillip Thelen
42b146d5d0
Attach client to chat messages ( #10845 )
...
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
2018-11-26 10:45:42 +01:00
Nathan Zimmerman
2bebaf2cf8
Fixes issue #10857 ("Tags have extra space at the bottom when they should be centered") ( #10861 )
...
* Fix for #10857 centered category tag text
* Fixes #10857 and #10856 display tag markdown.
2018-11-26 10:44:41 +01:00
Matteo Pagliazzi
6181328ac1
feat(footer): always show expanded footer ( #10862 )
2018-11-26 10:37:29 +01:00
Matteo Pagliazzi
433c73c9d3
paypal: restore url after purchase
2018-11-21 11:25:36 +01:00
Matteo Pagliazzi
680c2162a7
paypal: new redirects
2018-11-21 11:19:55 +01:00
Matteo Pagliazzi
6395870c00
fix(stable): remove progress number from petItem
2018-11-21 10:35:59 +01:00