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,839 Commits 117 Branches 1,511 Tags
Commit Graph

8839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
decc0dceb4
Merge pull request #3149 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.11.1 
build(deps): bump metascraper-description from 5.11.0 to 5.11.1 in /backend
 2020-02-24 22:32:19 +01:00
mattwr18
d644f9fc88
Merge pull request #3146 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.8.0 
build(deps-dev): bump eslint-plugin-jest from 23.7.0 to 23.8.0 in /backend
 2020-02-24 22:31:58 +01:00
mattwr18
93522803bc
Merge pull request #3145 from Human-Connection/dependabot/npm_and_yarn/backend/sanitize-html-1.22.0 
build(deps): bump sanitize-html from 1.21.1 to 1.22.0 in /backend
 2020-02-24 22:31:40 +01:00
mattwr18
3f4c6c8f16
Merge pull request #3144 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.3 
build(deps): bump nodemailer from 6.4.2 to 6.4.3 in /backend
 2020-02-24 22:31:16 +01:00
mattwr18
114c62dcce
Merge pull request #3143 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.11.1 
build(deps): bump metascraper-video from 5.10.7 to 5.11.1 in /backend
 2020-02-24 22:30:59 +01:00
dependabot-preview[bot]
d89a082d20
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.0...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 04:19:32 +00:00
dependabot-preview[bot]
8ba6df9abd
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.7.0 to 23.8.0.
- [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.7.0...v23.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 04:17:50 +00:00
dependabot-preview[bot]
03b08680e0
build(deps): bump sanitize-html from 1.21.1 to 1.22.0 in /backend 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.21.1 to 1.22.0.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/1.22.0/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.21.1...1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 04:17:22 +00:00
dependabot-preview[bot]
137049d4c3
build(deps): bump nodemailer from 6.4.2 to 6.4.3 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.2 to 6.4.3.
- [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.2...v6.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 04:16:53 +00:00
dependabot-preview[bot]
61cd799df6
build(deps): bump metascraper-video from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 04:16:26 +00:00
Robert Schäfer
4960f390f0
Merge pull request #3138 from Human-Connection/2750-terms-of-use-extend-point-no-parties 
feat: the point -no political use - added
v0.4.0 		2020-02-22 16:53:26 +01:00
ogerly
6472cec0c6 terms-and-condition: the point -no political use - added 2020-02-22 14:38:32 +01:00
Robert Schäfer
1d5d7441da
Merge pull request #3071 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.11.1 
build(deps): bump metascraper-lang from 5.10.7 to 5.11.1 in /backend
 2020-02-22 12:43:49 +01:00
Robert Schäfer
865a0da339
Merge pull request #3136 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.11.4 
build(deps): bump metascraper from 5.11.0 to 5.11.4 in /backend
 2020-02-22 12:43:32 +01:00
Robert Schäfer
9db32e6824
Merge pull request #3137 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.11.4 
build(deps): bump metascraper-soundcloud from 5.10.7 to 5.11.4 in /backend
 2020-02-22 12:43:13 +01:00
Lala Sabathil
11d2b8174b
Merge pull request #3132 from Human-Connection/update-to-version-0.4.0 
chore: Update to v0.4.0
 2020-02-22 06:24:15 +01:00
dependabot-preview[bot]
c7477f33e0
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.10.7 to 5.11.4.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 01:32:36 +00:00
dependabot-preview[bot]
b86c209c7c
build(deps): bump metascraper from 5.11.0 to 5.11.4 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.11.0 to 5.11.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.0...v5.11.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 01:32:33 +00:00
dependabot-preview[bot]
7f660e0f41
build(deps): bump metascraper-lang from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 01:32:32 +00:00
Robert Schäfer
84572f1261
Merge pull request #3126 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.11.1 
build(deps): bump metascraper-logo from 5.10.7 to 5.11.1 in /backend
 2020-02-22 02:30:31 +01:00
dependabot-preview[bot]
56f3f882b6
build(deps): bump metascraper-logo from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-21 21:06:39 +00:00
Robert Schäfer
b0505ecccc
Merge pull request #3121 from Human-Connection/favor-firefox-in-cypress 
chore(cypress): Favor firefox in cypress
 2020-02-21 22:04:16 +01:00
Robert Schäfer
96a87177d4
Merge pull request #3127 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.13 
build(deps): bump graphql-shield from 7.0.11 to 7.0.13 in /backend
 2020-02-21 22:02:10 +01:00
Robert Schäfer
c4886c8bcb
Merge pull request #3128 from Human-Connection/dependabot/npm_and_yarn/backend/ioredis-4.16.0 
build(deps): bump ioredis from 4.14.1 to 4.16.0 in /backend
 2020-02-21 22:01:46 +01:00
mattwr18
2f99207760 Update to v0.4.0 2020-02-21 19:04:53 +01:00
mattwr18
0612ceea40 v0.4.0 2020-02-21 19:04:04 +01:00
mattwr18
a09a767fd1 Visit root path before reloading 2020-02-21 18:58:16 +01:00
Robert Schäfer
34b2c51e73
Merge pull request #3125 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.10.1 
build(deps): bump apollo-server from 2.10.0 to 2.10.1 in /backend
 2020-02-21 17:11:47 +01:00
mattwr18
2516da57c2 Add cypress retries again 2020-02-21 14:50:17 +01:00
mattwr18
e9c0d44055 Favor firefox as test runner in cypress 
- we have recommended our users to use firefox, so why should we test in
  Electron?
 2020-02-21 14:05:01 +01:00
dependabot-preview[bot]
cb5d0af223
build(deps): bump apollo-server from 2.10.0 to 2.10.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.10.0 to 2.10.1.
- [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@2.10.0...apollo-server@2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-21 12:56:14 +00:00
dependabot-preview[bot]
2d7b9cef03
build(deps): bump graphql-shield from 7.0.11 to 7.0.13 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.11 to 7.0.13.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.11...v7.0.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-21 12:50:49 +00:00
dependabot-preview[bot]
b06d66ebee
build(deps): bump ioredis from 4.14.1 to 4.16.0 in /backend 
Bumps [ioredis](https://github.com/luin/ioredis) from 4.14.1 to 4.16.0.
- [Release notes](https://github.com/luin/ioredis/releases)
- [Changelog](https://github.com/luin/ioredis/blob/master/Changelog.md)
- [Commits](https://github.com/luin/ioredis/compare/v4.14.1...v4.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-21 12:50:49 +00:00
Robert Schäfer
c81de16be0
Merge pull request #3115 from Human-Connection/avoid-async-await-in-cypress 
fix: Favor Cypress.Promise over async/await in e2e tests
 2020-02-21 13:43:36 +01:00
mattwr18
7d215beafc Remove trailing comma 2020-02-21 12:56:11 +01:00
mattwr18
2640fcf967
Merge pull request #3120 from Human-Connection/new-link-setup-db 
docs(setup): Fix links in tests
 2020-02-21 12:48:04 +01:00
Robert Schäfer
e164104791
Merge pull request #3075 from Human-Connection/3074-don’t-expose-all-properties-of-report 
feat: 🍰 Expose sensitive report type to moderators only
 2020-02-21 12:43:28 +01:00
mattwr18
8fd8c18740
chore: remove unused dependencies key 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2020-02-21 12:10:19 +01:00
Robert Schäfer
fa32c5789b
Merge pull request #2870 from Human-Connection/migrate-styleguide-card 
refactor: migrate card component
 2020-02-21 11:59:52 +01:00
mattwr18
db2cc87dc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into avoid-async-await-in-cypress 2020-02-21 11:30:24 +01:00
Robert Schäfer
396678511c
Merge pull request #3114 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.11.1 
build(deps): bump metascraper-youtube from 5.10.7 to 5.11.1 in /backend
 2020-02-21 00:49:09 +01:00
ogerly
597913555e change: New Link, Learn how to setup the database 2020-02-20 23:17:20 +01:00
dependabot-preview[bot]
6dc84cfe8a
build(deps): bump metascraper-youtube from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 22:13:16 +00:00
Robert Schäfer
a58bc30ae9
Merge pull request #3119 from Human-Connection/upgrade-cypress 
fix(cypress): Upgrade cypress, remove log out step
 2020-02-20 23:10:03 +01:00
mattwr18
0df40386dd Upgrade cypress, remove log out step 
- possibly related to this issue, and removes duplication https://github.com/cypress-io/cypress/issues/5139
 2020-02-20 19:34:27 +01:00
mattwr18
f67a000c11 Stub Websockets, remove vue-loader 
- no reason we need websockets to try connect endlessly
- vue-loader was stopping the cypress tests in debugger at webpack:///./node_modules/vue-style-loader/lib/addStylesClient.js?499e
and we are not using anywhere.
 2020-02-20 18:24:31 +01:00
roschaefer
9b2175786e Fix client-only warning 2020-02-20 15:47:47 +01:00
roschaefer
9241305d43 fix: Prever FileReader over URL.createObjectUrl 
Apparently, URL.createObjectUrl is not supported in JSDom, see:
https://github.com/jsdom/jsdom/issues/1721

With FileReader we have the option to avoid it altogether.
 2020-02-20 15:42:47 +01:00
roschaefer
9c98e30bb8 Fix console.errors 
@mattwr18 @alina-beck there seems to be no switch or configuration to
let vue-test-utils or jest fail whenever there is a call to
`console.error`. The only way to test it for very specific tests is
this. I took it from here:

https://geedew.com/catching-prop-validation-in-vue-with-Jest/
 2020-02-20 14:20:57 +01:00