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

98 Commits

Author SHA1 Message Date
Robert Schäfer
57a53a44b2 Fix seeded notifications 2019-04-18 16:43:06 +02:00
Robert Schäfer
0811ca8248 Massive refactoring of factories 
cc @mattwr18 @tirokk @ulfgebhardt @appinteractive

The factories don't use string interpolation now but they use variables.
This resolves some errors of escaping strings when you send html along
with `post.content`. It is much cleaner, too.
 2019-04-18 16:41:34 +02:00
Robert Schäfer
91e11eb14d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-17 20:23:24 +02:00
Robert Schäfer
2d85e5496d
Merge pull request #449 from Human-Connection/219-refactor-follow-shout-mutations 
refactor follow, unfollow, shout, unshout to custom mutations, but don't add date-time to relation yet
 2019-04-17 11:35:47 +02:00
Robert Schäfer
fe551ece47 Create notifications on UpdatePost, too 
Note that we don't create duplicate notifications. I made use of the behaviour
of XSS-middleware: It removes all css classes from `<a>` anchors. Because
notifications rely on a css class `mention` which gets removed in a later
middleware, this gives us a nice behaviour for re-notifications without creating
duplicates. The downside is that it creates dependencies between middlewares and
it's not that obvious at all.

cc @mattwr18 @ulfgebhardt @appinteractive @Tirokk
 2019-04-17 00:08:21 +02:00
Robert Schäfer
f86e98b32e Implement right order of notifications middleware 2019-04-17 00:08:21 +02:00
Robert Schäfer
4a6ef3f9f6 Implement parsing of mention links 2019-04-17 00:08:21 +02:00
Robert Schäfer
cd2bbbef30 Change backend test to parse html not plain text 2019-04-17 00:08:21 +02:00
Robert Schäfer
c050bddf4e Follow component directory strucutre in backend 2019-04-17 00:08:21 +02:00
Matt Rider
7102618569 Merge github.com:Human-Connection/Human-Connection into 347-display_notifications 2019-04-15 19:38:13 -03:00
Robert Schäfer
73f2ff59e4
Merge pull request #237 from Human-Connection/236-list-social-media-accounts 
List socialMedia links
 2019-04-15 12:07:10 +02:00
Matt Rider
aadfd16374 Remove redundant "not" 2019-04-12 13:23:10 -03:00
Robert Schäfer
0c8b478ce2 Update backend/src/middleware/passwordMiddleware.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 17:32:20 +02:00
Wolfgang Huß
023c636017 Query of "publicKey" is now tested unauthenticated and authenticated 2019-04-12 17:17:01 +02:00
Robert Schäfer
e5e1f0a9fc Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:41 +02:00
Robert Schäfer
828ca50f19 Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:30 +02:00
Robert Schäfer
008d99c6ef Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:10 +02:00
Wolfgang Huß
b007015eeb Backend test for query "publicKey" to asure that "privatKey" is generated 
Minor approofments.
 2019-04-12 14:30:04 +02:00
Wolfgang Huß
9929aa4626 Rnamed "sessionRes" to "transactionRes" 
Even in the rewards mutation.
 2019-04-12 08:41:53 +02:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
Wolfgang Huß
95a0567e69 Query of users "publicKey" 'throws "Not Authorised!"' 
Changes password and permission middleware.

Thanks for your big help @roschaefer !
 2019-04-11 20:01:20 +02:00
Wolfgang Huß
6794156c86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-11 10:54:12 +02:00
Wolfgang Huß
c636d031be Refactored mutations "shout", "unshout" 
Formated "schema.graphql" for better readability.
"
 2019-04-10 15:24:58 +02:00
Robert Schäfer
102a03f552 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-10 15:17:18 +02:00
Wolfgang Huß
2feedc94e7 Refactored mutation "unfollow" 
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations
 2019-04-10 14:45:45 +02:00
Wolfgang Huß
6a01146647 Refactored mutation "follow" 
Done by @Tirokk and @mattwr18 .
 2019-04-10 14:11:13 +02:00
Wolfgang Huß
587025e4d3 Start refactoring follow 2019-04-10 11:15:45 +02:00
Robert Schäfer
b63200ac8e Authorize and whitelist Notifications 2019-04-10 01:58:18 +02:00
Robert Schäfer
26caff5a9b Fix lint 2019-04-10 01:58:18 +02:00
Robert Schäfer
0476c15163 Remove dots from matched @mention regex 2019-04-10 01:58:18 +02:00
Robert Schäfer
58019c8975 Avoid to send out notifications for email adresses 2019-04-10 01:58:18 +02:00
Robert Schäfer
771779348a Fix test 2019-04-10 01:58:18 +02:00
Robert Schäfer
bab748e506 Create notifications on CreatePost 2019-04-10 01:58:18 +02:00
Robert Schäfer
4dead6e6f7 Sketch test to create a notificaion for a mention 2019-04-10 01:58:18 +02:00
Robert Schäfer
512835f202 Implement NotificationList without store implement 2019-04-09 20:51:54 +02:00
Robert Schäfer
afa0153f55 Show post-card in notification et al. 
* add notification in seeds
* extremely odd styling - on the index page the notification looks OK,
on the post page, the post card elements appear more densely packed
 2019-04-09 20:51:54 +02:00
Robert Schäfer
b355a244ab Fix lint 2019-04-09 20:51:17 +02:00
Matt Rider
4de8407620 Rename variable, mutation 
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
 2019-04-08 12:05:57 -03:00
Matt Rider
a1ebb89d64 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-08 11:57:35 -03:00
Robert Schäfer
adde8a5965 Remove dots from matched @mention regex 2019-04-08 12:08:49 +02:00
Robert Schäfer
f372cdcbdb Avoid to send out notifications for email adresses 2019-04-08 12:01:09 +02:00
Wolfgang Huß
c513b7ba2e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-08 11:41:42 +02:00
Robert Schäfer
8e6fb3d9e2 Fix test 2019-04-08 10:19:57 +02:00
Robert Schäfer
cf1f655451 Create notifications on CreatePost 2019-04-06 16:02:54 +02:00
Ulf Gebhardt
851e6919e9
Merge branch 'master' into keep_private_rsa_key_secret 2019-04-06 09:45:21 +02:00
Ulf Gebhardt
c1785af8e1
Merge branch 'master' into create_notifications 2019-04-06 09:44:43 +02:00
Ulf Gebhardt
1b9ce269cf
Merge branch 'master' into quick-fix 2019-04-05 20:00:14 +02:00
Wolfgang Huß
a995c84ddf Merge branch 'keep_private_rsa_key_secret' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-05 18:43:47 +02:00
Wolfgang Huß
c4e57fc928 User to query for "publicKey" is generated on port "4001" 
But still no "publicKey" is generated.
So wished failing test shows not "publicKey" except other than "null".
 2019-04-05 18:32:11 +02:00
Wolfgang Huß
8713f61734 Added Tests to "user_management.spec.js" 
Implemented suppression of "publicKey", now commented out for testing approach.
Use port 4001 for querying, but forgot that I have to generate the user on the same port, before I can query it with generated "publicKey".
Do this in next commit.
 2019-04-05 17:44:43 +02:00