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

692 Commits

Author SHA1 Message Date
Moriz Wahl
1060a2f6d0 cypress tests will pass 2020-03-18 20:38:18 +01:00
Moriz Wahl
9cb489dce1 Specs are running and regex in searches.js is cleaned up 
Matching the whole text entered exactly is boosted by 8.
Matching all the words entered exactly is boosted by 4.
Matching some words ebtered exactly is boosted by 2.
Glob matching is applied for words with more than three characters is not boosted.
To Do: Deal with @ and # symbols.
To Do: Find a way to match unicode, e.g. kyrillic letters.
 2020-03-18 20:38:18 +01:00
Moriz Wahl
a6a2ac4fbe search spec starts doing what it should 2020-03-18 20:38:18 +01:00
Moriz Wahl
f9b6fb95ab spec for searches added 2020-03-18 20:38:18 +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
07ded7419f test: deleting a user is tested with a foreign user, a moderator, an admin 2020-03-10 18:21:45 +01:00
ogerly
3983612c56 test deleteuser as admin, moderator, another user and as I myself, fix lint 2020-03-10 18:21:45 +01:00
ogerly
5f8d58f46a test deleteuser as admin, moderator, another user and as I myself 2020-03-10 18:21:45 +01:00
ogerly
84c154798e feature: test delete user as admin 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
roschaefer
628ec2a188 Follow @mogge's PR review 2020-03-04 15:17:31 +01:00
roschaefer
7d9cbb3ce9 perf(neo4j): Improve currentUser read performance 2020-03-04 13:32:30 +01:00
mattwr18
0cdae364b8
Merge pull request #3197 from Human-Connection/update-user-at-password-reset 
fix: Update user.updatedAt when password is reset
 2020-03-02 16:18:25 +01:00
mattwr18
1b7ff116d1 Update user.updatedAt when password is reset 
- this is updating the user node, so it should update the updatedAt.
we recently ran into an issue where we weren't sure if a user had
successfully changed their password with the passwordReset, and needed
to look into it further to see if the PasswordReset had been used or not
to tell if it was successful.
 2020-03-02 15:22:57 +01:00
roschaefer
c9caa5bf4c Fix uuid deprecations 2020-02-25 13:16:48 +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
Wolfgang Huß
82f3eb2a29 Delete comments 2020-02-20 11:09:43 +01:00
Wolfgang Huß
5c7f92e557 Remove user GQL prop 'filedUnclosedReportByCurrentUser' again 
- Shall be implemented in a later PR.
 2020-02-20 10:54:34 +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ß
5ffaac193d Refactor tests, going on 2020-02-19 11:37:31 +01:00
Wolfgang Huß
f380915b2c Refactor GQL and tests, first approach 2020-02-19 08:09:14 +01:00
Robert Schäfer
b003fb3f10
Merge pull request #2589 from Human-Connection/2587-geolocation-swap-lng-with-lat 
fix: swap lat and lng
 2020-02-18 17:55:57 +01:00
mattwr18
44d503c53c
Merge pull request #3090 from Human-Connection/2202_do_not_encode_the_entire_user_in_bearer_token 
fix(jwt): Whitelist encoded JWT attributes
 2020-02-18 14:37:15 +01:00
roschaefer
e41a639cf1 fix(jwt): Encode only 3 attributes in JWT 
This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
 2020-02-18 11:23:04 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader 
- have I missed any important features? too many tests?
 2020-02-12 17:53:38 +01:00
Moriz Wahl
1ae6769c7d spec for location swapped lng and lat too 2020-02-11 11:33:47 +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
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
mattwr18
bcf9680ad9 Add type resolver for hasBlocked 2020-02-10 14:33:49 +01:00
mattwr18
c2802aa4f2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3033-fix-block-users-bug 2020-02-10 14:24:32 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user 
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
 2020-02-10 12:34:40 +01:00
mattwr18
6271b53b30 Set up Subscriptions with RedisPubSub 2020-02-07 14:48:55 +01:00
Moriz Wahl
976583b235 fixing test for geolocation 2020-02-06 19:56:44 +01:00
Moriz Wahl
ef9d351fcf swap lat and lng 2020-02-06 19:56:44 +01:00
mattwr18
0851ad4c50 Add end line 2020-02-06 10:33:56 +01:00
mattwr18
6cf067937d Clean up 
- remove the code for subscriptions to Post as we won't implement this
  at this time... I've created a new branch with the code that can be
built on later
- remove unused subscription path
- add possibility to use websockets uri for production env.
 2020-02-05 20:24:23 +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
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +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