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

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
f30da038d9 Change backend test to parse html not plain text 2019-04-16 11:21:38 +02:00
Robert Schäfer
23a461d16e Follow component directory strucutre in backend 2019-04-16 11:13:40 +02: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
Robert Schäfer
f5cf3d9b68 Use slugs instead of names for mentions 2019-04-16 02:08:29 +02:00
Matt Rider
faf25f5e45 Rename mentions feature 
- to use mentions instead of mentionings
 2019-04-15 20:58:15 -03:00
Robert Schäfer
7492e6b8c3 Order users by name 2019-04-16 01:39:47 +02:00
Robert Schäfer
4efb834599 Move ContributionForm in dedicated folder 2019-04-16 01:39:47 +02:00
Robert Schäfer
b21df879c6 Fix lint 2019-04-16 01:39:47 +02:00
Robert Schäfer
d87a0d5694 Customize Mention node based on Superclass 2019-04-16 01:39:47 +02:00
Robert Schäfer
b70e5be8b1 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-16 01:39:47 +02:00
Robert Schäfer
f760f37186 Pass entire user collection to Editor 2019-04-16 01:39:47 +02:00
Robert Schäfer
2529c62137 Copy+paste from tiptap example 
See https://github.com/scrumpy/tiptap/blob/master/examples/Components/Routes/Suggestions/index.vue
 2019-04-16 01:39:47 +02:00
Robert Schäfer
e94e81ea2d Convenience: Run seeds from root folder 2019-04-16 01:39:47 +02:00
Robert Schäfer
11d217fa6b Scaffold test for Editor.vue 2019-04-16 01:39:47 +02:00
Robert Schäfer
6c6628fdb5 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-16 01:39:47 +02:00
Matt Rider
a08e6cb841 Remove duplicate test, rename 
- Mentions is the proper English term
 2019-04-15 20:36:09 -03:00
Matt Rider
1c4b08ddba Fix currentUser mutation 2019-04-15 19:53:34 -03:00
Robert Schäfer
506906e344 Merge remote-tracking branch 'origin/master' into docs-improve_installation_instructions 2019-04-16 00:50:25 +02:00
Matt Rider
d4a4c9f362 Fix failing tests 2019-04-15 19:49:42 -03:00
Matt Rider
72c1d3914a Merge branch '347-display_notifications' of github.com:Human-Connection/Human-Connection into 347-display_notifications 2019-04-15 19:40:02 -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
mattwr18
f6eb5474d1
Merge pull request #471 from Human-Connection/disable_cypres_recordings 
Disable cypress test recordings
 2019-04-15 16:59:51 -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
Robert Schäfer
4409792c20
Merge pull request #468 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.6.0 
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp
 2019-04-15 20:33:48 +02:00
Robert Schäfer
6e8661e29e
Merge pull request #465 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.3 
Bump graphql-shield from 5.3.2 to 5.3.3 in /backend
 2019-04-15 17:47:10 +02:00
Robert Schäfer
989fc018cf Disable cypress test recordings 
Because of: https://github.com/Human-Connection/Human-Connection/issues/470
 2019-04-15 17:47:02 +02:00
Robert Schäfer
a723611aba
Merge pull request #466 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.1 
Bump eslint-plugin-import from 2.16.0 to 2.17.1 in /backend
 2019-04-15 17:46:51 +02: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
dependabot[bot]
bd5b3f4ffb
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.5.1 to 3.6.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.6.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:55:09 +00:00
dependabot[bot]
2762b080a2
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:54:01 +00:00
dependabot[bot]
38c2ee4fcc
Bump eslint-plugin-import from 2.16.0 to 2.17.1 in /backend 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.16.0 to 2.17.1.
- [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.16.0...v2.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:47:45 +00:00
dependabot[bot]
fb6262a16a
Bump graphql-shield from 5.3.2 to 5.3.3 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.2 to 5.3.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.2...v5.3.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:47:18 +00:00
Robert Schäfer
6714cebad8 Merge more backend docs 2019-04-15 00:58:30 +02:00
Robert Schäfer
6796469c9c Merge installation with backend installation 2019-04-14 23:46:34 +02:00
Robert Schäfer
51f0142e7f Add section for directory layout 2019-04-14 23:46:34 +02:00
Robert Schäfer
1be334cef6 Tell our contributors to ask for write permissions 2019-04-14 23:46:34 +02:00