bc91dd81e9
Revert "fix(amazon): make sure to use up to date data"
...
This reverts commit 298a79b58d
2019-03-07 16:58:38 +01:00
201085651b
Merge branch 'release' into develop
2019-03-05 15:44:04 -06:00
264aad79ac
chore(sprites): compile
2019-03-05 15:43:29 -06:00
660928323e
fix header design ( #11013 )
...
* statsbar-component for a closer tooltip
* fix scss scope, twice
2019-03-04 22:01:45 +01:00
298a79b58d
fix(amazon): make sure to use up to date data
2019-03-04 22:00:40 +01:00
77f3bb53de
New payments buttons and new Amazon checkout flow ( #10940 )
...
* start implementing separate amazon button component
* wio
* switch amazon to new flow
2019-03-04 21:51:17 +01:00
17d8a7b706
Fix mismatch between pet and star badge ( #11041 )
2019-03-03 17:48:51 +01:00
1d8a5b1952
Keep mystery items synced with server ( #11039 )
2019-03-03 17:39:42 +01:00
f548103f4c
fixes Tasks UI ( #11036 )
...
* show grabbing cursor while dragging
* 40px height search + tags button
* remove margin of task-title markdown-p-tag
* remove pointer on disabled task-controls
* show `Options` instead of `Show More`
* remove margin of checklist items
* remove space between notes and checklist
2019-03-03 17:28:58 +01:00
2595ccb2b4
refactor filters to work like in guilds/challenges ( #11023 )
2019-03-03 17:24:59 +01:00
ceb4288b17
Footer Design / Instagram Link ( #11022 )
...
* re-add instagram icon+link
* fix donate button hover - smaller icons if not desktop
* lower margin on the small icons
* Update appFooter.vue
remove DevBlog link from footer
2019-03-03 17:22:55 +01:00
3ebd37f7cb
replace the questInfo to use table-like behavior, expands to the content ( #10995 )
2019-03-03 17:17:45 +01:00
080c4b3e20
Merge branch 'develop' into negue/flagpm
2019-03-03 17:12:11 +01:00
e939799800
Ensure profile page gets synced ( #11032 )
2019-03-03 17:05:38 +01:00
55bd35d7d3
chore(monthly): announce Challenges, end potions
2019-03-01 16:22:19 -06:00
75f6398de2
chore(news): Bailey
2019-02-28 16:02:46 -06:00
da8006506b
Merge branch 'release' into develop
2019-02-26 10:09:26 -06:00
53555a0f16
fix(navbar): update b-vue toggle syntax
2019-02-26 10:07:48 -06:00
962236846a
Merge branch 'release' into develop
2019-02-25 17:00:41 -06:00
61956336ea
chore(sprites): compile
2019-02-25 16:59:37 -06:00
0be1f3eb7c
fix(equipment): hack partially addressing #11015
2019-02-25 16:59:28 -06:00
2d35009bee
Update conditional render to only show Apply Sort Options to Party Header text in party modals ( #10984 )
2019-02-21 13:35:17 -06:00
d267f09d04
Enable Username to be searched in Hall of Heroes - fixes #10972 ( #10980 )
...
* Add if block to search for username if not valid uuid
* Add validationError check
* Modify test case and added test case for username
* Update description of API
* Update Test
* Correct test
* Change placeholder text in heroes.vue
* Refactor code
* Add quotes
* Update hall.js
2019-02-21 13:33:15 -06:00
8eb9402c0e
fix(achievements): better coloration by piyo
2019-02-21 12:44:30 -06:00
ada09f3d5a
fix(challenges): use b-dropdown-form
2019-02-20 14:17:34 -06:00
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
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
0cbd6fb4d7
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/header/menu.vue
2019-02-07 19:16:10 +01: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
Matteo Pagliazzi