IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,808 Commits 5 Branches 2 Tags
Commit Graph

8808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
a09a767fd1 Visit root path before reloading 2020-02-21 18:58:16 +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
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
Robert Schäfer
c963b364e1
Merge pull request #3069 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.11.1 
build(deps): bump metascraper-date from 5.10.7 to 5.11.1 in /backend
 2020-02-20 13:55:59 +01:00
Robert Schäfer
f85975e48d
Merge pull request #3070 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.11.1 
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend
 2020-02-20 13:55:46 +01:00
mattwr18
1fefc6e754 Take advantage of Cypress built-in promises 2020-02-20 12:38:09 +01:00
Wolfgang Huß
a65d94857d Fix filedReport query in Cypress test 2020-02-20 11:11:42 +01:00
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
5c7f92e557 Remove user GQL prop 'filedUnclosedReportByCurrentUser' again 
- Shall be implemented in a later PR.
 2020-02-20 10:54:34 +01:00
mattwr18
447b19eea0 Use cy.exec() to talk to the database 
- Cypress says "To talk to your database or server you need to use the
  cy.exec(), cy.task(), or cy.request() commands. That means you will
need to expose a way to seed and setup your database." https://docs.cypress.io/guides/references/trade-offs.html#Inside-the-browser
 2020-02-20 10:52:36 +01:00
mattwr18
29e01fcd21 Merge branch 'master' of github.com:Human-Connection/Human-Connection into avoid-async-await-in-cypress 2020-02-20 10:50:09 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:35:37 +01:00
Wolfgang Huß
a84d78e3ee Fix key doubling error in ReportTable.vue 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:23:24 +01:00
mattwr18
6c32104330 Clean database with neode and Cypress.Promise 2020-02-20 09:55:35 +01:00
mattwr18
c8a9db6ee3
Merge pull request #3047 from Human-Connection/dependabot/npm_and_yarn/webapp/xregexp-4.3.0 
build(deps): bump xregexp from 4.2.4 to 4.3.0 in /webapp
 2020-02-20 09:32:24 +01:00
mattwr18
b0bb00f7a5
Merge pull request #3068 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.11.1 
build(deps): bump metascraper-publisher from 5.10.7 to 5.11.1 in /backend
 2020-02-20 09:32:03 +01:00
mattwr18
fb0adebc47
Merge pull request #3113 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.12.4 
build(deps): bump @sentry/node from 5.12.3 to 5.12.4 in /backend
 2020-02-20 09:31:44 +01:00
dependabot-preview[bot]
312b950590
build(deps): bump @sentry/node from 5.12.3 to 5.12.4 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.12.3 to 5.12.4.
- [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.3...5.12.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-20 04:18:08 +00:00
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
Alina Beck
f564126e13 fix disabled content styles 2020-02-20 00:32:18 +01:00
dependabot-preview[bot]
43670d5d2b
build(deps): bump xregexp from 4.2.4 to 4.3.0 in /webapp 
Bumps [xregexp](https://github.com/slevithan/xregexp) from 4.2.4 to 4.3.0.
- [Release notes](https://github.com/slevithan/xregexp/releases)
- [Commits](https://github.com/slevithan/xregexp/compare/v4.2.4...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 23:12:23 +00:00
dependabot-preview[bot]
196883c23c
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](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-19 23:10:39 +00:00
dependabot-preview[bot]
64c03e13f0
build(deps): bump metascraper-author from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-author](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-19 23:10:28 +00:00
dependabot-preview[bot]
eb6a949993
build(deps): bump metascraper-date from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-date](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-19 23:10:27 +00:00
Robert Schäfer
0fdddddfbe
Merge pull request #3109 from Human-Connection/lokalise-2020-02-19_10-27-49 
feat: German Translations Update By Andreas Plank
 2020-02-19 23:33:56 +01:00
mattwr18
8a2b1d00b4
Merge pull request #3093 from Human-Connection/3004_Remove_Hover_Menu_from_User_Teaser 
fix(frontend): Remove Hover Menu from User Teaser
 2020-02-19 22:34:10 +01:00
mattwr18
c41adae787
Merge pull request #3030 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /webapp
 2020-02-19 22:33:35 +01:00
mattwr18
36fda479ea
Merge pull request #2981 from Human-Connection/fix_nullpointer_issue_when_post_author_is_anonymous 
fix(frontend): Post page won't crash on anonymous user
 2020-02-19 22:32:25 +01:00
Alina Beck
46616f5e6b update cypress tests 2020-02-19 20:50:40 +01:00
mattwr18
25a3f1963c
Merge pull request #3110 from Human-Connection/another_try_to_fix_hanging_cypress_tests 
chore(cypress): Remove debug statements
 2020-02-19 19:59:24 +01:00
Robert Schäfer
cfd25842c9
Merge pull request #3066 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.11.1 
build(deps): bump metascraper-audio from 5.10.7 to 5.11.1 in /backend
 2020-02-19 16:55:42 +01:00
Robert Schäfer
ee6eb06667
Merge pull request #3081 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.2.4 
build(deps): bump @nuxtjs/sentry from 3.2.3 to 3.2.4 in /webapp
 2020-02-19 16:55:19 +01:00
roschaefer
1a0dd36edd chore(cypress): Remove debug statements 2020-02-19 16:51:49 +01:00
Alina Beck
4a17cf0e07 move deleteImage logic to ImageUploader 2020-02-19 15:55:10 +01:00