2824 Commits

Author SHA1 Message Date
Robert Schäfer
f27dca504b Refactor mixin with computed property
@ulfgebhardt I refactored the mixin because it's not enough code to
justify the additional complexity. If it's just two lines of code, I
find it the best solution to use a computed property.

You can use components and computed properties excessively, they tend to
be easier to maintain in the long run.
2019-05-06 22:59:25 +02:00
Robert Schäfer
ad111f5701 Double-check changed expectations, fix tests
See:
https://github.com/Human-Connection/Human-Connection/pull/478/files#r281267486

> We found the reason for it: If you have an exclamation mark in the schema e.g.
> email! and the response would e.g. expect the email for each User object, and
> the server does not have an email for the client, then the entire User object
> gets nullified.
2019-05-06 19:26:53 +02:00
ee2e9409b1
output to linux dev null again 2019-05-06 13:30:10 +02:00
9004e923af
removed unnecessary comment block 2019-05-06 13:02:09 +02:00
a71b421933
removed console log 2019-05-06 12:39:53 +02:00
ad05dcf735
frontend tests, backend tests 2019-05-02 17:47:34 +02:00
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
10ef0ab1c4
started backend test, fixed uniqueSlug 2019-04-30 19:05:03 +02:00
senderfm
412b56cffe seperatet username from truncate 2019-04-24 17:45:38 +02:00
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
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
55c1ac276d
use truncate instead of substring 2019-04-19 11:52:01 +02:00
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +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
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
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
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
59425f4f71
fixed Profile-Menu Username in case of emptystring 2019-04-17 14:57:06 +02:00
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
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
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
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
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
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