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

88 Commits

Author SHA1 Message Date
roschaefer
178143dfb7 refactor(modules): Various import fixes 
* DRY schema stitching code
* Use same `.env` configuration file for cypress tests

That last part I couldn't improve a lot. I thought it might be possible
with cypress to import all files from a folder. But since it must be
browser compatible and our backend is not using webpack or anything,
it remains a goal unreached.

close #2773
close #2774
 2020-01-17 15:59:19 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
roschaefer
deaf071550 Update neode 
This fixes some API changes with the update of neode.
 2019-12-17 11:38:02 +01:00
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
mattwr18
4af63ee0aa
Merge pull request #2404 from Human-Connection/get_rid_of_inconsistency_with_setup_neode 
Get rid of inconsistency with neode setup
 2019-12-10 11:04:35 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
mattwr18
4d0df181b6
Merge pull request #2432 from Human-Connection/remove-query-for-disable-property-for-reports 
Remove disable from reports.disable Query
 2019-12-05 21:14:55 +01:00
roschaefer
8f0ce19f09 Implement getDriver() and getNeode() the same way 
I want to introduce `neode` and `neo4j-graphql-js` to my students and
saw this.
 2019-12-05 21:00:24 +01:00
mattwr18
55f25b153c Remove disable from models/Report.js 
- we are not setting this property, and it's inclusion in this model
with a default false value meant that there were no errors with seeded
data, but with the data returned from the db_manipulation there was.
 2019-12-05 20:31:19 +01:00
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
ogerly
7f3f81822e blur the image ok. 2019-11-28 20:40:35 +01:00
mattwr18
2332576e17 Add imageAspectRatio to seeded Post 2019-11-27 12:08:21 +01:00
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
mattwr18
1a5fd29922 Add Claim model 2019-11-25 17:04:47 +01:00
Wolfgang Huß
59f53a07c6 Clean up 2019-11-22 15:24:50 +01:00
roschaefer
c010d4b0ae refactor: remove obsolete code 
Since we decided to open Human Connection for public registration, we
don't need to create artificial shortage of signups. The original
intention here was too:

1. Grow the network slowly and under control
2. Create an incentive for users to invite their friends

Point 2 is now obsolete, everyone can signup herself. Point 1 is based
on the (seemingly) wrong assumption that there will be a "run" on the
network if we open it for public registration. Our growth was fairly
stable so far.
 2019-11-21 19:19:58 +01:00
Wolfgang Huß
ef84e9991f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
 2019-11-21 08:09:50 +01:00
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
 2019-11-14 09:41:00 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00
mattwr18
feb65a6c9c Update property name to be more descriptive 
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
 2019-11-12 21:19:52 +01:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
mattwr18
835a098731 Set up backend for DonationsInfo 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 18:14:33 +01:00
Wolfgang Huß
677039b786 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	webapp/pages/moderation/index.vue
 2019-11-11 17:52:58 +01:00
roschaefer
a704709ba3 fix: resolver returned undefined for nameRU 
This registers the language Russian in the backend. Unfortunately, the
locations seem to be implemented with a hard coded attribute for each
language. 😞

We should refactor this.
 2019-11-04 20:39:28 +01:00
Joseph Ngugi
c8ce53d598 add allowShouts field 2019-10-31 21:21:31 +03:00
Wolfgang Huß
54be7782ba First refactoring tests to new database structure 2019-10-30 16:59:24 +01:00
Wolfgang Huß
6593c6ec5c Refactor the database structure from DISABLED to DECIDED relation 
- First Step.
- Apply properties to the relation.
 2019-10-25 16:51:47 +02:00
mattwr18
46fd534a28
Merge pull request #1840 from Human-Connection/1205-pinned-post-for-admins 
Allow admins to pin a post
 2019-10-21 14:37:14 +02:00
mattwr18
3163f6c9b1
Merge pull request #1853 from Human-Connection/219-add-createDate-follow-shout 
Added createdAt date for follow and shout
 2019-10-21 10:13:20 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
abaa9b7759
locale 
change language to locale
 2019-10-18 12:14:11 +02:00
Kapil Jain
f6e70bee25 fix conflicts with merge 2019-10-17 15:17:54 -04:00
mattwr18
dd55d11739 Add backend test for PostOrdering 2019-10-17 17:56:16 +02:00
Kapil Jain
6b72772bbb Added tests for SHOUT and FOLLOW relationships to make sure they have "createdAt" date. 2019-10-16 22:47:02 -04:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +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
Kapil Jain
f73ff995e1 fixed lint errors 2019-10-14 15:17:49 -04:00
Kapil Jain
8a36ec6c29 added createdAt date for follow 2019-10-09 16:05:33 -04:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02:00
roschaefer
78bf076498 test: add tests for #1809 2019-10-04 01:39:18 +02:00
roschaefer
6a7970200f refactor: EmailAddr.Request -> UnverifiedEmailAddr. 2019-10-02 01:21:56 +02:00
roschaefer
e116d52992 Use EmailAddressRequest and validate email 2019-10-02 00:54:01 +02:00
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
roschaefer
77d24b5a71 Add backend test for @mattwr18 
This was already covered by `slugifyMiddleware.spec.js`. I do agree that
this is a better place for it. Also we're not testing GraphQL requests
here but the factories. As we're testing the existence of unique
constraints, I think it won't matter if we use factories or actual
GraphQL requests.
 2019-09-23 00:09:08 +02:00