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

2193 Commits

Author SHA1 Message Date
Moriz Wahl
5b5fc09053 fix typo 2020-03-18 20:38:18 +01:00
Moriz Wahl
8f1b3b9f6b cypress test data adjusted to new search mechanism 2020-03-18 20:38:18 +01:00
Moriz Wahl
57101b80bf cypress tests will really pass 2020-03-18 20:38:18 +01:00
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
mattwr18
627b47837e Rename findResources to searchResults 2020-03-18 19:45:48 +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
b23328a211 docs(setup): changes undone and set in own branch 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
Alexander Friedland
404713a8ad
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-03-09 14:25:37 +01:00
ogerly
a1114a8a83 feat: additional confirm inserted before really deleting 2020-03-06 08:09:38 +01:00
ogerly
9ab2d8395f feat: DeleteUser for Admin added in the profile dropdown menu, deleted from the Admin user overview 2020-03-04 16:23:00 +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
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ß
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
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null 
fix(subscriptions): Don't publish undefined
 2020-02-19 09:47:38 +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
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
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined 
Fix #3088
 2020-02-18 16:25:11 +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
Moriz Wahl
5b41561cc4 throw error added to template 2020-02-18 14:16:46 +01:00
mattwr18
1b62dc3b2e Remove sequence for slug as it's not needed 2020-02-18 13:40:48 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +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
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
roschaefer
6bba756856 Fix seeds, don't create additional categories 2020-02-18 00:30:53 +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
Wolfgang Huß
ba3cfa8e04 Set sensible report properties to moderators only in the permissionsMiddleware 2020-02-14 16:52:51 +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
mattwr18
4391915611 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-12 16:14:05 +01:00