IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,542 Commits 5 Branches 2 Tags
Commit Graph

10542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lokalise-bot
c4c6c7e711 Lokalise: update of webapp/locales/ru.json 2020-02-19 20:54:02 +01:00
lokalise-bot
e1c8b7a666 Lokalise: update of webapp/locales/pt.json 2020-02-19 20:54:00 +01:00
lokalise-bot
28e2967119 Lokalise: update of webapp/locales/fr.json 2020-02-19 20:53:58 +01:00
lokalise-bot
ef2af3c8bb Lokalise: update of webapp/locales/es.json 2020-02-19 20:53:56 +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
Alina Beck
888051a6ae simplify formData in ContributionForm 2020-02-19 14:18:54 +01:00
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Wolfgang Huß
5ffaac193d Refactor tests, going on 2020-02-19 11:37:31 +01:00
Robert Schäfer
9bc9ccae79
Merge pull request #3078 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.10.1 
build(deps-dev): bump apollo-server-testing from 2.10.0 to 2.10.1 in /backend
 2020-02-19 11:26:02 +01:00
Alina Beck
e38b6f9625 rename TeaserImage component to ImageUploader 2020-02-19 10:51:04 +01:00
roschaefer
f2e2db0bc7 fix(frontend): error when post.author null 2020-02-19 10:49:08 +01:00
Alina Beck
7d7b35d069 combine duplicate image uploader methods after merge 2020-02-19 10:46:27 +01:00
dependabot-preview[bot]
283d02a219
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.6.0 to 23.7.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.6.0...v23.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 09:30:50 +00:00
lokalise-bot
d21881e8eb Lokalise: update of webapp/locales/de.json 2020-02-19 10:27:52 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
dependabot-preview[bot]
b6bca1879f
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](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-testing@2.10.0...apollo-server-testing@2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-19 08:51:19 +00:00
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null 
fix(subscriptions): Don't publish undefined
 2020-02-19 09:47:38 +01:00
mattwr18
90dfe32080
Merge pull request #3077 from Human-Connection/dependabot/npm_and_yarn/webapp/yarn-1.22.0 
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp
 2020-02-19 09:35:42 +01:00
Wolfgang Huß
f380915b2c Refactor GQL and tests, first approach 2020-02-19 08:09:14 +01:00
dependabot-preview[bot]
132029460a
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp 
Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.17.3 to 1.22.0. **This update includes a security fix.**
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/compare/v1.17.3...v1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 23:41:00 +00:00
Robert Schäfer
65649aa0eb
Merge pull request #3003 from Human-Connection/normalize-locale-files 
feat: Normalize locales/json files
 2020-02-19 00:39:15 +01:00