ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

2667 Commits

Author SHA1 Message Date
Robert Schäfer
36f77e660e
Merge pull request #731 from Human-Connection/722_comment-date 
Add date relative date on comments
 2019-06-05 00:54:48 +02:00
Robert Schäfer
52a52d7ad4 Provide better user experience with different icon 
@ogerly I changed the icon to use a normal eye if you want to release
the contribution. Changing visual state usually improves user
experience.
 2019-06-04 18:15:07 +02:00
senderfm
f1b85d5256 Fixed clean ReleaseModal and DeleteModal 2019-06-04 16:25:59 +02:00
Matt Rider
8e96179b33 Remove unused prop, add error boundary handling 2019-06-04 08:57:22 -03:00
Matt Rider
57a253637c Remove annoying vue-dropzone messages 2019-06-04 08:20:51 -03:00
aonomike
55b3764258 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 722_comment-date 2019-06-04 13:54:41 +03:00
Matt Rider
19667762ce Remove unneeded/unused code 2019-06-04 07:52:21 -03:00
Matt Rider
e3bf68351c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 688-hover-effect-user-image-upload 2019-06-03 20:58:05 -03:00
Matt Rider
5c6147ee47 Fix broken tests, revert changes to error watch property 
- causing breaking change in the tests
 2019-06-03 19:14:29 -03:00
Matt Rider
31a6d36e59 Get overlay working, refactor 
- use arrow function for error watch property, remove let that = this
 2019-06-03 18:54:39 -03:00
aonomike
f7e5c7bf2c Add date relative date on comments 2019-06-03 23:36:04 +03:00
Matt Rider
e5ccdb91d2 Use custom slot for hc-avatar 2019-06-03 16:54:45 -03:00
Wolfgang Huß
d365f9368b Lint Fixes 2019-06-03 13:54:50 +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
Matt Rider
e09ef35c4a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-06-01 16:05:43 -03:00
aonomike
78100bec37 Add tests to upload error bug fix 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-06-01 20:23:04 +03:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +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
Wolfgang Huß
b46016203a Started writing Jest tests for Deletion of Comments 2019-05-31 14:57:44 +02:00
Robert Schäfer
ea42d73d04 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/webapp/prettier-1.17.1 2019-05-31 13:35:20 +02:00
Wolfgang Huß
52a430fc91 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 11:36:50 +02:00
Wolfgang Huß
76469df059 Getting Jest Tests to run again. 2019-05-31 11:36:27 +02:00
Matt Rider
068f6c2b49 Add logo as default avatar background image 2019-05-30 16:04:16 -03:00
Wolfgang Huß
542e281450 Fixed lint 2019-05-29 18:30:53 +02:00
Wolfgang Huß
ad7627fe05 Fixed the missing ds-flexin the PostCard 2019-05-29 18:18:58 +02:00
Wolfgang Huß
3e3e447bc5 Refactored three quater of the tests 2019-05-29 17:59:07 +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
aonomike
0111e60f1d Resolve Upload image rerender and double submit 
- Make Upload component re-render on failed upload
- Resolve double submit of uploaded to the backend when uploading with drag and drop

Co-authored-by: @mattWr18
Co-authored-by: @tirrok
 2019-05-29 16:09:34 +03:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
aonomike
7def0b4c20 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-05-29 15:35:12 +03:00
Robert Schäfer
66aa744e75
Merge pull request #700 from Human-Connection/685-fix-user-avatar-jumping-on-upload 
Fix user avatar jumping on upload
 2019-05-29 12:33:20 +02:00
Wolfgang Huß
19771a342e First approach to test '_slug.spec.js' 2019-05-29 12:19:51 +02:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +02:00
Wolfgang Huß
810746f138
Merge pull request #695 from Human-Connection/583-localize-tiptap-placeholder-text 
Fix placeholder text not translating bug
 2019-05-29 08:08:29 +02:00
Matt Rider
b08b29ba8e Fix user avatar jumping on upload 2019-05-28 20:35:47 -03:00
aonomike
154b6a6f78 Fix large file sizes bug 2019-05-28 23:31:57 +03:00
Matt Rider
97a374fd84 Fix placeholder text not translating bug 
- tiptap-extensions are not reactive
- we must call a method to change them dynamically
- emit changeLanguage event, which is listened for by the Editor component, which then calls a method to set the emptyNodeText of tiptap
 2019-05-28 12:46:52 -03:00
Robert Schäfer
a07ca22e26 Replace <ds-avatar> on profile page 2019-05-28 15:20:24 +02:00
Robert Schäfer
db9596e276 Replace HcAvatar where possible 
We still have `<ds-avatar>` in the code. It's used for the social media
icons. I'll leave it as it is for now.
 2019-05-28 15:20:24 +02:00
Matt Rider
745a326fbe Test refetching a Post with its comments 2019-05-27 19:16:27 -03:00
Matt Rider
b378bcb286 Fix edit field render bug(CommentForm) 
- remove no-ssr, which was not necessary and causing the edit field not to appear the majority of the times visiting a Post.
- this was really bad user experience since a user would need to refresh the page to comment.
- removed args in refetchPostComments as there are no params passed in when it is called anymore
- needed to add an if statement since if there are no comments on a Post, then this.$apollo.queries.Post is undefined and it errors out trying to call refetch()
- update test to remove no-ssr

Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-05-27 17:02:00 -03:00
Wolfgang Huß
5380a5d6af Fixed Lint 2019-05-27 15:35:51 +02:00
Wolfgang Huß
f9fe4f742f Lint fixes 2019-05-27 12:39:37 +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
ALau2088
8c7009097a 552-update_comment 2019-05-24 08:22:56 -07:00
ALau2088
8a8ed5131e refactor backend and add UI 2019-05-24 08:03:39 -07:00
Matt Rider
39d4771ce1 Fix lint 2019-05-24 08:48:52 -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