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
6,230 Commits 5 Branches 2 Tags
Commit Graph

1479 Commits

Author SHA1 Message Date
Wolfgang Huß
82228c6c99 Refactored backend database to a single REPORTED relation 2019-10-11 16:35:15 +02:00
Wolfgang Huß
94c7d73019 Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-11 08:17:15 +02:00
Wolfgang Huß
2a034ee74f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 
# Conflicts:
#	webapp/locales/de.json
 2019-10-11 08:16:00 +02:00
roschaefer
c8c0414564 fix: send nonce along with signup mail 2019-10-11 00:54:19 +02:00
roschaefer
9ac1e333d6 feat: implement public registration checks 2019-10-11 00:54:19 +02:00
Wolfgang Huß
a07010f50c First step of implementing direct report relation 2019-10-10 15:38:20 +02:00
mattwr18
6955323f51
Merge pull request #1852 from Human-Connection/Allow_embedded_code_in_posts_permanent_memory-II 
Save user setting to show embed code II
 2019-10-10 14:58:49 +02:00
Wolfgang Huß
da3d6561b0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-10 08:15:59 +02:00
Wolfgang Huß
b41f340ad6 Fix Cypher test by correcting syntax of GraphQL report mutation 2019-10-10 08:15:17 +02:00
dependabot-preview[bot]
2e13b6911c
build(deps): bump nodemailer from 6.3.0 to 6.3.1 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.0 to 6.3.1.
- [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.3.0...v6.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-10 05:08:06 +00:00
mattwr18
e553d397a1
Merge pull request #1837 from Human-Connection/dependabot/docker/backend/node-12.11.1-alpine 
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend
 2019-10-09 17:14:14 +02:00
Wolfgang Huß
377dc2af53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-09 16:23:53 +02:00
mattwr18
f6264b3ad8
Merge pull request #1847 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.3 
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:42:24 +02:00
mattwr18
dcaa5d5ebf
Merge pull request #1846 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.3 
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:41:35 +02:00
dependabot-preview[bot]
37bf09dc6e
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend 
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:33:36 +00:00
dependabot-preview[bot]
4cd054834c
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:31:51 +00:00
dependabot-preview[bot]
297df951d3
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:31:11 +00:00
mattwr18
4eb312b1ab
Merge pull request #1843 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.6.3 
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend
 2019-10-09 10:29:59 +02:00
dependabot-preview[bot]
ef1b401d07
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 04:52:42 +00:00
mattwr18
bced6983ea Fix lint, update tests 
- to remove vue warnings
- favor one expectation per it block
 2019-10-08 20:47:13 +02:00
ogerly
1309aa5842 Merge branch 'Allow_embedded_code_in_posts_permanent_memory' of https://github.com/Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 18:57:28 +02:00
ogerly
e2da57287b change providers.json 2019-10-08 18:56:45 +02:00
mattwr18
271cacb8fe Merge branch 'master' of github.com:Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 13:01:07 +02:00
dependabot-preview[bot]
37dff79494
build(deps-dev): bump cucumber from 6.0.1 to 6.0.2 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:01:55 +00:00
Alina Beck
49dfc8ac9d
Merge pull request #1829 from Human-Connection/fix-typo-in-email 
Fix typo in email template
 2019-10-07 15:35:00 +02:00
Robert Schäfer
a5869ffb2e
Merge pull request #1823 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.5 
build(deps-dev): bump apollo-server-testing from 2.9.4 to 2.9.5 in /backend
 2019-10-07 12:48:58 +02:00
Robert Schäfer
0ddb9ba1c5
Merge pull request #1827 from Human-Connection/dependabot/npm_and_yarn/backend/cucumber-6.0.1 
build(deps-dev): bump cucumber from 5.1.0 to 6.0.1 in /backend
 2019-10-07 12:48:38 +02:00
mattwr18
1bf87f937e
Merge pull request #1826 from Human-Connection/dependabot/docker/backend/node-12.11.0-alpine 
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend
 2019-10-07 12:45:40 +02:00
mattwr18
23841b95bb
Merge pull request #1808 from Human-Connection/1704_display-user-email-to-moderators 
Display user email for administrators
 2019-10-07 12:33:33 +02:00
Alina Beck
b0151e4b2e fix typo in email template 2019-10-07 12:09:46 +02:00
dependabot-preview[bot]
74322fc376
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [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.9.4...apollo-server-testing@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 08:57:08 +00:00
Robert Schäfer
f8b06d6727
Merge pull request #1825 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.5 
build(deps): bump apollo-server from 2.9.4 to 2.9.5 in /backend
 2019-10-07 10:53:47 +02:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02:00
dependabot-preview[bot]
73e278f897
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend 
Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 07:27:10 +00:00
dependabot-preview[bot]
3644400174
build(deps-dev): bump cucumber from 5.1.0 to 6.0.1 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 5.1.0 to 6.0.1.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v5.1.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 07:20:51 +00:00
mattwr18
3f778f32a0
Merge pull request #1818 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.4.0 
build(deps-dev): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /backend
 2019-10-07 09:19:55 +02:00
Wolfgang Huß
43e401293d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-07 08:45:34 +02:00
dependabot-preview[bot]
e934148f7d
build(deps): bump apollo-server from 2.9.4 to 2.9.5 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [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.9.4...apollo-server@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:30:25 +00:00
dependabot-preview[bot]
88aa08ef0a
build(deps-dev): bump eslint-config-prettier in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:28:30 +00:00
dependabot-preview[bot]
7cea3e2382
build(deps): bump @hapi/joi from 16.1.5 to 16.1.7 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.5 to 16.1.7.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.5...v16.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:27:46 +00:00
aonomike
f8cf975d6c Test that admin can access the email of a user 
- Refactor all tests on permissionsMiddleware
 2019-10-05 17:18:11 +03:00
aonomike
14c44877b7 Refactor the unauthenticated path test 2019-10-05 16:06:19 +03:00
aonomike
45a6016427 Allow admin to receive user email back 2019-10-05 16:00:29 +03:00
Wolfgang Huß
bb73ff43e4 Sanitize reason description and test, fix report in 'seed-db.js' 2019-10-04 16:58:32 +02:00
Wolfgang Huß
935252a16e Rename variables, parameters and properties 2019-10-04 15:21:07 +02:00
Robert Schäfer
9318c28b72
Merge pull request #1809 from Human-Connection/1305-update-lastActiveAt 
fixes#1305 lastActiveAt
 2019-10-04 13:49:14 +02:00
Wolfgang Huß
e7fbd169d9 Get backend test to work with new properties 2019-10-04 10:23:31 +02:00
Wolfgang Huß
5458d6640e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-04 09:08:15 +02:00
Robert Schäfer
ff9a8cace3
Merge pull request #1798 from Human-Connection/remove-toggle-from-email 
Remove language toggle from email template
 2019-10-04 01:54:00 +02:00
Robert Schäfer
bf1af5039f
Merge pull request #1801 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.3 
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /backend
 2019-10-04 01:47:02 +02:00