IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 03:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,853 Commits 5 Branches 2 Tags
Commit Graph

468 Commits

Author SHA1 Message Date
Brandon Tripp
9d19eab35b linting adjustment. 2021-01-19 14:51:19 -07:00
Brandon Tripp
a5da718bb0 A slight change to the test cases to make sure the encoding is working for German and Spanish. 2021-01-19 14:51:19 -07:00
Brandon Tripp
e22e15bc77 Changed the uniqueSlug setting to include the deutsch locale to properly handle umlauts and tests. 2021-01-19 14:51:19 -07:00
Moriz Wahl
e47671c52a further changed requested by Tirokk 2020-11-24 19:10:46 +01:00
Moriz Wahl
16cdcc921e further changes 2020-11-23 13:44:16 +01:00
Moriz Wahl
6454e686e9 changes requested implemented 2020-11-23 13:34:07 +01:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Moriz Wahl
a67b74cae0 backend for export user data 2020-09-24 17:24:27 +02:00
roschaefer
9bb827a8ee Remove name "Human Connection" in email templates 2020-06-15 15:13:36 +02:00
roschaefer
dd09dfa721 Replace welcome image in email templates 2020-06-15 14:54:03 +02:00
roschaefer
16c7be1cc4 Parameterize emails in backend 2020-06-05 16:49:32 +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
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
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
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
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
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock 
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
 2020-01-23 19:18:12 +01:00
mattwr18
8accc62f18 Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-22 15:23:11 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
c7ee90e980 Follow @roschaefer PR suggestions 
- As blocking is now reciprocal, we do not need another query, we can
  use neo4j-graphql-js magic to query for a BLOCKED relationship between
the postAuthor and the currentUser
 2020-01-21 18:50:46 +01:00