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

1022 Commits

Author SHA1 Message Date
Matt Rider
154082a251 Add authorship to commments at creation 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-05-02 15:54:44 -03:00
Ulf Gebhardt
ad05dcf735
frontend tests, backend tests 2019-05-02 17:47:34 +02:00
Wolfgang Huß
b03cbb212a First Vue design of delete SocialMedia, custom mutation DeleteSocialMedia 
Backend Jest tests for DeleteSocialMedia
New backend Jest tests for CreateSocialMedia
 2019-05-02 17:41:54 +02:00
Ulf Gebhardt
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
Ulf Gebhardt
10ef0ab1c4
started backend test, fixed uniqueSlug 2019-04-30 19:05:03 +02:00
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -03:00
Matt Rider
5891129662 Ordered comments like alpha, move HcCommentForm, mobile responsive 
- in the first instance, we will be importing posts/comments from the alpha, so to maintain consistency, we've ordered them alike. In the future, we could support user choice of order.
- Gives more space for HcCommentForm, user can see comments added to list, helps with mobile responsiveness

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-26 08:57:29 -03:00
Matt Rider
0078b743fe Validate comments length, presence/test 
- Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-24 09:11:33 -03:00
Matt Rider
43d6254f3e Add custom CommentByPost query 2019-04-23 12:23:21 -03:00
Ulf Gebhardt
6de253fd32
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/components/_mixins/seo.js
#	webapp/components/mixins/seo.js
#	webapp/layouts/blank.vue
#	webapp/layouts/default.vue
#	webapp/mixins/seo.js
 2019-04-19 12:09:24 +02:00
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
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
Matt Rider
0149f30f5f Fix failing tests, refactor 
- due to changes made to comments factories, which caused failures
- to use new custom CreateComment resolver syntax to relate a comment to post by passing in the postId
 2019-04-17 20:27:35 -03:00
Matt Rider
f4744fa513 Remove unused import, variables, set debug to false 2019-04-17 18:37:44 -03:00
Robert Schäfer
91e11eb14d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-17 20:23:24 +02:00
Matt Rider
4dc39a97a8 Fix seeds 2019-04-17 12:51:30 -03:00
Matt Rider
f46e5ee58c Use custom resolver 
- add postId to type Comment
- remove it from params to create node without postId
- fix tests

Co-authored-by: Robert Schäfer <roschaefer@users.noreply.github.com>
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
Co-Authored-By: Mike Aono <aonomike@gmail.com>
 2019-04-17 11:27:26 -03:00
Ulf Gebhardt
2efc77097f
match specification of Dennis - minimum 3 characters for username, no hint for user to change the username to "Anonymous", Toast error if userdata cannot be changed due to username restrictions, display "Anonymous" if no username is found in database (even tho this is against implemented rules) 2019-04-17 14:49:03 +02:00
Ulf Gebhardt
e5f98f2cee
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/profile/_id/_slug.vue
 2019-04-17 13:59:30 +02:00
Matt Rider
0bcfefe210 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-17 08:00:07 -03: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
Matt Rider
c519bff743 Fix lint 2019-04-16 23:37:11 -03:00
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end 
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
 2019-04-16 23:12:13 -03:00
Matt Rider
9bc0c0f92c Add tests, create comments only when authenticated 2019-04-16 20:31:34 -03:00
Matt Rider
dfef4fe05f Add custom resolver, update factories 2019-04-16 19:48:59 -03: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
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00