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

404 Commits

Author SHA1 Message Date
aonomike
4e42017afa Refactor tests for querying reported resources 2019-10-19 15:50:48 +03:00
aonomike
08adff74bf Refactor tests for reporting a tag 2019-10-19 15:08:26 +03:00
aonomike
55abe975d9 Refactor tests for reporting a comment 2019-10-19 14:57:10 +03:00
aonomike
58d1ce6515 Refactor tests for reporting a post 2019-10-19 14:27:51 +03:00
aonomike
28f0431ffa Refactor tests for reporting a user 2019-10-19 13:34:54 +03:00
aonomike
bcb880db5e Start refactor of authenticated user path 
- Refactor report invlid resource
- Start refactor of valid resource path
 2019-10-19 12:51:16 +03:00
aonomike
cf5042d9a4 Refactor report resolver spec 
- Set up the apollo server testing
- Refactor unauthenticated path for the mutation
 2019-10-19 11:35:36 +03:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
Alexander Friedland
f6e87b87ff
locale 
change language to locale
 2019-10-18 12:54:55 +02:00
Alexander Friedland
a6108f6a00
locale 
change language to locale
 2019-10-18 12:15:21 +02:00
Alexander Friedland
713feb4347
locale 
change language to locale
 2019-10-18 12:13:01 +02:00
Alexander Friedland
6d1bf2c3e8
locale 
change language to locale
 2019-10-18 12:10:44 +02:00
Wolfgang Huß
72290e1c8a Add ascendant ordering as enum to ReportOrdering 2019-10-17 10:16:27 +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ß
30f268525f Add Cypher statement for ordering 
- minor db manipulation text change
 2019-10-16 13:32:45 +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