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
5,431 Commits 117 Branches 1,511 Tags
Commit Graph

389 Commits

Author SHA1 Message Date
dependabot-preview[bot]
e01e137a80
Bump date-fns from 2.0.0-alpha.27 to 2.0.0-alpha.29 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.27 to 2.0.0-alpha.29.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.27...v2.0.0-alpha.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-06 04:54:04 +00:00
dependabot-preview[bot]
1039256e79
Bump @nuxtjs/axios from 5.5.3 to 5.5.4 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.3 to 5.5.4.
- [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.3...v5.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-06 04:52:58 +00:00
dependabot-preview[bot]
3844abcec2
Bump tippy.js from 4.3.2 to 4.3.3 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.2...v4.3.3)
 2019-06-06 01:38:30 +00:00
mattwr18
b713cd8859
Merge pull request #746 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.21.0 
Bump tiptap-extensions from 1.20.2 to 1.21.0 in /webapp
 2019-06-05 22:36:08 -03:00
Robert Schäfer
129d62fd7d
Merge pull request #744 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.1 
Bump apollo-client from 2.6.0 to 2.6.1 in /webapp
 2019-06-05 10:42:55 +02:00
dependabot-preview[bot]
5caa6007c1
Bump nuxt from 2.8.0 to 2.8.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.8.0 to 2.8.1.
- [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.8.0...v2.8.1)
 2019-06-05 05:00:18 +00:00
dependabot-preview[bot]
a7197ae666
Bump tiptap-extensions from 1.20.2 to 1.21.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.2 to 1.21.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.2...tiptap-extensions@1.21.0)
 2019-06-05 04:59:14 +00:00
dependabot-preview[bot]
af8a548958
Bump apollo-client from 2.6.0 to 2.6.1 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.0...apollo-client@2.6.1)
 2019-06-05 04:58:14 +00:00
Matt Rider
db0ad1a315 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 688-hover-effect-user-image-upload 2019-06-04 08:39:29 -03:00
dependabot-preview[bot]
b9c8d35def
Bump tippy.js from 4.3.1 to 4.3.2 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.1...v4.3.2)
 2019-06-04 04:59:26 +00:00
Matt Rider
c6cadc60c3 Remove semicolons added with .vscode linting, unused library 2019-06-03 21:23:11 -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
mattwr18
094a46861b
Merge pull request #721 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.2 
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp
 2019-06-03 19:30:10 -03:00
Matt Rider
e5ccdb91d2 Use custom slot for hc-avatar 2019-06-03 16:54:45 -03: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
dependabot-preview[bot]
86d1e2a4b9
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.1...tiptap-extensions@1.20.2)
 2019-06-03 05:01:54 +00:00
Robert Schäfer
321ead32fc
Merge pull request #663 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.17.1 
Bump prettier from 1.14.3 to 1.17.1 in /webapp
 2019-05-31 19:33:43 +02:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +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
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
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
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
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
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
dependabot-preview[bot]
da0a4eabfc
Bump prettier from 1.14.3 to 1.17.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-29 11:30:33 +00: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
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
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
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ß
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
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
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
mattwr18
c777a8ca89
Merge pull request #655 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.5 
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /webapp
 2019-05-24 19:29:37 -03:00
mattwr18
76ab25c152
Merge pull request #653 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.5 
Bump @babel/core from 7.4.4 to 7.4.5 in /webapp
 2019-05-24 19:29:03 -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
dependabot[bot]
597ec1443c
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.0.1...v9.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 05:02:01 +00:00