ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,907 Commits 117 Branches 1,511 Tags
Commit Graph

8907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mogge
f17cf9db14
Merge branch 'master' into lokalise-2020-02-19_20-53-55 2020-03-02 23:14:57 +01:00
Robert Schäfer
44e3619534
Merge pull request #3172 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.8.6 
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /backend
 2020-03-02 17:18:21 +01:00
Robert Schäfer
b8153773d2
Merge pull request #3173 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.8.6 
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6
 2020-03-02 17:18:01 +01:00
mattwr18
0cdae364b8
Merge pull request #3197 from Human-Connection/update-user-at-password-reset 
fix: Update user.updatedAt when password is reset
 2020-03-02 16:18:25 +01:00
Robert Schäfer
2c69998321
Merge pull request #3174 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.8.6 
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 in /backend
 2020-03-02 15:38:25 +01:00
dependabot-preview[bot]
1c0a58f5df
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 14:38:17 +00:00
dependabot-preview[bot]
f39885c927
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 14:37:55 +00:00
Robert Schäfer
66dd730f55
Merge pull request #3183 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.8.6 
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /webapp
 2020-03-02 15:35:51 +01:00
mattwr18
1b7ff116d1 Update user.updatedAt when password is reset 
- this is updating the user node, so it should update the updatedAt.
we recently ran into an issue where we weren't sure if a user had
successfully changed their password with the passwordReset, and needed
to look into it further to see if the PasswordReset had been used or not
to tell if it was successful.
 2020-03-02 15:22:57 +01:00
Robert Schäfer
514dd59775
Merge pull request #3191 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.8.1 
build(deps-dev): bump eslint-plugin-jest from 23.8.0 to 23.8.1 in /backend
 2020-03-02 11:05:22 +01:00
