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

4261 Commits

Author SHA1 Message Date
mattwr18
03e51e91c6
Merge pull request #1866 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.6 
build(deps): bump apollo-server-express from 2.9.5 to 2.9.6 in /backend
 2019-10-14 21:26:37 +02:00
mattwr18
98a7bb8cee
Merge pull request #1865 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.4 
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4 in /backend
 2019-10-14 21:25:33 +02:00
Kapil Jain
f73ff995e1 fixed lint errors 2019-10-14 15:17:49 -04:00
mattwr18
faf0a15aee Update to use enum in tests, seed data, etc, refactor resolver 
- Extract validations to the validations middleware to clean it up
- Remove resourceId since it throws an error in the mutation if the user
asks for it back, and the resourceId is returned in post/comment/user.id
- use writeTxResultPromise to benefit from automatic retries
- more descriptive variable naming
- extract cypher query to make db manipulation into script so that it
can be run from the command line, at least locally.
 2019-10-14 21:07:55 +02:00
Wolfgang Huß
cae897808b Follow Matts suggestions from his review 2019-10-14 17:38:38 +02:00
mattwr18
2818b63fe9 Fix lint 2019-10-14 16:42:11 +02:00
mattwr18
db48e522cf Enforce a 16/9 aspect ratio 
- if we set the max height any greater than this, it takes up the entire
page on a desktop screen
 2019-10-14 16:42:11 +02:00
Wolfgang Huß
fd27583c1d Merge branch '1707-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 
# Conflicts:
#	shared/moderation/report.js
 2019-10-14 16:21:08 +02:00
Wolfgang Huß
c7849cedd8 Rename report reason category names to have '_' instead '-' 2019-10-14 16:12:21 +02:00
Wolfgang Huß
6365d3df54 Implement enum for report reason categories after Matts suggestion 2019-10-14 15:53:36 +02:00
aonomike
47a2a21fc0 Resolve review comments 2019-10-14 16:46:37 +03:00
Wolfgang Huß
19facb22a9 Merge branch '1707-refactor-db-reporting-with-specific-information' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 15:37:29 +02:00
Wolfgang Huß
3c472293ac
Update backend/src/schema/resolvers/reports.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-10-14 15:22:25 +02:00
Wolfgang Huß
b50896bb45
Update backend/src/schema/resolvers/reports.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-10-14 15:22:07 +02:00
Wolfgang Huß
663cfeb0b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-14 13:37:58 +02:00
Wolfgang Huß
8bc939c2da Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-refactor-db-reporting-with-specific-information 2019-10-14 13:36:24 +02:00
aonomike
0fe94a5d82 Complete refactor rewards spec 
- Refactor unreward path
- refactor to use variables constant
 2019-10-12 17:39:29 +03:00
aonomike
dcb40c2c33 refactor moderator user path 2019-10-12 17:00:36 +03:00
aonomike
bd83482465 Complete refactor of logged in administrator spec path 2019-10-12 16:50:58 +03:00
aonomike
b87f2a52cf Refactor rewards spec 
- Refactor unauthorised path
 2019-10-12 15:04:43 +03:00
Kapil Jain
0da37d6af8 updated shout resolver to add createdAt 2019-10-11 15:52:35 -04:00
Wolfgang Huß
82228c6c99 Refactored backend database to a single REPORTED relation 2019-10-11 16:35:15 +02:00
mattwr18
b0e7ef34ed Update findProviders.json path 2019-10-11 15:22:59 +02:00
mattwr18
dab05d9e67 Fix embeds settings page 
- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-11 14:01:39 +02:00
mattwr18
596b8de615
Merge pull request #1805 from Human-Connection/1754-fix-buggy-profile-page-posts-duplicates 
Update profile posts apollo query
 2019-10-11 10:05:21 +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
dependabot-preview[bot]
faca2fdce0
build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.6.2 to 5.7.0.
- [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.6.2...5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:51:43 +00:00
dependabot-preview[bot]
b8112b021a
build(deps): bump apollo-server-express from 2.9.5 to 2.9.6 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [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-express@2.9.5...apollo-server-express@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:50:18 +00:00
dependabot-preview[bot]
c4adb5d5fe
build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.2 to 7.6.4.
- [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.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 04:49:43 +00: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
Kapil Jain
8a36ec6c29 added createdAt date for follow 2019-10-09 16:05:33 -04: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