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

4279 Commits

Author SHA1 Message Date
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Wolfgang Huß
30f268525f Add Cypher statement for ordering 
- minor db manipulation text change
 2019-10-16 13:32:45 +02:00
dependabot-preview[bot]
8d5e0b0e2c
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:18:30 +00:00
Robert Schäfer
84af40e0df
Merge pull request #1916 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.4 
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend
 2019-10-16 12:16:03 +02:00
Wolfgang Huß
a705f6a017
Merge pull request #1797 from Human-Connection/1707-reporting-with-specific-information 
🍰 Reporting with specific information
 2019-10-16 11:54:29 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
Wolfgang Huß
7067867f76 Changed mentioned file in comment 2019-10-16 09:25:50 +02:00
dependabot-preview[bot]
51ef7a7c8c
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.3...v1.19.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:00:48 +00:00
dependabot-preview[bot]
5e5f6ec1cc
build(deps): bump dotenv from 8.1.0 to 8.2.0 in /backend 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 06:58:30 +00:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions 
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
 2019-10-15 20:28:25 +02:00
dependabot-preview[bot]
a42a910ac7
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.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/v22.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 12:01:43 +00:00
dependabot-preview[bot]
319de54265
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend 
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:06:25 +00:00
mattwr18
a3f4282bae
Merge pull request #1868 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.4 
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend
 2019-10-15 08:23:50 +02:00
dependabot-preview[bot]
c8fdaef729
build(deps): bump apollo-server from 2.9.5 to 2.9.6 in /backend 
Bumps [apollo-server](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@2.9.5...apollo-server@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 21:54:45 +00:00
mattwr18
02def215b7
Merge pull request #1870 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.6 
build(deps-dev): bump apollo-server-testing from 2.9.5 to 2.9.6 in /backend
 2019-10-14 23:52:40 +02:00
mattwr18
df090944bf
Merge pull request #1871 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.7.0 
build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend
 2019-10-14 21:28:27 +02:00
dependabot-preview[bot]
30c3cf3e1d
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](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-testing@2.9.5...apollo-server-testing@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:28:23 +00:00
dependabot-preview[bot]
01c9e083eb
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.3 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.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:27:36 +00:00
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