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

2538 Commits

Author SHA1 Message Date
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
Ulf Gebhardt
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02: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
Ulf Gebhardt
55c1ac276d
use truncate instead of substring 2019-04-19 11:52:01 +02:00
Ulf Gebhardt
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +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
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
Ulf Gebhardt
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
Ulf Gebhardt
59425f4f71
fixed Profile-Menu Username in case of emptystring 2019-04-17 14:57:06 +02: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
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
Robert Schäfer
055b79bfe2 RemoveLinks is better suited as a filter 
Unfortunately with `v-html` you cannot use filters directly in
handlebars.
See: https://github.com/nuxt/nuxt.js/issues/231

I also fixed the tests even **without** mocking vue-filters.js plugin 👍
 2019-04-17 01:54:53 +02:00
Robert Schäfer
e595135e9d Display post.createdAt along with Notification 2019-04-17 01:18:53 +02:00
Robert Schäfer
f5afdf2435 Merge Notification with NotificationPostCard 
cc @mattwr18 Please don't see this as a revert of your work. Your
structure of the `notification-post-card` component was helpful and showed
the redundancy with `hc-post-card`. I reused a lot of the code, but
because I merged both components it now *looks* as if I authored all the code.
 2019-04-17 01:10:17 +02:00
Robert Schäfer
00046a5429 Remove obsolete href method 2019-04-17 00:08:39 +02:00
Robert Schäfer
c4577aa3e8 Move mixins to the right place 2019-04-17 00:08:39 +02:00
Robert Schäfer
4f2e70e871 Refactor and harden PostCard component 2019-04-17 00:08:21 +02:00
Robert Schäfer
128480fd0e Implement first test for Notification 
Fixed a bug along the way `(post.contentExcerpt == null)`
 2019-04-17 00:08:21 +02:00
Robert Schäfer
af60ad39a4 Follow directory layout 2019-04-17 00:08:21 +02:00
dependabot[bot]
0fe1bcb982 Bump tiptap-extensions from 1.14.0 to 1.15.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.14.0...tiptap-extensions@1.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-17 00:08:21 +02:00
Robert Schäfer
9ed204fa72 Open mentioning link in new tab 
This will help some people not to loose data after accidently clicking
on the user @-mentioning.
 2019-04-17 00:08:21 +02:00
Robert Schäfer
dd1d86e02c Use slugs instead of names for mentions 2019-04-17 00:08:21 +02:00
Robert Schäfer
25bef85683 Order users by name 2019-04-17 00:08:21 +02:00
Robert Schäfer
d885fd1beb Move ContributionForm in dedicated folder 2019-04-17 00:08:21 +02:00
Robert Schäfer
fcafb4e105 Fix lint 2019-04-17 00:08:21 +02:00
Robert Schäfer
bf18754b4d Customize Mention node based on Superclass 2019-04-17 00:08:21 +02:00
Robert Schäfer
b5f60369a5 Follow file naming convention 
All components should consist of a folder with these three files:
```
README.d
index.vue
spec.js
```

When you import components, omit the `index.vue`. That helps to `git
grep` for component names.
 2019-04-17 00:08:21 +02:00
Robert Schäfer
4d9c6c5b1c Pass entire user collection to Editor 2019-04-17 00:08:21 +02:00
Robert Schäfer
7d3b1ea3cc Copy+paste from tiptap example 
See https://github.com/scrumpy/tiptap/blob/master/examples/Components/Routes/Suggestions/index.vue
 2019-04-17 00:08:21 +02:00
Robert Schäfer
5f456fe752 Scaffold test for Editor.vue 2019-04-17 00:08:21 +02:00
Robert Schäfer
1fc76e0c4e Get rid of annoying lint error screen 
@appinteractive we have `yarn run lint` on our build server. I would say
this is enough to enforce linting. I get slowed down a little during
development. Instead of runing `yarn run lint --fix` every time I save, I
would like to `yarn run lint --fix` all in one before I commit.
 2019-04-17 00:08:21 +02:00
Matt Rider
674cdddfc3 Add Editor, cancel/submit buttons for comments 
- to PagesPost_id_slugIndex.vue
- handle simple comment creation using auto-generated resolver

Co-authored-by: Joseph "Kachulio" Ngugi <jngugi88@gmail.com>
 2019-04-16 13:45:07 -03:00
dependabot[bot]
0468d9972c
Bump tiptap-extensions from 1.14.0 to 1.15.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.14.0...tiptap-extensions@1.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 04:55:13 +00:00
dependabot[bot]
974c088f42
Bump nuxt from 2.6.1 to 2.6.2 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.6.1 to 2.6.2.
- [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.1...v2.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 04:54:38 +00:00
Matt Rider
1c4b08ddba Fix currentUser mutation 2019-04-15 19:53:34 -03:00
Matt Rider
d4a4c9f362 Fix failing tests 2019-04-15 19:49:42 -03:00
Matt Rider
7102618569 Merge github.com:Human-Connection/Human-Connection into 347-display_notifications 2019-04-15 19:38:13 -03:00
Matt Rider
e4908ed640 Add component for Notifications' posts, style 2019-04-15 19:33:27 -03:00
Robert Schäfer
5c71bbdc6f
Merge pull request #467 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.1 
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp
 2019-04-15 20:34:36 +02:00