2362976f14
Merge branch 'develop' into release
2019-11-21 16:17:43 -06:00
99b63456c8
chore(sprites): compile
2019-11-21 16:17:16 -06:00
4ca4fd9ae7
fix(teams): allow dismissal of taks approval requests
2019-11-21 16:16:28 -06:00
66b2b47f87
Merge branch 'release' into develop
2019-11-19 15:26:23 -06:00
23bd51d486
chore(news): BlogBailey
2019-11-19 15:25:53 -06:00
eaad244181
Refactoring & Fix: editing group and challenges from user dashboard ( #11418 )
...
* Refactoring & Feature: edit/delete group and challenge tasks
- Remove showOption from tasks props
- Pass all needed data to task for understand in mapGetter function which controls we should show
- Improve current solution with edit and delete logic
* Fix: this in template
* Fix & Test: extend tests, fix can Edit/Delete functions
* Fix: allow user edit challenge tasks on dashboard
* Fix: test case after code change
* fix import path
* Fix:
- Extend canEdit and canDelete functions with admin role
- Clarify canEdit and canDelete conditions
- Extend test cases
2019-11-16 18:36:27 +01:00
a859dbd646
updated tier styles so that they maintain their color on hover and click ( #11513 )
2019-11-16 18:16:23 +01:00
106290a11e
Changes for fixing issue 11420 ( #11521 )
2019-11-16 18:14:10 +01:00
3fa0bac36f
hatching modal auto height to accommodate longer strings ( #11538 )
2019-11-16 18:10:34 +01:00
f093634cb2
Merge branch '9603_FixLeftPadding' of https://github.com/adamfitzgibbon/habitica into develop
2019-11-16 17:54:58 +01:00
eca1d8501c
Hook up label to input for dontShowAgain checkbox ( #11455 )
...
Now if the user clicks on the label for the checkbox, it will (un)check
the associated checkbox.
2019-11-16 17:50:24 +01:00
3fc0fec95e
11457 fix(task): remove z-index ( #11460 )
...
* fix(task): remove z-index
* fix(task): add z-index on hover with a value of 11
2019-11-16 17:43:29 +01:00
0e679f0fea
settings fixes: show description for other extensions and remove unwanted changes from locales
2019-11-16 17:38:48 +01:00
d55d3fc56d
Merge branch 'firefox-extension-link' of https://github.com/Markkop/habitica into Markkop-firefox-extension-link
2019-11-16 17:33:10 +01:00
27d8ad32e6
Merge branch 'develop' into release
2019-11-14 15:09:18 -06:00
39fd60267c
chore(sprites): compile
2019-11-14 15:08:57 -06:00
2842087a43
Achievements Fixes ( #11540 )
...
* achievements fixes to timeout and modal
* fix string
2019-11-13 21:59:48 +01:00
dc303fb1de
feat(content): enable some Magic Hatching Potions
2019-11-12 15:31:17 -06:00
b441cfa9f3
Merge branch 'release' into develop
2019-11-05 10:30:30 -06:00
b4a517f2d3
chore(sprites): compile
2019-11-05 10:29:48 -06:00
25603634db
update to use bootstrap built in spacing classes
2019-11-03 20:14:22 -06:00
84d76a2ebc
Fix market dropdownmenu default text ( #11481 )
...
* Fix market dropdownmenu default text
Add text attribute to b-dropdown in filterDropdown component
* Fix market dropdownmenu default text
delete the text attribute form b-dropdown because it wasn't the right solution
In filterDropdown b-dropdown tag change the span slot to button-content
to match the recent changes in bootstrap vue
2019-11-02 17:59:57 +01:00
da4dd07de1
fix linting script to make sure errors are reported
2019-11-02 13:08:37 +01:00
6e9ab1dbbb
Merge branch 'release' into develop
2019-11-01 20:14:55 -05:00
74d3141195
chore(sprites): compile
2019-11-01 20:13:59 -05:00
a2a251b2f1
chore(event): end Fall Festival & Habitoween
2019-11-01 20:13:52 -05:00
853b9313f6
[Issue-11394] Challenge Creation/Edit Screen Should Not Close Except By X Button ( #11409 )
2019-11-01 19:02:22 +01:00
a7c814262b
Set specific subpage that is requested when profile is shown ( #11412 )
2019-11-01 19:02:01 +01:00
f02992faa5
moved the free hairstyles to the top of the modal ( #11416 )
2019-11-01 19:01:46 +01:00
d98614d403
Show 0 in the gem prize box if gem prize is null ( #11453 )
...
* show 0 in the gem prize box if gem prize is null
* adding space between brackets
2019-11-01 19:01:28 +01:00
cf00bddd6f
add group by for hatchable sort ( #11459 )
...
* add group by for hatchable sort
* fix display bug when pets are owned
2019-11-01 19:00:59 +01:00
dfd79c9c1a
Use username in challenge member dropdown ( #11478 )
...
* update challenge member dropdown and api to display and search by username rather than display name
* remove accidental whitespace
* fix api test
2019-11-01 19:00:42 +01:00
5cf2c592b5
chore(sprites): compile
2019-10-31 15:03:35 -05:00
d79e0b32d2
feat(event): Habitoween 2019
2019-10-31 15:03:25 -05:00
d1afbf4b92
Revert "Minimum password length + Static Pages fixes ( #11474 )"
...
This reverts commit e1d30eec98
2019-10-31 13:16:09 -05:00
e1d30eec98
Minimum password length + Static Pages fixes ( #11474 )
...
* password min length: server + client side registering
* tweak text, add tests
* misc
* use red border for invalid inputs
* fix auth form for groups
* remove default firefox box shadown on invalid elements
* fix css in authForm
* fix margings
* misc fixes to forms and buttons
* fix typo
2019-10-30 13:47:35 +01:00
2ca3c225c4
some additional padding
2019-10-29 22:03:57 -05:00
9ceb45b058
fix padding on various pages
2019-10-28 23:04:13 -05:00
3643b4d320
fix linting in production
2019-10-27 14:12:14 +01:00
57b9dc374a
Intro.js Fixes and better client side logging ( #11480 )
...
* fix intro.js button and border for username modal
* fix unhandled error and add better logging
2019-10-27 13:11:40 +01:00
9a4e6a5012
Merge branch 'release' into develop
2019-10-24 15:49:55 -05:00
b121585c68
fix(intro): don't use svg for background
2019-10-23 12:48:51 -05:00
9afcf8d5eb
fix(build): do not lint when testing on github
2019-10-22 20:38:01 +02:00
3031caffe8
fix(tests): bad merge, linting
2019-10-22 12:53:00 -05:00
7461a5d509
Merge branch 'release' into develop
2019-10-22 10:37:29 -05:00
7eb75f8587
fix(creatorInfo): enable linting
2019-10-20 14:09:56 +02:00
4881d870c7
Merge branch 'develop' into firefox-extension-link
2019-10-20 13:55:34 +02:00
3e12774e40
Merge branch 'develop' into client-monorepo
2019-10-18 20:26:12 +02:00
94b34f1f80
Merge branch 'develop' into client-monorepo
2019-10-18 17:03:41 +02:00
0bac3c0b5f
misc, fix client tests
2019-10-15 15:32:53 +02:00
Sabe Jones