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

2193 Commits

Author SHA1 Message Date
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
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
Wolfgang Huß
b41f340ad6 Fix Cypher test by correcting syntax of GraphQL report mutation 2019-10-10 08:15:17 +02:00
Kapil Jain
8a36ec6c29 added createdAt date for follow 2019-10-09 16:05:33 -04: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
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
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
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
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +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
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
mattwr18
c9219f0be3 Fix lint 2019-10-04 12:09:22 +02:00
mattwr18
3b5e39c54d Update orderBy, remove >=, more realistic seed data 2019-10-04 11:42:55 +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
roschaefer
78bf076498 test: add tests for #1809 2019-10-04 01:39:18 +02:00
Ivy
57c3d949cf fixes#1305 lastActiveAt 2019-10-03 13:08:06 -07:00
mattwr18
976288d625 Fix lint 2019-10-03 16:39:32 +02:00
mattwr18
a6d86f78f4 Fix lint 2019-10-03 12:04:07 +02:00
Vasily Belolapotkov
af803ce0e6 fix invites count calculation for admin dashboard 2019-10-03 12:54:04 +03:00
mattwr18
6f1c5e3efa Set hasMore to false when returned Posts are equal to pageSize 
- this was causing bugs on User profile page, and saves a database call
 2019-10-03 11:04:23 +02:00
Alina Beck
ad7f5e34f7 remove language toggle from email template 2019-10-02 23:12:34 +02: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