IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-03 08:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,524 Commits 6 Branches 100 Tags
Commit Graph

568 Commits

Author SHA1 Message Date
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
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
mattwr18
f8f62cc71f Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 20:42:44 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature 
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2020-01-23 20:30:12 +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
0ab19dde2a Insert missing closing parantheses breaking search 2020-01-22 13:55:57 +01:00
mattwr18
1de99511db Include BLOCKED users in search results 2020-01-22 10:43:30 +01:00
mattwr18
3354174a53 Fix muted user can still see my posts 2020-01-22 10:34:10 +01:00
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +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
bcae52180e Remove filter on posts for BLOCKED 2020-01-21 19:28: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
roschaefer
b063847849 refactor: Make db:setup init stage of migrate 2020-01-20 11:00:52 +01:00
mattwr18
d682ee1ec6 Fix lint 2020-01-14 10:47:32 +01:00
mattwr18
84e475fd8a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-13 21:22:58 +01:00
mattwr18
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users 
🍰 Search For Users
 2020-01-10 13:59:44 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
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
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
Moriz Wahl
07b2b7ca3b Please pass the tests now 2020-01-06 18:36:59 +01:00
Moriz Wahl
de6053dfa3 try again, cypress blackbox 2020-01-06 18:02:11 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
b4d120dff3 Merge branch '1463-search-for-users' of https://github.com/Human-Connection/Human-Connection into 1463-search-for-users 2019-12-23 01:53:08 +01:00
roschaefer
f1b581aa86 Improve performance with pattern comprehensions 
@Mogge @mattwr18 this is how you can eagerly fetch resources
 2019-12-20 20:13:02 +01:00
roschaefer
b3521d8ce5 Improve performance, log database statements 
@Mogge first of all, you can wait for multiple promises in parallel
by using Promise.all([...]). Second if you run:
```sh
DEBUG='human-connection:neo4j:cypher' yarn run dev
```
in order to log out all database statements. I added log statements to
the new search resolver.
 2019-12-20 19:30:22 +01:00
roschaefer
34a3f81dd3 Refactor transformReturnType 
@Mogge I personally find `RETURN resource {.*, foo: "bar"}` extremely
useful.
 2019-12-20 17:47:12 +01:00
Moriz Wahl
19b6fe9b94 Trying to find users located close to user 2019-12-20 01:14:24 +01:00
mattwr18
3ef04f8391 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-19 17:16:48 +01:00
mattwr18
f7de76eea5 Tidy up a bit 
- Remove unused function
- Add wildcard to end of query to remove quirky behavior
- Favor more verbose variable naming
 2019-12-19 17:15:25 +01:00
mattwr18
3712f86b7b Merge branch 'master' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2019-12-19 12:16:14 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
mattwr18
cce28e6c7a Fix cypress tests 2019-12-19 00:01:42 +01:00
mattwr18
46c4602db1 Filter for blockedUsers/content, fix cypress 2019-12-18 20:42:06 +01:00
roschaefer
d7193ab3b6 Update neo4j-driver 
Fix API changes. Also close the session in resolver only and refactor
userMiddleware to become a part of the resolver.
 2019-12-17 20:20:16 +01:00
roschaefer
deaf071550 Update neode 
This fixes some API changes with the update of neode.
 2019-12-17 11:38:02 +01:00
Moriz Wahl
9e1182d3b6 refactored with transactions 2019-12-17 11:28:57 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
mattwr18
4cd43b68a4 Refactor further search 
- in the end, the error was due to not asking for the id of the author
back of the Post.. grrr.... why couldn't we get better error messages!!

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2019-12-13 15:56:18 +01:00
mattwr18
1f2216cd4f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-13 12:31:14 +01:00
mattwr18
ebc5cf392d Fix search by adding result id 
- Apollo cache requires an id to commit to their store
- add id to each query result
- refactor out the store
- still can use a lot of refactoring
 2019-12-13 12:30:00 +01:00
mattwr18
3e15ecdfa2 Refactor tests, extract validation to middleware 2019-12-12 14:25:28 +01:00
mattwr18
8a93e402b9 Remove neode update from production code 
- Favor transaction functions we have more control over
 2019-12-12 14:24:43 +01:00
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
mattwr18
53791c83e8 Favor transaction functions in login mutation 2019-12-11 19:31:50 +01:00
mattwr18
d38131e24a Refactor to use transaction functions/logging 2019-12-11 19:27:37 +01:00