eb4e382ecf
stop 'pts' from overflowing to next line
2020-03-26 14:52:25 +11:00
4300c7b1bf
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2020-03-24 20:31:27 +01:00
2cd0ed5973
fix(logger): improve logging and make sure no data is lost
2020-03-24 20:29:31 +01:00
6e8bdf4cdf
Merge branch 'release' into develop
2020-03-24 13:14:15 -05:00
0bac1102cc
4.138.1
2020-03-24 13:13:55 -05:00
3e96e54ad8
feat(event): eggy eggy
2020-03-24 13:13:50 -05:00
3458d89c1d
fix(webhook tests): do not rely on toLocaleString when checking for two dates to be close
2020-03-24 12:28:15 +01:00
25e72ad907
Reward with negative cost can no longer be created, fixes #11855 ( #11870 )
...
* Minor refactoring in scoreTask.js
* Reward value validation added (should be >= 0)
2020-03-24 12:10:10 +01:00
5cf6a67a36
(website/client/src/components/settings/site.vue): Fix refresh the de-register social media buttons. ( #11992 )
2020-03-23 17:49:00 +01:00
9dcce382a3
fix(webhook tests): more reliable date test
2020-03-23 17:17:27 +01:00
f6484c872a
Fixes Japanese conversion bugs on Safari and Chrome ( #11917 )
...
decided to fix using flags since KeyboardEvent.isComposing behaves differently depending on the browser
2020-03-23 16:35:17 +01:00
249ba77c01
edit string to say Pet Food, not food ( #11994 )
...
Also capitalise terms that are usually capitalised these days.
2020-03-23 16:32:37 +01:00
7ff590cd88
build(deps): bump mongoose from 5.9.3 to 5.9.5 ( #12001 )
...
Bumps [mongoose](https://github.com/Automattic/mongoose ) from 5.9.3 to 5.9.5.
- [Release notes](https://github.com/Automattic/mongoose/releases )
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md )
- [Commits](https://github.com/Automattic/mongoose/compare/5.9.3...5.9.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:58:24 +01:00
f297fef89e
build(deps): bump @babel/preset-env from 7.8.7 to 7.9.0 ( #12007 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.8.7 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.7...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:49:47 +01:00
b037cb0722
build(deps): bump @babel/register from 7.8.6 to 7.9.0 ( #12009 )
...
Bumps [@babel/register](https://github.com/babel/babel ) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:36:18 +01:00
b8c58a7e4f
build(deps): bump morgan from 1.9.1 to 1.10.0 ( #12000 )
...
Bumps [morgan](https://github.com/expressjs/morgan ) from 1.9.1 to 1.10.0.
- [Release notes](https://github.com/expressjs/morgan/releases )
- [Changelog](https://github.com/expressjs/morgan/blob/master/HISTORY.md )
- [Commits](https://github.com/expressjs/morgan/compare/1.9.1...1.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:35:30 +01:00
f973bf1038
build(deps): [security] bump acorn in /website/client ( #11996 )
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 6.3.0 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:35:10 +01:00
aaea985cf2
build(deps): bump bootstrap-vue from 2.7.0 to 2.8.0 in /website/client ( #11997 )
...
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue ) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases )
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:34:57 +01:00
1d0e08419f
build(deps): bump @babel/core from 7.8.7 to 7.9.0 ( #12003 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.8.7 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.7...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:34:20 +01:00
fd6244eb15
build(deps): bump aws-sdk from 2.639.0 to 2.643.0 ( #12004 )
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js ) from 2.639.0 to 2.643.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases )
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.639.0...v2.643.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-23 10:34:03 +01:00
f8aa756d52
Disable Failing Webhooks ( #11966 )
...
* todo comment
* add failures field to webhooks and sanitize
* implement logic
* use update instead of save
* specify timeout and maximum number of retries
* add tests
2020-03-20 23:26:21 +01:00
ae7df804cb
fix(promise): make sure every promise is handled
2020-03-20 20:07:13 +01:00
de37eb1bb2
Merge branch 'release' into develop
2020-03-19 08:12:00 -05:00
cf03261bbf
4.138.0
2020-03-19 08:11:37 -05:00
3ec95ad821
fix(event): feature something from 2020
2020-03-19 08:11:30 -05:00
57d11d5b20
Merge branch 'develop' into release
2020-03-19 08:10:56 -05:00
039e7d40b8
fix(tests): do not rely on emails order when user joins group plan
2020-03-18 23:31:01 +01:00
4389a9b478
Merge branch 'release' into develop
2020-03-18 20:39:14 +01:00
289032047c
4.137.1
2020-03-18 19:39:37 +01:00
6f5515214a
update mongoose options
2020-03-18 19:36:10 +01:00
fd2c4e3265
fix(sprites): CUBBB
2020-03-18 13:35:53 -05:00
dd91bada8f
Merge branch 'release' into develop
2020-03-18 19:30:11 +01:00
d724933640
update mongoose options
2020-03-18 19:20:09 +01:00
e4b74bc347
fix(content): feature shinies
2020-03-18 11:15:49 -05:00
c609db09c1
fix(content): feature shinies
2020-03-18 11:15:10 -05:00
55feebdf9e
Merge branch 'release' into develop
2020-03-17 15:36:35 -05:00
d8a99647e7
chore(sprites): compile
2020-03-17 15:35:49 -05:00
353b4aed05
feat(content): Magic Hatching Potions
2020-03-17 15:35:38 -05:00
411f82202b
feat(content): Spring Fling 2020
2020-03-17 14:49:22 -05:00
5a5a6e4c5d
feat(content): Spring Fling 2020
2020-03-17 14:48:49 -05:00
914eee015e
Merge branch 'release' into develop
2020-03-17 09:12:29 -05:00
bbbc06733b
4.137.0
2020-03-17 09:12:06 -05:00
92c3a640ee
feat(content): Bug Bonanza achievement
2020-03-17 09:11:41 -05:00
a301f817e9
Fix for party members missing from header after viewing private messages / inbox / PMs ( #11912 )
...
* Fix bug in missing party members in app header
* Modified by running lint
* Change code for handling missing party members in app header from within computed hiddenHeader property to watcher function on hiddenHeader
Co-authored-by: osiris <eynsan@yahoo.co.uk >
2020-03-16 22:17:52 +01:00
519af8f1b6
Fix for search guilds result being inconsistent between "My Guilds" and "Discover Guilds" ( #11903 )
...
* Fix bug to allow guild summary and description to match against search term in MyGuilds component
* Add unit test to groupUtilities to test filterGroup function
* Changes made after running npm:run:lint
* Fix bug when filter guild function does not match against guild size correctly when the guild has member count = 100 or 1000
According to habitica wiki Guilds Guide, gold-tier guilds are guilds with 1000 or more members. However, under the current code of filter guild function, it matches guilds as gold-tier as strictly more than 1000 members, excluding 1000 members. Similar silver-tier guilds should have 100 to 999 members, but the current code it matches guilds as silver-tier for members between 101 and 999 members.
* Added unit tests to test the newly added code in the groupsUtilities mixin for the current issue
* Add unit testing to test search guild name, summary, and description in myGuilds component
* Add suggestions from lint
* Added searching by guild summary and white space handling in search terms.
For discover guilds component, added the following:
1) handling of searching by guild summary
2) preventing white space in search terms to display all guilds
3) added test cases for testing the search functionality in discove guilds to ensure consistent behaviour between the searching in MyGuilds and public guilds.
* Remove console statements from test file
* Implement suggestions from lint.
Co-authored-by: osiris <eynsan@yahoo.co.uk >
2020-03-16 20:03:48 +01:00
a71abea032
build(deps): bump @storybook/addon-knobs in /website/client ( #11977 )
...
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs ) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/addons/knobs )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:26:27 +01:00
3c623b08c4
build(deps): [security] bump acorn from 6.3.0 to 6.4.1 ( #11970 )
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 6.3.0 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:24:30 +01:00
ddfa3f8a91
build(deps): bump @storybook/vue in /website/client ( #11984 )
...
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue ) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/app/vue )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:22:52 +01:00
e2d1de0cf0
build(deps): bump @storybook/addon-links in /website/client ( #11975 )
...
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links ) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases )
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md )
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/addons/links )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:22:36 +01:00
9281de1801
build(deps): bump regenerator-runtime from 0.13.3 to 0.13.5 ( #11976 )
...
Bumps [regenerator-runtime](https://github.com/facebook/regenerator ) from 0.13.3 to 0.13.5.
- [Release notes](https://github.com/facebook/regenerator/releases )
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.3...regenerator-runtime@0.13.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-16 15:20:11 +01:00
inftp