Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,383 Commits 64 Branches 1,256 Tags
ad3b673fdac4b6f03b65bd8701c33bcb99a41af9
Commit Graph

185 Commits

Author SHA1 Message Date
Matteo Pagliazzi ad3b673fda fix(member details): disable name style in header 2020-02-01 15:03:46 +01:00
Matteo Pagliazzi 4e6b411763 fix(dropdown): correct dropdown menus colors 2020-02-01 14:54:43 +01:00
Sabe Jones dec7bd2ec6 Merge branch 'release' into develop 2020-02-01 07:27:02 -06:00
Sabe Jones 64c79b7eb6 chore(sprites): compile 2020-02-01 07:26:40 -06:00
Sabe Jones b2d997c5a6 Merge branch 'release' into develop 2020-02-01 07:21:23 -06:00
Sabe Jones e800cd9a3f chore(event): End Wonderland 2020-02-01 07:20:55 -06:00
Sabe Jones 68aeda44d4 Merge branch 'release' into develop 2020-02-01 06:27:22 -06:00
Sabe Jones d77b791d56 fix(sprites): rename February items 2020-02-01 06:21:47 -06:00
Matteo Pagliazzi d5c7ced5e3 Merge pull request #11763 from Kevin-DDR/fixTiers 
contributor tier color/icon appear in guild/challenge member/participant list Fix for #11736
 2020-02-01 12:01:34 +01:00
Matteo Pagliazzi f45fdfbe0d Merge pull request #11708 from alexthomson1/issue-11615 
stop dropdown menu getting stuck on hover - fixes #11615
 2020-02-01 11:23:29 +01:00
