48 Commits

Author SHA1 Message Date
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02:00
Robert Schäfer
7ab6ce4ed2 Fix typo in translation keys 2019-06-07 13:10:04 +02:00
Robert Schäfer
a06733fbfd Translate network tab on the left profile page 2019-06-07 13:01:47 +02:00
senderfm
12e79c83da Fixed No untranslated strings 2 2019-06-05 10:45:00 +02:00
senderfm
42f5fb6bf3 Fixed No untranslated strings 2019-06-05 10:38:15 +02:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
2019-06-03 10:39:13 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Matt Rider
f732ff44d0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 2019-05-29 10:33:43 -03:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +02:00
Robert Schäfer
a07ca22e26 Replace <ds-avatar> on profile page 2019-05-28 15:20:24 +02:00
Wolfgang Huß
68980f85c6 Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/ContentMenu.vue
#	webapp/components/Modal/DeleteModal.spec.js
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/Modal/DisableModal.spec.js
#	webapp/components/Modal/DisableModal.vue
#	webapp/components/Modal/ReportModal.spec.js
#	webapp/components/Modal/ReportModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/locales/de.json
#	webapp/pages/index.vue
#	webapp/pages/profile/_id/_slug.vue
2019-05-27 12:34:59 +02:00
Matt Rider
39d4771ce1 Fix lint 2019-05-24 08:48:52 -03:00
Matt Rider
51d25c1c9a Work through merge conflict 2019-05-24 08:23:50 -03:00
Matt Rider
460d081d52 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-24 08:10:17 -03:00
Matt Rider
cebd1046c7 Write cypress tests, show dropzone conditionally
- If it's the user's profile, show vueDropzone, if not show just the user's avatar
- apollo mutation is being called twice for drag and drop events
2019-05-24 01:26:37 -03:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Wolfgang Huß
8bcb250951 Started to rewrite the tests of DeleteModal.vue 2019-05-23 10:22:36 +02:00
aonomike
beeb7bb947 Change ds-avatar size to x-large 2019-05-21 23:26:51 +03:00
Matt Rider
d463312397 Get avatar upload working from frontend to backend
- there are several things to work on still
- the upload sets the avatar as the background image of the previewElement, which means that you must refresh the page to upload a different avatar
- the CSS is slightly different before and after successful upload
- the CSS is slightly broken in that the avatar is not in the "ideal" place, it is entirely inside the card, instead of half in, half out on the top
2019-05-20 16:37:02 -03:00
Wolfgang Huß
7f83f775a7 Clean up the delete-menu stuff for Comments and Posts 2019-05-19 08:23:51 +02:00
Wolfgang Huß
2016a9445b Rename confirm callbacks 2019-05-19 07:42:55 +02:00
Wolfgang Huß
388e9ff6b2 Go ahead with refactoring of DeleteModal in Comments and Posts 2019-05-18 15:56:07 +02:00
Wolfgang Huß
9af8c2b46c Refactored handling of DeleteModal in Comments and Posts 2019-05-18 12:58:51 +02:00
Matt Rider
49e19a3bd7 Set avatar as background image of vue-dropzone 2019-05-16 07:42:48 -03:00
Matt Rider
a04bc977d4 Fix lint
- still not automated
2019-05-14 20:57:49 -03:00
Matt Rider
24a6ec88ad Add nuxt-dropzone, Upload component 2019-05-14 17:19:00 -03:00
Robert Schäfer
0637d97648 Merge remote-tracking branch 'origin/master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-07 14:09:10 +02:00
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
Matt Rider
7181f03fdf Fix flaky cypress test 2019-04-27 18:00:37 -03: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
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02:00
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02: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
4f2e70e871 Refactor and harden PostCard component 2019-04-17 00:08:21 +02:00
Robert Schäfer
c0bff47275 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-12 17:49:14 +02:00
Matt Rider
444f01f879 Refactor test, component
- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
2019-04-12 08:34:06 -03:00
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Matt Rider
8f32df2597 Add translation, linkify avatar 2019-04-11 21:22:33 -03:00
Matt Rider
60c56f8872 Start adding social media card section to user profile 2019-04-11 16:38:31 -03:00
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
93ab590903
lint fixes 2019-04-09 11:10:50 +02:00
5d1cb43e8c
hide all unfunctional content - fixes https://github.com/Human-Connection/Human-Connection/issues/429 2019-04-08 10:48:04 +02:00
Robert Schäfer
51cbc65f4b Rename profile-id to profile-id-slug route 2019-03-26 13:52:56 +01:00
Robert Schäfer
327bd037a0 Implement redirect for user profile 2019-03-26 13:52:56 +01:00