c7309ae179
fix(amazon): disabled state for button, fix bug where checkout button would not appear
2019-03-13 19:19:30 +01:00
ef42fba049
fix(paypal): button styles
2019-03-13 18:34:41 +01:00
d75f926136
Merge branch 'release' into develop
2019-03-12 19:30:52 -05:00
f318afb8cf
Revert "replace the questInfo to use table-like behavior, expands to the content ( #10995 )"
...
This reverts commit 3ebd37f7cb
2019-03-12 19:20:56 -05:00
b954379f38
Revert "fixes Tasks UI ( #11036 )"
...
This reverts commit f548103f4c
2019-03-12 19:20:40 -05:00
9b62804a5c
fix tavern/chat ui ( #11056 )
...
* add markdown-formatting link - hide textarea if guidelines not accepting - chat ui
* fix item-with-icon height/margins . public guild item member count
2019-03-11 18:32:07 +01:00
d21e29462c
fix: shop ui ( #11046 )
...
* shop: equipment-cards background + market filter logic (as other pages)
* shops - quest: refactor filter logic + quest items margins
* shops-seasonal: refactor filter logic
* shops - timeTravelers: refactor filter logic
* fix star/empty colors - fix quest layout - countBadge z-index
2019-03-11 18:26:23 +01:00
6bccd2a866
New Payments Buttons ( #11045 )
...
* start implementing separate amazon button component
* wio
* switch amazon to new flow
* adjust amazon pay button size
* design buttons and add them to the settings page
* abstract css
* fixes and buy gems modal
* group plans css
* new buttons for gifts, fix padding in settings
* gift modal styles
* final style fixes
2019-03-11 18:23:47 +01:00
caea222330
fix item-with-icon height/margins . public guild item member count
2019-03-09 22:19:55 +01:00
8ecbdc1448
add markdown-formatting link - hide textarea if guidelines not accepting - chat ui
2019-03-09 21:10:20 +01:00
2a367ab3a7
Revert "New payments buttons and new Amazon checkout flow ( #10940 )"
...
This reverts commit 77f3bb53de
2019-03-07 16:58:49 +01:00
bc91dd81e9
Revert "fix(amazon): make sure to use up to date data"
...
This reverts commit 298a79b58d
2019-03-07 16:58:38 +01: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
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
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
ada09f3d5a
fix(challenges): use b-dropdown-form
2019-02-20 14:17:34 -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
2c1ca7629d
Merge branch 'release' into develop
2019-02-12 07:35:56 -06:00
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06: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
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
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
faa0611ab2
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
2019-01-27 18:14:51 +01: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
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00: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
Matteo Pagliazzi