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

2938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03:00
Matt Rider
43d6254f3e Add custom CommentByPost query 2019-04-23 12:23:21 -03:00
Robert Schäfer
718b2da6e7 Improve the docs with @datenbrei 2019-04-23 17:21:45 +02:00
dependabot[bot]
074155da73
Bump tiptap-extensions from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.15.0...tiptap-extensions@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 15:08:08 +00:00
Robert Schäfer
f3e559d58f
Merge pull request #497 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.16.2 
Bump tiptap from 1.15.0 to 1.16.2 in /webapp
 2019-04-23 17:06:02 +02:00
Matt Rider
c6b11319fe Clear editor, write cypress test 
- the editor only clears once, also there are some other bugs associated with clearing it this way
- according to https://github.com/scrumpy/tiptap/issues/21 there should be a clearContent(), but haven't been able to get it to work
- cypress test for some reason is with a weird bug where I need to submit the form, then click on the submit button, otherwise it doesn't call the handleSubmit method
 2019-04-22 11:51:29 -03:00
Matt Rider
a360a688b9 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-22 08:12:59 -03:00
Matt Rider
a9f720753a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-22 08:10:06 -03:00
dependabot[bot]
54fe7e0029
Bump tiptap from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.15.0...tiptap@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 04:46:05 +00:00
aonomike
8e2a7ec5e5 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-20 17:02:17 +03:00
aonomike
52e82d277e Add Post Comment feature file 2019-04-20 16:59:47 +03:00
Matt Rider
49c03c92c8 Extract PostQuery/convert to js, try to get clear working 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-20 10:49:02 -03:00
Robert Schäfer
980fab01b3 Add documentation for neo4j backups in kubernetes 2019-04-20 13:55:32 +02:00
Robert Schäfer
1cd8a4d1a0
Merge pull request #486 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.4 
Bump graphql-shield from 5.3.3 to 5.3.4 in /backend
 2019-04-20 13:50:13 +02:00
Matt Rider
4d8148297e Fix styling of hc-editor, localize toast message 
- validations are not working for hc-editor, neither in this PR nor in ContributionForm
 2019-04-19 12:53:59 -03:00
Matt Rider
9ff194f3d6 Refetch the post to update the comments 
- I'm not happy with this as it is expensive, but seems to be used in other places in the code base, where I found the idea, @appinteractive left a comment suggesting a better approach would be to use subscriptions, but I haven't had time to research/try this option

Co-authored-by: Mike Aono <aonomike@gmail.com>
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-04-19 09:48:17 -03:00
dependabot[bot]
d1bc3847af
Bump graphql-shield from 5.3.3 to 5.3.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.3...v5.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-19 04:47:45 +00: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
4f7d5ee24f Fix? flaky cypress by waiting for <no-ssr> content 
Content menu is a client-side rendered component. Maybe an extra
assertion will wait for it? That's how you can flix flaky cucumbers if
you use capybara.
 2019-04-18 19:05:36 +02:00
Robert Schäfer
6cd8a4ef21
Merge pull request #439 from Human-Connection/347-display_notifications 
[WIP] Frontend implementation for notifications
 2019-04-18 18:50:13 +02:00
Robert Schäfer
6c37f525c5 Grey out a read notification + test it 2019-04-18 17:11:22 +02:00
Robert Schäfer
a1744d363c Click away iziToast message after login 
Sometimes, the popup was covering the create-post button thus failing
some cypress tests locally.
 2019-04-18 16:54:05 +02: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
Robert Schäfer
a4de87318d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-18 12:31:31 +02:00
Robert Schäfer
f733efcd86
Merge pull request #462 from Human-Connection/447-generate_mentioning_link_in_editor 
[WIP] Generate a link for @-Mentionings
 2019-04-18 12:19:15 +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
9a96f22870 Finish Mention.feature 🥒 2019-04-17 22:29:55 +02:00
Robert Schäfer
408c95a96c Implement mentioning in cypress test 2019-04-17 21:00:05 +02:00
Robert Schäfer
a127239988 Add cypress env configuration to docs 2019-04-17 20:59:54 +02: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
86d075292c Update frontend 
- to work with new backend implementation
 2019-04-17 12:51:50 -03:00
Matt Rider
4dc39a97a8 Fix seeds 2019-04-17 12:51:30 -03:00
Robert Schäfer
b126b9b4bc
Merge pull request #476 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.2 
Bump eslint-plugin-import from 2.17.1 to 2.17.2 in /backend
 2019-04-17 17:48:16 +02: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
dependabot[bot]
d09755241e
Bump eslint-plugin-import from 2.17.1 to 2.17.2 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.1 to 2.17.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.1...v2.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-17 12:29:51 +00:00
mattwr18
72bb9787be
Merge pull request #464 from Human-Connection/docs-improve_installation_instructions 
Docs improve installation instructions
 2019-04-17 09:28:33 -03: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
7a8617f901 Merge remote-tracking branch 'origin/master' into docs-improve_installation_instructions 2019-04-17 12:15:02 +02:00
Robert Schäfer
eb1ed39939
Merge pull request #477 from Human-Connection/cypress_reliability_force_click 
Try to fix flaky "ReportContent.feature"
 2019-04-17 11:49:27 +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
84379db750 Merge remote-tracking branch 'origin/master' into docs-improve_installation_instructions 2019-04-17 11:31:51 +02:00
Robert Schäfer
49431b6bc7 Try to fix flaky "ReportContent.feature" 🥒 2019-04-17 11:28:15 +02:00
Matt Rider
62caeffdd6 Merge branch '347-display_notifications' of github.com:Human-Connection/Human-Connection into 347-display_notifications 2019-04-17 00:09:24 -03:00
Matt Rider
33ddeeebd3 Refactor to use url() 2019-04-17 00:08:43 -03: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
Robert Schäfer
b9e18c5c49
Merge pull request #472 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.2 
Bump nuxt from 2.6.1 to 2.6.2 in /webapp
 2019-04-17 01:55:00 +02:00