dependabot-preview[bot]
9b8107c1fa
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 09:47:31 +00:00
dependabot-preview[bot]
76591fd049
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.3 to 7.8.6.
- [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.3...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 09:47:28 +00:00
Robert Schäfer
4eee4706b2
Merge pull request #3176 from Human-Connection/dependabot/npm_and_yarn/backend/wait-on-4.0.1 
build(deps): bump wait-on from 4.0.0 to 4.0.1 in /backend
 2020-03-02 10:46:04 +01:00
Robert Schäfer
30ba67fcd5
Merge pull request #3179 from Human-Connection/dependabot/npm_and_yarn/babel/register-7.8.6 
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6
 2020-03-02 10:45:48 +01:00
Robert Schäfer
9e09e36421
Merge pull request #3181 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.8.6 
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /backend
 2020-03-02 10:45:18 +01:00
Robert Schäfer
a653c4a1a0
Merge pull request #3182 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.8.6 
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /webapp
 2020-03-02 10:44:53 +01:00
Robert Schäfer
fd1ce9d31f
Merge pull request #3184 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.2.3 
build(deps-dev): bump @vue/cli-shared-utils from 4.2.2 to 4.2.3 in /webapp
 2020-03-02 10:25:36 +01:00
Robert Schäfer
1d65ce3b3b
Merge pull request #3192 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.13.1 
build(deps): bump @sentry/node from 5.12.4 to 5.13.1 in /backend
 2020-03-02 10:24:46 +01:00
Robert Schäfer
64f92f954b
Merge pull request #3193 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.4 
build(deps): bump nodemailer from 6.4.3 to 6.4.4 in /backend
 2020-03-02 10:24:01 +01:00
dependabot-preview[bot]
0dd4b37222
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.8.0 to 23.8.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.8.0...v23.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 09:13:11 +00:00
Robert Schäfer
d5ce0e04d5
Merge pull request #3195 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.8.1 
build(deps-dev): bump eslint-plugin-jest from 23.8.0 to 23.8.1 in /webapp
 2020-03-02 10:10:48 +01:00
dependabot-preview[bot]
a697e13696
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.8.0 to 23.8.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.8.0...v23.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 04:24:03 +00:00
dependabot-preview[bot]
dc53720c24
build(deps): bump nodemailer from 6.4.3 to 6.4.4 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.3 to 6.4.4.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.3...v6.4.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 04:19:30 +00:00
dependabot-preview[bot]
9774dc077c
build(deps): bump @sentry/node from 5.12.4 to 5.13.1 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.12.4 to 5.13.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.12.4...5.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 04:18:55 +00:00
dependabot-preview[bot]
97b92e5318
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.2.3/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 04:25:13 +00:00
dependabot-preview[bot]
47703cde3a
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 04:23:40 +00:00
dependabot-preview[bot]
a7d89e0bef
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 04:19:57 +00:00
dependabot-preview[bot]
8769fc7668
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.3 to 7.8.6.
- [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.3...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 04:19:32 +00:00
dependabot-preview[bot]
836878a6fb
build(deps): bump wait-on from 4.0.0 to 4.0.1 in /backend 
Bumps [wait-on](https://github.com/jeffbski/wait-on) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/jeffbski/wait-on/releases)
- [Commits](https://github.com/jeffbski/wait-on/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 04:18:50 +00:00
mattwr18
c1205eef1b
Merge pull request #3159 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.10.0 
build(deps): bump date-fns from 2.9.0 to 2.10.0 in /backend
 2020-02-26 15:05:22 +01:00
mattwr18
17e4991c69
Merge pull request #3165 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.14 
build(deps-dev): bump @storybook/vue from 5.3.13 to 5.3.14 in /webapp
 2020-02-26 14:59:21 +01:00
dependabot-preview[bot]
418352ac15
build(deps-dev): bump @storybook/vue from 5.3.13 to 5.3.14 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.13 to 5.3.14.
- [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.14/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 11:13:05 +00:00
Robert Schäfer
d968f1a065
Merge pull request #3168 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.1.0 
build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /webapp
 2020-02-26 12:10:44 +01:00
Robert Schäfer
926cc59dd4
Merge pull request #3166 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.14 
build(deps-dev): bump @storybook/addon-actions from 5.3.13 to 5.3.14 in /webapp
 2020-02-26 12:10:21 +01:00
dependabot-preview[bot]
6e6a5c8fdb
build(deps): bump date-fns from 2.9.0 to 2.10.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 10:58:46 +00:00
Robert Schäfer
7ac37c3435
Merge pull request #3160 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.10.0 
build(deps-dev): bump date-fns from 2.9.0 to 2.10.0
 2020-02-26 11:56:35 +01:00
dependabot-preview[bot]
ad78a0287d
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.13 to 5.3.14.
- [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.14/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 08:36:26 +00:00
dependabot-preview[bot]
66d584ffd1
build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.3 to 10.1.0.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 08:35:54 +00:00
dependabot-preview[bot]
5576c1b93e
build(deps-dev): bump date-fns from 2.9.0 to 2.10.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 08:35:35 +00:00
mattwr18
b180fac246
Merge pull request #3164 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.14 
build(deps-dev): bump @storybook/addon-notes from 5.3.13 to 5.3.14 in /webapp
 2020-02-26 09:33:51 +01:00
mattwr18
23a935c35e
Merge pull request #3163 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.10.0 
build(deps): bump date-fns from 2.9.0 to 2.10.0 in /webapp
 2020-02-26 09:33:29 +01:00
mattwr18
59eefd971f
Merge pull request #3162 from Human-Connection/dependabot/npm_and_yarn/backend/babel-eslint-10.1.0 
build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /backend
 2020-02-26 09:33:11 +01:00
mattwr18
f9f1616138
Merge pull request #3161 from Human-Connection/dependabot/npm_and_yarn/backend/uuid-7.0.1 
build(deps): bump uuid from 7.0.0 to 7.0.1 in /backend
 2020-02-26 09:32:01 +01:00
dependabot-preview[bot]
5ef2b25ee6
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.13 to 5.3.14.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.14/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.14/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 04:22:49 +00:00
dependabot-preview[bot]
5441cdc9d2
build(deps): bump date-fns from 2.9.0 to 2.10.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 04:22:45 +00:00
dependabot-preview[bot]
868f6d1fe8
build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.3 to 10.1.0.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 04:18:10 +00:00
dependabot-preview[bot]
71777f5933
build(deps): bump uuid from 7.0.0 to 7.0.1 in /backend 
Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.0...v7.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-26 04:17:43 +00:00
Robert Schäfer
e3937a00b9
Merge pull request #3044 from Human-Connection/dependabot/npm_and_yarn/backend/xregexp-4.3.0 
build(deps): bump xregexp from 4.2.4 to 4.3.0 in /backend
 2020-02-25 16:39:11 +01:00
Robert Schäfer
9161c828d0
Merge pull request #3147 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.11.1 
build(deps): bump metascraper-url from 5.10.7 to 5.11.1 in /backend
 2020-02-25 16:38:38 +01:00
mattwr18
071e2bef81
Merge pull request #3156 from Human-Connection/fix_uuid_import_deprecations 
chore(build): Fix uuid deprecations
 2020-02-25 15:11:10 +01:00