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
8,314 Commits 104 Branches 1,559 Tags
Commit Graph

1088 Commits

Author SHA1 Message Date
Wolfgang Huß
2d73a54819 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 
# Conflicts:
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationsTable/NotificationsTable.vue
 2020-01-22 10:12:35 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content 
feat: Convert block/unblock to mute/unmute
 2020-01-21 17:05:09 +01:00
roschaefer
178143dfb7 refactor(modules): Various import fixes 
* DRY schema stitching code
* Use same `.env` configuration file for cypress tests

That last part I couldn't improve a lot. I thought it might be possible
with cypress to import all files from a folder. But since it must be
browser compatible and our backend is not using webpack or anything,
it remains a goal unreached.

close #2773
close #2774
 2020-01-17 15:59:19 +01:00
Wolfgang Huß
35660ca073 Implemented the notifications for filling reports Notification.vue 2020-01-17 15:56:30 +01:00
Wolfgang Huß
f2d4d97645 Lint fix in backend 2020-01-16 15:55:26 +01:00
Wolfgang Huß
d4e5de5eff Approach the first time to get the new notifications in the frontend 2020-01-16 15:52:07 +01:00
Wolfgang Huß
b02bc1c9bc Notify all filing reporters in the seeding of the database 2020-01-16 13:57:31 +01:00
Wolfgang Huß
c033260587 Implement tests in notifications.spec.js for notifing filing reporter 2020-01-16 13:46:03 +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
Wolfgang Huß
43ed0597e0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-01-13 09:45:33 +01:00
Wolfgang Huß
dac262c456 First try to test new notifications 2020-01-10 16:17:28 +01:00
Wolfgang Huß
d9c467849c Implement notificationsMiddleware testing to notify filing reporter 2020-01-10 14:53:55 +01:00
Wolfgang Huß
65f911d49f Implement new notification query resolver 2020-01-10 14:52:25 +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
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
Wolfgang Huß
4d307f09f7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-01-10 08:38:15 +01:00
mattwr18
fc567b9d84 Remove Content.feature 
- Muting a user means I cannot see their content, they can still see
mine
- Even for blocking, we want a blocked user to be able to see the
content just not interact with it.
 2020-01-09 13:47:30 +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
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +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
mattwr18
303558d173 Merge branch 'master' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2020-01-07 11:38:01 +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
mattwr18
885fa8f1fc Parse xss before extracting mentions/hashtags 2020-01-06 15:39:26 +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
ogerly
d2a17373b0 last step ? 2019-12-18 16:43:24 +01:00
Wolfgang Huß
e5718fe0ea Test driven approach to implement notification of report filing user 3 2019-12-18 15:28:25 +01:00
Wolfgang Huß
4da67d3bc8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2019-12-18 11:22:50 +01:00
Wolfgang Huß
c2877ad932 Test driven approach to implement notification of report filing user 2 2019-12-18 11:22:37 +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
roschaefer
3ee30a7738 Update neo4j driver 2019-12-17 10:28:00 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
Wolfgang Huß
9f44b8a65d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 
# Conflicts:
#	backend/src/middleware/notifications/notificationsMiddleware.js
 2019-12-16 10:26:54 +01:00
Wolfgang Huß
f3728af97b First test driven approach to implement notification of report filing user 2019-12-16 10:22:07 +01:00