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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Matt Rider
9bc0c0f92c Add tests, create comments only when authenticated 2019-04-16 20:31:34 -03: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
Matt Rider
dfef4fe05f Add custom resolver, update factories 2019-04-16 19:48:59 -03:00
Robert Schäfer
055cb2f349 Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-17 00:08:51 +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
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
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
3be83ca7d0 Convenience: Run seeds from root folder 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
Robert Schäfer
b42863a890 Follow suggestions by @mattwr18 2019-04-16 22:21:28 +02:00
Robert Schäfer
ab0d10a5d9 Merge remote-tracking branch 'origin/master' into 447-generate_mentioning_link_in_editor 2019-04-16 22:15:20 +02:00
Robert Schäfer
7ce375e435
Merge pull request #473 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.15.0 
Bump tiptap-extensions from 1.14.0 to 1.15.0 in /webapp
 2019-04-16 22:13:00 +02:00
Robert Schäfer
e247d25aee Open mentioning link in new tab 
This will help some people not to loose data after accidently clicking
on the user @-mentioning.
 2019-04-16 22:11:07 +02:00
Robert Schäfer
65f96c2b28 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-16 22:11:07 +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
Robert Schäfer
aa3762a095 Implement right order of notifications middleware 2019-04-16 17:48:42 +02:00
Robert Schäfer
b2d72ae74a Implement parsing of mention links 2019-04-16 16:05:09 +02:00