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

391 Commits

Author SHA1 Message Date
Alexander Friedland
6d1bf2c3e8
locale 
change language to locale
 2019-10-18 12:10:44 +02:00
Alexander Friedland
cca1e2c04a
remove change 2019-10-17 09:44:26 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
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ß
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
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ß
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ß
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
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
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
Wolfgang Huß
a07010f50c First step of implementing direct report relation 2019-10-10 15:38:20 +02:00
Wolfgang Huß
b41f340ad6 Fix Cypher test by correcting syntax of GraphQL report mutation 2019-10-10 08:15:17 +02: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
e2da57287b change providers.json 2019-10-08 18:56:45 +02:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02: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
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
mattwr18
976288d625 Fix lint 2019-10-03 16:39:32 +02:00
Vasily Belolapotkov
af803ce0e6 fix invites count calculation for admin dashboard 2019-10-03 12:54:04 +03:00
Robert Schäfer
cfdf9dad2c
Merge pull request #1711 from Human-Connection/407-change_your_email_address 
407 change your email address
 2019-10-02 17:43:19 +02:00
Wolfgang Huß
6ad9dc27e9 Write and refactor backend test which are supposed to fail at first 
Implemented the new properties in the GraphQL schema.
 2019-10-02 17:25:36 +02:00
mattwr18
f0d096fcab Prefer guard clause to avoid database call 
- follow @roschaefer's PR review
 2019-10-02 09:20:13 +02:00
roschaefer
1e31a0c620 fix: remove previous email address on change 
This will allow you to change back to your previous email address: The
backend won't complain because of a user who owns that email address
already.
 2019-10-02 01:55:14 +02:00
roschaefer
e6f8bbac9b fix: remove copy+paste oversights 
In the registration resolvers, it makes sense to immediately resolve if
an email address has been found (because you can re-send the
registration email).

In this case, we use the helper method only to trigger the `UserInputError`.
 2019-10-02 01:54:28 +02:00
roschaefer
6ffafff288 fix: ensure no other user owns a new email address 
`BELONGS_TO` means a user owns an email address. `PRIMARY_EMAIL` means a
user authenticates with that email.

So right now, you get a proper error message if you try to change your
email back to your old email address (because you own it already).

I will make sure to delete the old email so this will be no problem
anymore. But maybe in the future we might have multiple email addresses
per user and then it makes a big difference to use `PRIMARY_EMAIL` or
`BELONGS_TO`.
 2019-10-02 01:31:23 +02:00
roschaefer
6a7970200f refactor: EmailAddr.Request -> UnverifiedEmailAddr. 2019-10-02 01:21:56 +02:00
roschaefer
5848e6af18 Fix a TODO by @alina-beck 2019-10-02 00:54:01 +02:00
roschaefer
e116d52992 Use EmailAddressRequest and validate email 2019-10-02 00:54:01 +02:00
roschaefer
e51124f316 Resolvers for EmailAddress implemented 2019-10-02 00:54:01 +02:00
roschaefer
8c13234af9 Handle edge case 
It might be that people try to register email addresses that they don't own. Then if the actual owner tries to add this email address, she should not get a unique constraint violation. Instead the email will be re-used.

Is this a security issue? Because we re-use the nonce? 🤔
 2019-10-02 00:54:01 +02:00
roschaefer
73d5abd724 Implement AddEmail resolver 2019-10-02 00:54:01 +02:00
roschaefer
3b6cd55c0f Implement unauthenticated part 2019-10-02 00:54:01 +02:00
roschaefer
8a05de5b2d Sketch backend test to change Email Address 2019-10-02 00:54:01 +02:00