Sabe Jones 728eaecfc8 Merge branch 'develop' into release 2020-01-31 06:47:26 -06:00
Sabe Jones 505509d4b7 chore(sprites): compile 2020-01-31 06:47:06 -06:00
Matteo Pagliazzi c772afd0c8 Merge pull request #11647 from tsukimi2/bugfix-npc-style 
Fix issues in NPCs should have NPC style on Display Name in chat, Hall. (fixes #11617)
 2020-01-29 15:41:46 +01:00
Sabe Jones bc1eb62a35 feat(event): Birthday 2020 2020-01-28 15:39:05 -06:00
alexthomson1 ab4009bd32 Refactoring dropdown.vue so that dropdownMobile calls openDropdown and closeDropdown 2020-01-25 18:28:26 -07:00
Sabe Jones aefd664db1 Correct some modal repops (#11739) 
* fix(modals): correct some repops

* fix(modals): also clean out "prev"

* refactor(modals): hide in dismiss event
 2020-01-24 16:36:11 -06:00
Sabe Jones cbac69ab11 chore(news): Bailey 2020-01-23 15:47:53 -06:00
Sabe Jones d2156eb97b Merge branch 'release' into develop 2020-01-22 05:47:34 -06:00
Sabe Jones 0be5b5c9c7 fix(timetrav): no sub but hourglass 2020-01-22 05:46:12 -06:00
Sabe Jones 1f16891b15 Merge branch 'release' into develop 2020-01-21 15:47:39 -06:00
Sabe Jones c2c5c8a86d chore(sprites): compile 2020-01-21 15:47:08 -06:00
Sabe Jones 64e6e6c27a fix(timetrav): quest currency color, modal refix 2020-01-21 15:16:09 -06:00
Sabe Jones 356302674c fix(buy): modal style changes 2020-01-21 15:03:29 -06:00
Sabe Jones ee9eb3f78a Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-21 14:58:51 -06:00
osiris eb21d27fa2 Make changes to correct problems from merging as requested. 2020-01-21 12:40:16 +08:00
osiris 5efde3159f Merge remote-tracking branch 'upstream/develop' into bugfix-npc-style 
Updating bugfix-npc-style with recent code from upstream/develop branch.
 2020-01-21 11:04:32 +08:00
Kevin-DDR 3477dcd226 Added contributor tier color/icon in guild and challenge member list 2020-01-20 20:29:52 +01:00
negue 4a812a9d28 fix style textarea + added story for an overview 2020-01-18 17:17:50 +01:00
Sabe Jones 04960f8ff8 chore(news): Bailey 2020-01-16 16:11:40 -06:00
Sabe Jones 0fd3e42fb2 fix(timetrav): pinning, mobile order 2020-01-16 10:06:36 -06:00
osiris 4fa16b5601 Merge remote-tracking branch 'upstream/develop' into bugfix-npc-style 2020-01-15 12:41:26 +08:00
Matteo Pagliazzi 615cec6ae0 Merge pull request #11663 from lelandhwu/fix-challenge-category-change 
fix bug in which editing challenge will not allow editing categories (fixes #11662)
 2020-01-14 13:22:21 +01:00
Matteo Pagliazzi 4a88659364 Merge pull request #11665 from Alys/flag-modal 
show Reset Flag Count button to moderators regardless of post's report status
 2020-01-14 13:02:26 +01:00
Matteo Pagliazzi e4ba2bfc7e Merge pull request #11637 from Xaz16/trigger-vue-reactivity-for-user 
Trigger vue reactivity for user
 2020-01-14 13:00:07 +01:00
Matteo Pagliazzi 646ac08cb2 Merge pull request #11706 from Kevin-DDR/fixBackground 
Set the default year for the background meny to 2020 Fix for  #11703
 2020-01-14 12:58:22 +01:00
Sabe Jones 8b569e2136 PMs rebuild (#11360) 
* feat(messages): big PMs refactor

* add private messages route

* move to page

* WIP - header + begin with the sidebar

* extract userLabel + style sidebar + extract converstation item

* correct conversation item style

* toggle switch style

* add contributor / backer to conversation user-label

* fix shadows

* fix the conversations list (ignoring own sent)

* selected conversation label

* faceAvatar component

* fix message / avatar height

* fix message list / empty messages height

* new message padding/styles/functionality - finished sidebar conversation styling -

* fix loading messages + perfect-scrollbar

* fix load more line

* fix loading label

* open new conversation from outside

* if the user doesn't have avatar-data inside the conversation and does not exist anymore, just load/set the user name

* search bar new icon / style

* block using from conversation context-menu

* fix lint

* fix merge / lint

* fix merge

* first separate page

* fix tooltips + full width private message + card max width + more responsive

* separate conversations methods, to prevent circular deps

* update eslint config

* fix open new private message

* remove unneeded close icon + fix toggle-switch layout

* same content height on empty conversations - remove border / box-shadow

* canLoadMore = false

* remove inbox conditions on chat components

* hide footer / fix empty sidebar

* floating shadow

* remove tooltip on selected conversation user + pm always full-size

* show avatar on empty conversation

* disable face-avatar

* fix faceAvatar + story

* fix loading conversation messages while switching the conversation

* refresh private-messages page when you are already on it

* add countbadge knob to change the example

* fix lint

* fix hide tooltip + align header correctly

* disable perfect scroll

* load messages on refresh event

* fix header label + conversation actions not breaking layout on hover

* add gifting banner to the max height calculation

* correct chunk name

Co-authored-by: negue <negue@users.noreply.github.com>
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
 2020-01-12 19:34:40 +01:00
alexthomson1 9bfc76cd20 Merge branch 'develop' into issue-11615 2020-01-12 00:20:13 -07:00
alexthomson1 8bd27b8313 Fixed bug in desktop navigation causing dropdown menu to get stuck until moused over again. 2020-01-11 23:16:24 -07:00
Matteo Pagliazzi da878dfa1a Disabled auto notification dismiss for received card on click (#11690) 2020-01-11 18:13:47 +01:00
alexthomson1 8abf0dd11d Prevent accidentally closing tasks in edit mode. (#11686) 2020-01-11 18:13:39 +01:00
Sabe Jones f47ccfdb6d chore(event): enable winter customizations 2020-01-10 15:32:36 -06:00
Sabe Jones 38b61030df Merge branch 'develop' into release 2020-01-09 16:44:07 -06:00
Sabe Jones c1a4c03883 fix(outage): emails warning 2020-01-09 16:43:18 -06:00
Sabe Jones 59fb9f1c7a feat(timetrav): implement bgs in avatar modal 2020-01-09 10:26:36 -06:00
Sabe Jones 0f4a5ebe6c Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-09 09:59:09 -06:00
Kevin-DDR a3277eeea3 Set the default year ofr the background meny to 2020 2020-01-09 08:59:51 +01:00
Sabe Jones 2c75e0bd49 Merge branch 'release' into develop 2020-01-08 11:13:19 -06:00
Sabe Jones 99c0a9d05d fix(promo): sub page 2020-01-08 11:12:47 -06:00
osiris 98e0e96494 Implemented rework suggestion by adding backer to group aggregation 2020-01-08 17:17:48 +08:00
osiris 2427743d0f Fix bug in NPC style display 2020-01-08 16:35:02 +08:00