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

83 Commits

Author SHA1 Message Date
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
ogerly
d2a17373b0 last step ? 2019-12-18 16:43:24 +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
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-12-09 16:37:04 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +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
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
mattwr18
66f1aa8888 Follow @roschaefer PR review suggestions 
- Update seed file with more human readable imageAspectRatios
- Remove copy script from Dockerfile to not expose to others. we'll need
to either start a maintenance server, so it has access to both the
backend/public/uploads and cypher-shell, or copy a script to the backend
that creates a csv, which can be copied to the neo4j pod and then loaded
into the cypher.
- Remove unintended changes to deployment/legacy-migration
- Add back image compression to Post images
 2019-12-03 15:33:54 +01:00
Alina Beck
d97973ab79 request faker images corresponding to set aspect ratios 2019-12-02 16:10:44 +03:00
mattwr18
14a689d955 Remove comments 2019-12-02 12:02:15 +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
Wolfgang Huß
4c91675838 Fix lint 2019-11-23 11:41:48 +01:00
Wolfgang Huß
8cc05ab910 More complex report and review seeding 2019-11-23 08:58:43 +01:00
Wolfgang Huß
ec8910d6eb Rename decide mutation to review 2019-11-22 15:12:00 +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
roschaefer
978347ba7b Tell github-linguists to ignore snapshots 2019-11-16 20:09:05 +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
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
Alina Beck
6a98e5759f fix lint errors in backend 2019-11-12 13:50:45 +03:00
mattwr18
311f2fc912 Create Donations node in seeds 
Co-authored-by: @alina-beck <alina.beck@mail.com>
 2019-11-12 10:20:21 +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
Wolfgang Huß
2a23bbf101 Refactor frontend and 'reports' query again 2019-11-07 15:54:26 +01:00
Wolfgang Huß
a4521b4621 Use of mutation disable removed 
- The mutation definition still has to be removed.
 2019-11-06 09:13:08 +01:00
Ewald Arnold
4285932319 Merge branch 'russian-locales' of https://github.com/Human-Connection/Human-Connection into russian-locales 2019-11-06 09:09:48 +01:00
Wolfgang Huß
4a6f8c423e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-06 07:49:20 +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
roschaefer
9b67036b43 Add random languages to seeds 2019-10-29 22:03:44 +01:00
Wolfgang Huß
15d28aa8ef Finish redesign of moderators report list 
- It is not perfect, but will do it for now.
 2019-10-23 15:59:34 +02:00
Wolfgang Huß
11341b82e6 Structure reports in moderators list by content, just a beginning 2019-10-23 12:11:51 +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ß
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ß
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
Wolfgang Huß
a07010f50c First step of implementing direct report relation 2019-10-10 15:38:20 +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
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
mattwr18
a6d86f78f4 Fix lint 2019-10-03 12:04:07 +02: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
mattwr18
7926cb39ba Improve English descriptions 2019-09-17 08:50:22 +02:00
roschaefer
431de3319f Make data-hashtag-id authoritive for #links 
This adds consistency: The mention links with `@` was implemented
that way already. Instead of parsing the URL, we add some redundancy and
add another attribute: data-hashtag-id

So, what characters are valid for html attributes?
Read: https://stackoverflow.com/questions/925994/what-characters-are-allowed-in-an-html-attribute-name

Thanks to @Tirokk, who added some validations on the hahstag ids, I
think we are all set. If you try to write a hashtag with a `"` double
quotation mark for example, it gets automatically replaced with a valid
hashtag. If someone wants to send us invalid hashtag ids to the backend
directly, the regex there would filter it out.
 2019-09-16 23:09:32 +02:00
roschaefer
64268a1f3c Add locations to seeds, fix shoutedByCurrentUser 2019-09-03 21:28:29 +02:00