negue 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

..

achievements

Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix

2019-02-07 18:20:05 +01:00

auth

setting new password using Return key (#10937)

2019-01-18 14:58:18 -06:00

categories

Joined and Owned Challenges should still appear in Discover, but annotated with status (#9956)

2018-05-07 16:04:40 +02:00

challenges

If user's cron will happen later today, start the task yesterday. (#10783)

2018-11-02 16:58:01 +01:00

chat

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2019-02-07 19:16:10 +01:00

group-plans

Payments: Success Messages (#10903)

2018-12-09 20:08:01 +01:00

groups

Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix

2019-02-07 18:20:05 +01:00

hall

Implement URL handling for profile modal (#10844)

2019-02-07 17:25:30 +01:00

header

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2019-02-07 19:16:10 +01:00

inventory

Special Pets that you don't own will only show GreyPaw print | Fixes #10866 (#10949)

2019-01-18 14:58:38 -06:00

members

Prevent dropdown from closing when clicking search (#10252)

2018-04-15 19:18:40 -05:00

payments

fix(g1g1): remove additional banner

2019-01-16 10:22:00 -06:00

settings

Move hr to be contained within hasClass div (#10964)

2019-02-07 17:58:46 +01:00

shared

Refactor/market vue (#10601)

2018-09-09 12:05:33 +02:00

shops

Add else block so items with warning notes will not display sell options (#10965)

2019-02-07 18:02:38 +01:00

snackbars

chore(promo): end G1G1 deal

2019-01-15 18:57:10 -06:00

static

changed wikia links to fandom

2019-01-24 11:21:52 +00:00

tasks

changed wikia links to fandom

2019-01-24 11:21:52 +00:00

ui

Refactor/market vue (#10601)

2018-09-09 12:05:33 +02:00

userMenu

Implement URL handling for profile modal (#10844)

2019-02-07 17:25:30 +01:00

world-boss

changed wikia links to fandom

2019-01-24 11:21:52 +00:00

404.vue

Client 404 Page (#9093)

2017-09-28 12:19:15 -05:00

appFooter.vue

changed wikia links to fandom

2019-01-24 11:21:52 +00:00

avatar.vue

fix(usernames): various

2018-11-06 19:55:06 -06:00

bannedAccountModal.vue

Added initial account banned modal (#9868)

2018-04-06 08:33:38 -05:00

creatorIntro.vue

feat(content): Armoire and Backgrounds Jan 2019

2019-01-04 13:58:51 -06:00

emptyView.vue

client: reorganize files, router and add inventory skeleton

2017-01-17 19:45:27 +01:00

groupLink.vue

Added Tavern case

2018-05-07 13:35:53 +02:00

memberDetails.vue

Implement URL handling for profile modal (#10844)

2019-02-07 17:25:30 +01:00

modifyInventory.vue

Client: use api v4 (#10457)

2018-06-21 21:25:27 +02:00

notifications.vue

notification click always shows the modal, setting only controls the notification timeout (#10913)

2018-12-23 19:35:30 +01:00

parentPage.vue

Client: async resources, make store reusable, move plugins and add getTaskFor getter (#8575)

2017-03-18 18:33:08 +01:00

private-message-modal.vue

[WIP] bootstrap-vue upgrade (#9178)

2017-11-08 18:40:37 +01:00

secondaryMenu.vue

New client guilds (#8736)

2017-06-02 14:55:02 -06:00

selectMembersModal.vue

fix members modals (#10240)

2018-04-10 13:27:06 +02:00

sidebarSection.vue

fix conflicts and remove extra dependency

2018-05-13 16:30:17 +02:00

userLink.vue

Implement URL handling for profile modal (#10844)

2019-02-07 17:25:30 +01:00

yesterdailyModal.vue

fix(usernames): RYA positioning and contrib tier in PMs

2018-11-03 12:50:59 -05:00