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

487 Commits

Author SHA1 Message Date
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
284ca34e03
Merge pull request #711 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.8.0 
Bump nuxt from 2.7.1 to 2.8.0 in /webapp
 2019-05-31 14:26:22 +02:00
Robert Schäfer
d39b5a87ef
Merge pull request #707 from Human-Connection/705-upgrade-axios 
Upgrade @nuxt/axios
 2019-05-31 14:11:21 +02:00
Robert Schäfer
e366c278a7
Merge pull request #704 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.5 
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp
 2019-05-31 13:05:42 +02:00
Robert Schäfer
a027e7599d
Merge pull request #706 from Human-Connection/686-dummy-placeholder-for-empty-avatars 
Add logo as default avatar background image
 2019-05-31 13:00:45 +02:00
Matt Rider
1f0e7bf7d9 Upgrade @nuxt/axios 
- was dependent on axios <= 0.18.0 and there is a high severity security alert from google
 2019-05-31 12:59:38 +02:00
dependabot-preview[bot]
9c06fe71e8
Bump nuxt from 2.7.1 to 2.8.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.7.1 to 2.8.0.
- [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.7.1...v2.8.0)
 2019-05-31 10:51:43 +00: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
dependabot-preview[bot]
67bce21104
Bump @nuxtjs/axios from 5.5.2 to 5.5.3 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.2...v5.5.3)
 2019-05-31 04:58:50 +00:00
Matt Rider
068f6c2b49 Add logo as default avatar background image 2019-05-30 16:04:16 -03:00
dependabot-preview[bot]
a6112bfe8c
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.4...v3.4.5)
 2019-05-30 05:00:33 +00: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
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
Robert Schäfer
13c87ae889 Run coverage only if requested 
I find it annoying to wait for code coverage tools to complete (~3
seconds) and especially to scroll up for every test run. So, this should
run coverage only on our build server *or* if you add `--coverage` on
the command line.
 2019-05-28 18:27:52 +02: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
Robert Schäfer
65947cd8e3
Merge pull request #679 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.8.0 
Bump @vue/cli-shared-utils from 3.7.0 to 3.8.0 in /webapp
 2019-05-27 19:43:59 +02:00
Wolfgang Huß
5380a5d6af Fixed Lint 2019-05-27 15:35:51 +02:00
mattwr18
a21fb27351
Merge pull request #605 from Human-Connection/399-user-profile-image-uploads 
User profile image uploads
 2019-05-27 09:32:04 -03:00
Robert Schäfer
2c7d649d25
Merge pull request #680 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.19.1 
Bump nodemon from 1.19.0 to 1.19.1 in /webapp
 2019-05-27 13:21:35 +02:00
Robert Schäfer
c39647909c
Merge pull request #681 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.2 
Bump @nuxtjs/axios from 5.5.1 to 5.5.2 in /webapp
 2019-05-27 13:21:17 +02:00
Robert Schäfer
21c3dafe41
Merge pull request #682 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.1 
Bump express from 4.17.0 to 4.17.1 in /webapp
 2019-05-27 13:20:49 +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
dependabot-preview[bot]
7d5673272b
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.2 to 2.17.3.
- [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.2...v2.17.3)
 2019-05-27 05:18:54 +00:00
dependabot-preview[bot]
4dc3adc31d
Bump express from 4.17.0 to 4.17.1 in /webapp 
Bumps [express](https://github.com/expressjs/express) from 4.17.0 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.0...4.17.1)
 2019-05-27 05:18:38 +00:00
dependabot-preview[bot]
57e3b51c96
Bump @nuxtjs/axios from 5.5.1 to 5.5.2 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.1...v5.5.2)
 2019-05-27 05:18:00 +00:00
dependabot-preview[bot]
e40f574221
Bump nodemon from 1.19.0 to 1.19.1 in /webapp 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.0...v1.19.1)
 2019-05-27 05:17:35 +00:00
dependabot-preview[bot]
b3b7921e7b
Bump @vue/cli-shared-utils from 3.7.0 to 3.8.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.7.0 to 3.8.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.8.0/packages/@vue/cli-shared-utils)
 2019-05-27 05:17:15 +00:00
Robert Schäfer
924edfad8e
Merge pull request #670 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.3.1 
Bump graphql from 14.3.0 to 14.3.1 in /webapp
 2019-05-26 13:04:17 +02:00
dependabot-preview[bot]
5634a84664
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.5.1 to 22.6.4.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.5.1...v22.6.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-25 00:28:14 +00:00
mattwr18
319d318b4c
Merge pull request #673 from Human-Connection/dependabot/npm_and_yarn/webapp/tar-2.2.2 
[Security] Bump tar from 2.2.1 to 2.2.2 in /webapp
 2019-05-24 21:26:06 -03:00
dependabot-preview[bot]
a6c392987e
Bump graphql from 14.3.0 to 14.3.1 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.0 to 14.3.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.0...v14.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 22:34:10 +00:00
mattwr18
1630c57761
Merge pull request #669 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-9.1.0 
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /webapp
 2019-05-24 19:33:50 -03:00
mattwr18
a84e97c610
Merge pull request #668 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.1 
Bump @nuxtjs/axios from 5.5.0 to 5.5.1 in /webapp
 2019-05-24 19:33:23 -03:00
dependabot-preview[bot]
17a081d2f5
[Security] Bump tar from 2.2.1 to 2.2.2 in /webapp 
Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/npm/node-tar/releases)
- [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)
 2019-05-24 22:31:33 +00:00
mattwr18
df86209ee1
Merge pull request #661 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.1 
Bump tiptap-extensions from 1.19.10 to 1.20.1 in /webapp
 2019-05-24 19:30:06 -03:00