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

214 Commits

Author SHA1 Message Date
dependabot[bot]
ce6523b3d9
Bump tiptap-extensions from 1.16.2 to 1.17.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.16.2...tiptap-extensions@1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 21:02:50 +00:00
Robert Schäfer
5ddda1da0f
Merge pull request #513 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.4 
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /webapp
 2019-05-01 22:59:08 +02:00
dependabot[bot]
8a3ac4ede2
Bump tiptap from 1.16.2 to 1.17.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.16.2...tiptap@1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 04:56:44 +00:00
Robert Schäfer
0fa83188f5
Merge pull request #505 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.3 
Bump nuxt from 2.6.2 to 2.6.3 in /webapp
 2019-04-30 23:02:17 +02:00
Robert Schäfer
33710e9bc9
Merge branch 'master' into dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.4 2019-04-30 23:01:16 +02:00
Robert Schäfer
24cb43eb49
Merge pull request #514 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.7.0 
Bump @vue/cli-shared-utils from 3.6.0 to 3.7.0 in /webapp
 2019-04-30 23:00:13 +02:00
dependabot[bot]
44f9595d90
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 12:31:04 +00:00
dependabot[bot]
cd9ff076f8
Bump nuxt from 2.6.2 to 2.6.3 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.6.2...v2.6.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:59 +00:00
dependabot[bot]
23e6ef3c06
Bump @vue/cli-shared-utils from 3.6.0 to 3.7.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.7.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:08 +00:00
dependabot[bot]
af9595fc61
Bump eslint-config-prettier from 4.1.0 to 4.2.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.1.0...v4.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:25:24 +00:00
Matt Rider
94384a7608 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-29 14:57:46 -03:00
Robert Schäfer
e948a50c12
Merge pull request #484 from Human-Connection/another_try_to_fix_flaky_cypress_tests 
Fix? flaky cypress by waiting for <no-ssr> content
 2019-04-29 19:50:47 +02:00
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -03:00
Robert Schäfer
5eb3de5e87
Merge pull request #517 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.4 
Bump @babel/core from 7.4.3 to 7.4.4 in /webapp
 2019-04-29 12:42:36 +02:00
dependabot[bot]
20adf8cf95
Bump v-tooltip from 2.0.1 to 2.0.2 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:54:18 +00:00
dependabot[bot]
fc55d1d738
Bump @babel/core from 7.4.3 to 7.4.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:53:29 +00:00
Matt Rider
2a2f124ba7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into another_try_to_fix_flaky_cypress_tests 2019-04-27 18:01:48 -03:00
Matt Rider
7181f03fdf Fix flaky cypress test 2019-04-27 18:00:37 -03:00
Matt Rider
30d0ff3cc7 Search for button with text "Comment" in cypress test 2019-04-26 11:31:18 -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
05ad8ccc30 Remove unused variable/method 2019-04-25 16:36:59 -03:00
Matt Rider
c387760046 Extract CommentForm component 
- Cypress test is now passing as a result

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-04-25 14:20:00 -03:00
Matt Rider
3882cfcc48 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-25 10:11:47 -03:00
Matt Rider
092dcd7122 Get cypress test passing in a hacky way 2019-04-25 10:10:08 -03:00
Robert Schäfer
629df47104 Merge remote-tracking branch 'origin/master' into 260-add-comment-form 2019-04-25 14:24:57 +02:00
Wolfgang Huß
18458d23f5 Localisations corrected 
Had some old failures and some criss-cross with German and English.
 2019-04-25 10:36:03 +02:00
dependabot[bot]
418b93e4fd
Bump tippy.js from 4.2.1 to 4.3.0 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.2.1...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 04:54:26 +00:00
Matt Rider
7fafa1eb6e Get clear working properly 2019-04-24 20:56:15 -03:00
Matt Rider
05d393064a Disable Submit Button if comment is less than 3 characters 2019-04-24 14:58:22 -03:00
Matt Rider
f6cf05743a Add users to post for mentions 2019-04-24 12:47:20 -03:00
Matt Rider
d72b2ed271 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 12:30:49 -03:00
Matt Rider
8ae632be7b Fix component test, comment out form submission from cypress 
- Added $t function to test now that it is being localised
- We are submitting the form by clicking on the button as a normal user would
- Cypress test still broken due to peculiarities of tiptap editor
 2019-04-24 12:28:53 -03:00
Wolfgang Huß
bf19fc2b28 Added some translations 2019-04-24 17:10:02 +02:00
Matt Rider
546e2c99ad Localise text, remove frontend validations 
- validations are not working for the editor, they only work for our ds-input
 2019-04-24 09:15:41 -03:00
Matt Rider
23b0bbfbbe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 07:41:25 -03:00
Matt Rider
11a1f7991e Remove PostQuery.js 
- to be added in a separate ticket(?)
 2019-04-23 18:19:48 -03:00
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03: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
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
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
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
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
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
6c37f525c5 Grey out a read notification + test it 2019-04-18 17:11:22 +02:00
Robert Schäfer
9a96f22870 Finish Mention.feature 🥒 2019-04-17 22:29:55 +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
0bcfefe210 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-17 08:00:07 -03:00