ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,445 Commits 104 Branches 1,559 Tags
Commit Graph

482 Commits

Author SHA1 Message Date
Wolfgang Huß
ce245d65fa Cleanup 2020-04-09 10:36:36 +02:00
Wolfgang Huß
566697d9cd Cleanup 2020-04-08 16:25:55 +02:00
Wolfgang Huß
db7908139c Cleanup 2020-04-08 15:56:27 +02:00
Wolfgang Huß
d0cf1cc185 Fix lint 2020-04-01 15:53:57 +02:00
Wolfgang Huß
a52cbe1c66 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 
# Conflicts:
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/schema/resolvers/notifications.js
#	webapp/components/NotificationsTable/NotificationsTable.spec.js
 2020-04-01 12:22:56 +02:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
mattwr18
698c85b262 fix(backend): Obfuscate avatar/image fix test 
- Then Image.url can be non-nullable because we return null if the
  resource is deleted.
 2020-03-23 19:16:10 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
Wolfgang Huß
db4bac695b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-03-13 15:38:50 +01:00
Wolfgang Huß
32d5482597 Fix backend tests 2020-03-13 11:58:51 +01:00
roschaefer
da165906e2 DRY user.spec.js 2020-03-10 18:28:41 +01:00
ogerly
b23328a211 docs(setup): changes undone and set in own branch 2020-03-10 18:21:45 +01:00
ogerly
3d8fe4d850 feature: Delete_user_as_admin_through_API_only 2020-03-10 18:21:45 +01:00
Wolfgang Huß
5dfd0f9ada Merge fixes and lint fixes 2020-03-09 09:54:43 +01:00
Wolfgang Huß
af8b479fb4 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach-merge-master 
# Conflicts:
#	backend/package.json
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/middleware/notifications/notificationsMiddleware.spec.js
#	backend/src/schema/resolvers/notifications.js
#	backend/src/schema/resolvers/notifications.spec.js
#	backend/yarn.lock
#	cypress/integration/common/steps.js
#	webapp/components/Notification/Notification.spec.js
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationList/NotificationList.spec.js
#	webapp/components/UserTeaser/UserTeaser.vue
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/package.json
#	webapp/yarn.lock
 2020-03-09 09:34:49 +01:00
Wolfgang Huß
3ea1348bd4 Merge master 2020-03-09 08:37:05 +01:00
mattwr18
2640fcf967
Merge pull request #3120 from Human-Connection/new-link-setup-db 
docs(setup): Fix links in tests
 2020-02-21 12:48:04 +01:00
Robert Schäfer
e164104791
Merge pull request #3075 from Human-Connection/3074-don’t-expose-all-properties-of-report 
feat: 🍰 Expose sensitive report type to moderators only
 2020-02-21 12:43:28 +01:00
ogerly
597913555e change: New Link, Learn how to setup the database 2020-02-20 23:17:20 +01:00
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list 
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-20 10:35:37 +01:00
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Wolfgang Huß
f380915b2c Refactor GQL and tests, first approach 2020-02-19 08:09:14 +01:00
mattwr18
a346632fff Avoid running cypher statement if not needed 
- it just feels safer to not run a cypher statement if there is no user
  in the idsOfUsers array. Why risk notifications pointing to empty
nodes? It doesn't seem like this happens, but I'm not sure how to write
a test to verify, and why run cypher statements, if there is no need to?
 2020-02-18 23:19:14 +01:00
mattwr18
54caaaaa0a Remove unnecessary guard clause 
- filter returns an empty array, and no notification is created if
  idsOfUsers is an empty array
 2020-02-18 22:43:19 +01:00
mattwr18
7fe6fb110b Remove unnecessary negation of negation, refactor 
- tests to use `toMatchObject`, which checks that only one notification
  is indeed created
 2020-02-18 22:21:49 +01:00
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined 
Fix #3088
 2020-02-18 16:25:11 +01:00
Wolfgang Huß
ba3cfa8e04 Set sensible report properties to moderators only in the permissionsMiddleware 2020-02-14 16:52:51 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
6271b53b30 Set up Subscriptions with RedisPubSub 2020-02-07 14:48:55 +01:00
Wolfgang Huß
ff620171b2 Implement suggestions of Robert 2020-02-06 09:35:15 +01:00
mattwr18
7ac973f9a1 Refactor cypher statement to simplify 
- it's questionable whether this simplifies it or not, and actually adds
  one line of code, but now it looks more similiar to the code in the
notifications query
 2020-02-05 20:45:56 +01:00
mattwr18
1c6a5503db Get subscriptions working with notifyUserOfComment 
- Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2020-02-05 19:06:55 +01:00
mattwr18
110165691a Refactor out transformReturnType function 
- we have introduced a better way to return all the info we want without
  needing to make multiple database queries. It was introduced by
@roschaefer in the PR for the notifications query, but we hadn't
refactored markAsRead yet.
- Now that we are subscribing to notifications, we need to have the same
  return info as the notification query.

- Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2020-02-05 18:42:31 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling 
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
Wolfgang Huß
346a1b0d3e Merge branch '1709-send-feedbacks-in-report-processes' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-02-03 10:11:10 +01:00
roschaefer
d6f5740ac1 Merge remote-tracking branch 'origin/master' into 1709-send-feedbacks-in-report-processes 2020-02-01 15:12:13 +01:00
roschaefer
fa0e64b7cb Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 
There was a single step definition that created a post and a comment. I
would say let's put that in two different steps.
 2020-02-01 13:33:07 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
roschaefer
fc367297e3 Get rid of different factory files 
..and fix some cypress tests
 2020-01-28 23:12:50 +01:00
roschaefer
2fc71d75a5 Refactor factory for comments 2020-01-28 22:43:27 +01:00
roschaefer
95bfb090fd Refactor factory for posts 2020-01-28 22:43:26 +01:00
roschaefer
2a79c53765 Refactor user factory 2020-01-28 22:43:26 +01:00
roschaefer
789c40c34e feat(editor): Underline markup for posts+comments 
We had tiptap's underline and never used it. A user has asked for it, so
why not implement it right away?

Suggested by `@raimundo@human-connection.social`:
https://human-connection.social/post/612bf465-91ce-4be8-906e-3bde63617346/hcsocial-dein-netzwerk-news-mit-dennis-and-robert-1#commentId-b864d04f-1e8c-48c4-9ed0-98aefaed1c02
 2020-01-26 20:39:52 +01:00
Wolfgang Huß
9a8720218f Implement suggestions of Matt 2020-01-24 19:35:01 +01:00
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
Wolfgang Huß
8bfbec7348
Update backend/src/middleware/notifications/notificationsMiddleware.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-01-24 10:27:32 +01:00
Wolfgang Huß
953cbb147a
Update backend/src/middleware/notifications/notificationsMiddleware.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-01-24 10:26:29 +01:00
Wolfgang Huß
3235f4b21a
Update backend/src/middleware/notifications/notificationsMiddleware.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-01-24 10:20:26 +01:00