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

352 Commits

Author SHA1 Message Date
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
roschaefer
2a544376a3 Delete post.image 
In contrast to the other errors, it's better to send `null` for an
image. That way, the browser won't even try to load that url.
 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
00454c874c Remove read-only attributes from posts mutations 
For the comments, the fix is not that easy: They are still using
`neo4j-graphql-js` in the resolvers. And that library needs the input
params for the query builder.

See: https://github.com/Human-Connection/Human-Connection/issues/1454
 2019-09-03 21:28:29 +02:00
roschaefer
3eea20f7c4 Follow @alinabeck's suggestions 2019-09-03 21:28:29 +02:00
roschaefer
0b3bbb1f14 Delete post.title and obfuscate slug 2019-09-03 21:28:29 +02:00
roschaefer
c4ba2c4aeb SoftDeleteMiddleware obfuscates deleted resources 2019-09-03 21:28:29 +02:00
roschaefer
1b5d91bfd2 Refactor post spec, implement soft delete, fix bug 
I think the validation for categories was too complex and the graphql
query 'PostEmotionsByCurrentUser' was erroneously allowed for
unauthenticated users.
 2019-09-03 21:28:29 +02:00
roschaefer
36ba4cc208 Refactor filterBubble spec 2019-09-03 21:28:29 +02:00
roschaefer
2d67c5f172 Refactored entire softDeleteMiddleware spec 2019-09-03 21:28:29 +02:00
roschaefer
0f64bbb71f Soft delete for comments implemented 2019-09-03 21:28:29 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
roschaefer
c29ee5e3d3 Update notifications in place 2019-08-30 16:00:32 +02:00
roschaefer
994ab43950 Change the behaviour how notifications get created 
I think it makes more sense to update an existing notification in place.
Ie. if there was already a notification, just mark it as unread so it
ends up in the recipient's notification list again.
 2019-08-30 16:00:32 +02:00
roschaefer
733c2d5ce1 All backend tests pass 2019-08-30 16:00:32 +02:00
roschaefer
2846a6a8d3 Spec for notifications passing 2019-08-30 16:00:32 +02:00
roschaefer
cf8ead10f3 Start to refactor backend tests 2019-08-30 16:00:32 +02:00
roschaefer
4b96454b90 Notifications resolver capable of orderBy + filter 2019-08-30 16:00:32 +02:00
roschaefer
643d175ef6 Implement notifications resolver 2019-08-30 16:00:32 +02:00
Wolfgang Huß
c9c6605b3e Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-08-29 19:10:25 +02:00
Wolfgang Huß
327105da7a Refactor the extraction of hashtag out of a posts content 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-29 19:02:44 +02:00
Wolfgang Huß
0bc4c558ae Refactore the import and hashtags to all unicode characters 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-29 17:02:02 +02:00
ogerly
ee03f0e902 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-28 14:21:46 +02:00
Wolfgang Huß
af968461b6 Split handleNotificationsMiddleware in notificationsMiddleware and hashtagsMiddleware 2019-08-26 16:24:43 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
Wolfgang Huß
2600c69185 Change code after @mattwr18 suggestions 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-23 15:57:31 +02:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
roschaefer
123c30b301 Fix "cannot read property id of null" in staging 2019-08-23 14:53:52 +02:00
Robert Schäfer
b82743463e
Merge pull request #1368 from Human-Connection/1352-fix-update-post-resolver 
Fix UpdatePost resolver/validations
 2019-08-23 13:37:16 +02:00
Matt Rider
79e6b56396 Use ES6 syntax to avoid repetition 2019-08-23 12:35:53 +02:00
Matt Rider
abbfc6d757 Remove commented out, unneeded code 2019-08-23 11:30:20 +02:00
ogerly
0bb71cfbb3 Specs tests run through cleanly 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Matt Rider
773779e5f1 Fix UpdatePost resolver/validations 2019-08-23 10:57:11 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
Wolfgang Huß
3e91a66673 Correct wrong merge of master 2019-08-22 08:32:19 +02:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
roschaefer
5c72799095 Fix #1315 2019-08-21 01:52:43 +02:00
Matt Rider
ea923ae1dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 21:29:10 +02:00
Robert Schäfer
89b377fee1
Merge pull request #1281 from Human-Connection/272-add_error_reporting 
272 add error reporting
 2019-08-20 19:07:49 +02:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00