negue 8b15d94ae1 Merge remote-tracking branch 'origin/develop' into negue/flagpm ...

# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json

2018-11-18 22:04:33 +01:00

..

achievements

fix(event): de-Festivalize class change modal

2018-11-06 15:01:57 -06:00

auth

refactor(auth): only import needed validator module

2018-11-01 15:22:20 -05: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 remote-tracking branch 'origin/develop' into negue/flagpm

2018-11-18 22:04:33 +01:00

group-plans

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

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

groups

fix(chat): prevent duplicate messages, closes #10823

2018-11-18 19:38:56 +01:00

hall

fix hall of heroes

2018-08-17 22:29:47 -05:00

header

Merge remote-tracking branch 'origin/develop' into negue/flagpm

2018-11-18 22:04:33 +01:00

inventory

check pet is hatchable before highlighting (#10797)

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

members

Prevent dropdown from closing when clicking search (#10252)

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

payments

fix(amazon gift): do not reset the gift amount when opening the amazon modal

2018-10-24 20:29:27 +02:00

settings

Merge branch 'develop' into sabrecat/usernames-master

2018-11-08 15:13:28 -06:00

shared

Refactor/market vue (#10601)

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

shops

fix filter checkboxes in seasonal shop (#10792)

2018-10-29 16:04:42 +01:00

snackbars

Merge branch 'sabrecat/force-username-modal' into sabrecat/usernames-master

2018-10-24 18:40:43 -05:00

static

refactor(auth): only import needed validator module

2018-11-01 15:22:20 -05:00

tasks

Set width on .custom-control-label (#10840)

2018-11-17 11:01:36 +01:00

ui

Refactor/market vue (#10601)

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

userMenu

fix(usernames): various

2018-11-13 14:14:02 -06:00

world-boss

feat(world-boss): third Rage Strike support

2018-03-05 20:46:22 +00:00

404.vue

Client 404 Page (#9093)

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

appFooter.vue

Client: use api v4 (#10457)

2018-06-21 21:25:27 +02: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

fix(usernames): various

2018-11-06 19:55:06 -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

feat(usernames): show in party header, profiles, inbox convo list

2018-10-22 16:29:47 -05:00

modifyInventory.vue

Client: use api v4 (#10457)

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

notifications.vue

fix(usernames): various

2018-11-13 14:14:02 -06:00

page.vue

Client Redesign: Inventory pages, secondary menu, misc css and design items (#8631)

2017-05-16 21:09:55 +02: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

Make Challenge Owner's Name Clickable (#9283)

2018-05-01 17:23:02 +02:00

yesterdailyModal.vue

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

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