9725 Commits

Author SHA1 Message Date
Brandon Tripp
f71fb6b07b Modified reveal password wrapper to contain test data, added tests for icon default and change of icon upon click. Preliminary test for returning focus to input field. 2020-11-24 15:35:35 -07:00
Moriz Wahl
e47671c52a further changed requested by Tirokk 2020-11-24 19:10:46 +01:00
Moriz Wahl
5b02050efc Merge branch 'white-labeling' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling 2020-11-23 13:44:45 +01:00
Moriz Wahl
16cdcc921e further changes 2020-11-23 13:44:16 +01:00
Mogge
75658a2f32
Merge branch 'master' into white-labeling 2020-11-23 13:35:40 +01:00
Moriz Wahl
6454e686e9 changes requested implemented 2020-11-23 13:34:07 +01:00
dependabot-preview[bot]
d2a715edf0
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /webapp
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 05:38:41 +00:00
dependabot-preview[bot]
a719818044
Bump @babel/preset-env from 7.9.0 to 7.12.7
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.9.0 to 7.12.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.7/packages/babel-preset-env)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 04:58:45 +00:00
Brandon Tripp
0b03bf2fcc Initial attempt at spec for show/hide password 2020-11-20 15:15:09 -07:00
Brandon Tripp
74b56cbca7 linting of LoginForm.vue 2020-11-20 14:10:43 -07:00
Brandon Tripp
f56664b334 Refactor of click event to use a methhod and the @click rather than mouse down. Small adjustment to button spacing. 2020-11-20 13:39:43 -07:00
Mogge
e9d84db3bc
Merge pull request #3976 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/apollo-server-express-2.19.0
[Security] Bump apollo-server-express from 2.9.7 to 2.19.0 in /webapp
2020-11-20 21:22:26 +01:00
Mogge
02ee9c80ea
Merge pull request #3949 from Ocelot-Social-Community/dependabot/npm_and_yarn/elliptic-6.5.3
[Security] Bump elliptic from 6.4.1 to 6.5.3
2020-11-20 21:20:55 +01:00
dependabot-preview[bot]
c217065612
[Security] Bump apollo-server-express from 2.9.7 to 2.19.0 in /webapp
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-express) from 2.9.7 to 2.19.0. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-express@2.19.0/packages/apollo-server-express)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 20:11:51 +00:00
dependabot-preview[bot]
d8cb696149
[Security] Bump elliptic from 6.4.1 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 20:11:17 +00:00
Mogge
533700b0aa
Merge pull request #3974 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/markdown-to-jsx-6.11.4
[Security] Bump markdown-to-jsx from 6.10.3 to 6.11.4 in /webapp
2020-11-20 21:11:13 +01:00
Mogge
624fe1dd09
Merge pull request #3966 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/elliptic-6.5.3
[Security] Bump elliptic from 6.4.1 to 6.5.3 in /webapp
2020-11-20 21:09:59 +01:00
Mogge
284d01840a
Merge pull request #3957 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/prettier-2.2.0
Bump prettier from 2.0.4 to 2.2.0 in /backend
2020-11-20 21:08:39 +01:00
Mogge
8f85c0b613
Merge pull request #3953 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/dot-prop-4.2.1
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /backend
2020-11-20 21:07:27 +01:00
Mogge
62261f4b92
Merge pull request #3954 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/object-path-0.11.5
[Security] Bump object-path from 0.11.4 to 0.11.5 in /backend
2020-11-20 21:01:44 +01:00
Mogge
19126c032a
Merge pull request #3955 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/migrate-1.7.0
Bump migrate from 1.6.2 to 1.7.0 in /backend
2020-11-20 20:53:22 +01:00
Mogge
883ae4d8d1
Merge pull request #3952 from Ocelot-Social-Community/dependabot/npm_and_yarn/faker-91dc8a3
Bump faker from `3b2fa4a` to `91dc8a3`
2020-11-20 20:38:23 +01:00
Mogge
e2f4b99561
Merge pull request #3961 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/jquery-3.5.1
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend
2020-11-20 20:36:39 +01:00
dependabot-preview[bot]
f7fdcc975b
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /backend
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 19:31:03 +00:00
Mogge
fd6b770e75
Merge pull request #3965 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/dot-prop-4.2.1
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp
2020-11-20 20:29:33 +01:00
dependabot-preview[bot]
43df22208a
Bump prettier from 2.0.4 to 2.2.0 in /backend
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.4 to 2.2.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.4...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 19:22:54 +00:00
Mogge
cb014e0766
Merge pull request #3973 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.4
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp
2020-11-20 20:20:31 +01:00
Mogge
f1953385fa
Merge pull request #3983 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/apollo-server-2.14.2
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend
2020-11-20 20:00:33 +01:00
Mogge
588caf2f5d
Merge pull request #3982 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/node-fetch-2.6.1
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend
2020-11-20 19:59:33 +01:00
dependabot-preview[bot]
6445ad2e08
Bump migrate from 1.6.2 to 1.7.0 in /backend
Bumps [migrate](https://github.com/visionmedia/node-migrate) from 1.6.2 to 1.7.0.
- [Release notes](https://github.com/visionmedia/node-migrate/releases)
- [Changelog](https://github.com/tj/node-migrate/blob/main/History.md)
- [Commits](https://github.com/visionmedia/node-migrate/compare/v1.6.2...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:48:36 +00:00
Mogge
f67ebe7005
Merge pull request #3960 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-author-5.14.22
Bump metascraper-author from 5.11.8 to 5.14.22 in /backend
2020-11-20 19:46:23 +01:00
Mogge
caa7636dd6
Merge pull request #3963 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/storybook-design-token-0.8.1
Bump storybook-design-token from 0.7.2 to 0.8.1 in /webapp
2020-11-20 19:41:57 +01:00
Mogge
48a5d770a6
Merge pull request #3964 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/http-proxy-1.18.1
[Security] Bump http-proxy from 1.17.0 to 1.18.1 in /webapp
2020-11-20 19:41:03 +01:00
dependabot-preview[bot]
65d04eba96
Bump eslint-plugin-prettier from 3.1.2 to 3.1.4 in /webapp
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.2...v3.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:39:45 +00:00
Mogge
bc7100071d
Merge pull request #3970 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/babel/core-7.12.3
Bump @babel/core from 7.9.0 to 7.12.3 in /webapp
2020-11-20 19:38:24 +01:00
Mogge
c8537dac57
Merge pull request #3971 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-24.1.3
Bump eslint-plugin-jest from 23.8.2 to 24.1.3 in /webapp
2020-11-20 19:36:24 +01:00
dependabot-preview[bot]
5e45f3aaa4
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /webapp
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:34:36 +00:00
dependabot-preview[bot]
d2d226cf0a
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.1. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:34:22 +00:00
Mogge
7df50e62cd
Merge pull request #3980 from Ocelot-Social-Community/dependabot/npm_and_yarn/codecov-3.7.1
[Security] Bump codecov from 3.6.5 to 3.7.1
2020-11-20 19:33:50 +01:00
Brandon Tripp
59df64027e adding linted code to pull request. 2020-11-20 11:33:11 -07:00
Mogge
355e718ba9
Merge pull request #3981 from Ocelot-Social-Community/dependabot/npm_and_yarn/standard-version-8.0.1
[Security] Bump standard-version from 7.1.0 to 8.0.1
2020-11-20 19:32:45 +01:00
dependabot-preview[bot]
6a0675c5c1
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend
Bumps [apollo-server](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server) from 2.11.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server@2.14.2/packages/apollo-server)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:28:32 +00:00
dependabot-preview[bot]
fe1ea862a6
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:28:32 +00:00
Mogge
cc43e4f414
Merge pull request #3984 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/apollo-server-express-2.14.2
[Security] Bump apollo-server-express from 2.12.0 to 2.14.2 in /backend
2020-11-20 19:26:42 +01:00
Moriz Wahl
0b978cb017 merging conflicts after rebase 2020-11-20 19:02:57 +01:00
dependabot-preview[bot]
2530ff96d5 build(deps): [security] bump apollo-server-express in /backend
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.12.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-express@2.12.0...apollo-server-express@2.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 18:53:51 +01:00
Brandon Tripp
d33b9861fa added to new style to password field to incorporate the ds-input with the hide and show password icon 2020-11-20 10:30:39 -07:00
Brandon Tripp
15cd45e8e1 added password field icon and toggle functionality for the icon and password field on hide/reveal icon click 2020-11-20 09:26:35 -07:00
dependabot-preview[bot]
6052a5957f
[Security] Bump apollo-server-express from 2.12.0 to 2.14.2 in /backend
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-express) from 2.12.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-express@2.14.2/packages/apollo-server-express)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 15:07:33 +00:00
dependabot-preview[bot]
746cdde6b5
[Security] Bump standard-version from 7.1.0 to 8.0.1
Bumps [standard-version](https://github.com/conventional-changelog/standard-version) from 7.1.0 to 8.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/conventional-changelog/standard-version/releases)
- [Changelog](https://github.com/conventional-changelog/standard-version/blob/master/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/standard-version/compare/v7.1.0...v8.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-20 15:06:41 +00:00