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

3362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
fcf6b394f3
Bump tiptap-extensions from 1.19.10 to 1.20.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.10 to 1.20.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.10...tiptap-extensions@1.20.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 04:19:27 +00:00
dependabot[bot]
abfe710d61
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 04:17:10 +00:00
dependabot[bot]
06ba5f8f5b
Bump @babel/core from 7.4.4 to 7.4.5 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 04:17:09 +00:00
mattwr18
57521495d5
Merge pull request #660 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.20.1 
Bump tiptap from 1.19.8 to 1.20.1 in /webapp
 2019-05-24 01:17:08 -03:00
mattwr18
0455142eef
Merge pull request #659 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.0 
Bump @nuxtjs/axios from 5.4.1 to 5.5.0 in /webapp
 2019-05-24 01:16:37 -03:00
mattwr18
72342e93d9
Merge pull request #658 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.2.2 
Bump cypress-plugin-retries from 1.2.1 to 1.2.2
 2019-05-24 01:15:54 -03:00
mattwr18
df2acbd546
Merge pull request #649 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.5 
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /backend
 2019-05-24 01:15:25 -03:00
mattwr18
eb15e50c10
Merge pull request #648 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/node-7.4.5 
Bump @babel/node from 7.2.2 to 7.4.5 in /backend
 2019-05-24 01:14:59 -03:00
dependabot[bot]
d842493d91
Bump apollo-client from 2.5.1 to 2.6.0 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.5.1 to 2.6.0.
- [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.5.1...apollo-client@2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 03:04:34 +00:00
dependabot[bot]
3624254900
Bump @babel/node from 7.2.2 to 7.4.5 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.2.2 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.2...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 03:04:26 +00:00
dependabot[bot]
38346ee21d
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 03:04:25 +00:00
mattwr18
4fb29e6aa8
Merge pull request #646 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.5 
Bump @babel/core from 7.4.4 to 7.4.5 in /backend
 2019-05-24 00:02:31 -03:00
mattwr18
d083ee2a17
Merge pull request #645 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.0 
Bump apollo-cache-inmemory from 1.5.1 to 1.6.0 in /backend
 2019-05-24 00:02:08 -03:00
Matt Rider
d62f722381 Write component tests 2019-05-23 23:30:55 -03:00
Ulf Gebhardt
3be82ec8a6
Merge pull request #657 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.6.4 
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /backend
 2019-05-23 22:01:26 +02:00
Matt Rider
1c1d1a67ea Merge in master 2019-05-23 15:31:05 -03:00
Matt Rider
758bf215ac Merge branch 'master' of github.com:Human-Connection/Human-Connection into uploads-on-server 2019-05-23 15:26:19 -03:00
dependabot[bot]
73dd7d879f
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /backend 
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-23 18:24:57 +00:00
Ulf Gebhardt
7287158181
Merge pull request #625 from Human-Connection/2019/kw20/fix_lint_rules_and_vscode 
🍰 2019/kw20/fix_lint_rules_and_vscode
 2019-05-23 20:22:33 +02:00
Ulf Gebhardt
ce3d16c146
fixed test error caused by manual lint error fixing 2019-05-23 20:02:56 +02:00
Ulf Gebhardt
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Ulf Gebhardt
cfd0975b24
backend linting 2019-05-23 19:23:03 +02:00
Ulf Gebhardt
89ccf1fad0
Merge branch 'master' into 2019/kw20/fix_lint_rules_and_vscode 2019-05-23 19:19:13 +02:00
dependabot[bot]
c3b16e17ae
Bump tiptap from 1.19.8 to 1.20.1 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.8 to 1.20.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.8...tiptap@1.20.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-23 05:01:32 +00:00
dependabot[bot]
117255c8c0
Bump @nuxtjs/axios from 5.4.1 to 5.5.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.4.1 to 5.5.0.
- [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.4.1...v5.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-23 05:00:54 +00:00
dependabot[bot]
3b9351fdcb
Bump cypress-plugin-retries from 1.2.1 to 1.2.2 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-23 04:55:48 +00:00
Matt Rider
18a4853874 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-22 13:52:17 -03:00
dependabot[bot]
4335ca3065
Bump @babel/core from 7.4.4 to 7.4.5 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 04:52:49 +00:00
dependabot[bot]
30c9f7d451
Bump apollo-cache-inmemory from 1.5.1 to 1.6.0 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.5.1 to 1.6.0.
- [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-cache-inmemory@1.5.1...apollo-cache-inmemory@1.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 04:52:24 +00:00
mattwr18
99ae9770c6
Merge pull request #640 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.10 
Bump tiptap-extensions from 1.19.8 to 1.19.10 in /webapp
 2019-05-21 21:23:30 -03:00
mattwr18
d98f826cec
Merge pull request #639 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.1 
Bump neo4j-graphql-js from 2.6.0 to 2.6.1 in /backend
 2019-05-21 21:23:06 -03:00
Ulf Gebhardt
f64f8647a3
Merge pull request #644 from Human-Connection/643_update-avatar-image-size 
Change ds-avatar size to x-large
 2019-05-22 01:32:37 +02:00
Matt Rider
fd90006dff Merge branch 'uploads-on-server' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-21 17:32:02 -03:00
aonomike
beeb7bb947 Change ds-avatar size to x-large 2019-05-21 23:26:51 +03:00
Matt Rider
4ac8c7f06b Fix failing tests 2019-05-21 16:53:50 -03:00
Matt Rider
610a7f6bfe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-21 16:15:45 -03:00
Robert Schäfer
834473e978
Merge pull request #622 from Human-Connection/2019/kw20/fix_post_card_design 
🍰 2019/kw20/fix_post_card_design
 2019-05-21 15:30:44 +02:00
Robert Schäfer
c3f84fb8f4
Merge pull request #633 from Human-Connection/2019/kw21/github_templates_update 
🍰 2019/kw21/github_templates_update
 2019-05-21 15:25:39 +02:00
Ulf Gebhardt
3e23b072a8
removed asignees from empty issues 2019-05-21 14:02:32 +02:00
dependabot[bot]
4942ca7a29
Bump tiptap-extensions from 1.19.8 to 1.19.10 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.8 to 1.19.10.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.8...tiptap-extensions@1.19.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 04:54:00 +00:00
dependabot[bot]
4589f9463a
Bump neo4j-graphql-js from 2.6.0 to 2.6.1 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 04:53:13 +00:00
Robert Schäfer
3c22a432e6 Fix lint 2019-05-21 03:08:32 +02:00
mattwr18
8f48453259
Merge pull request #637 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.19.8 
Bump tiptap from 1.19.3 to 1.19.8 in /webapp
 2019-05-20 21:52:43 -03:00
Robert Schäfer
9dd35a887a Fix test 2019-05-21 02:07:43 +02:00
dependabot[bot]
aa1998ffce
Bump tiptap from 1.19.3 to 1.19.8 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.3 to 1.19.8.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.3...tiptap@1.19.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 00:04:52 +00:00
mattwr18
a851708b83
Merge pull request #630 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.8 
Bump tiptap-extensions from 1.19.4 to 1.19.8 in /webapp
 2019-05-20 21:02:30 -03:00
mattwr18
4f6c521925
Merge pull request #629 from Human-Connection/dependabot/npm_and_yarn/cypress-3.3.0 
Bump cypress from 3.2.0 to 3.3.0
 2019-05-20 21:02:04 -03:00
Robert Schäfer
2a22aaa907 Fix edge case bug in extractIds 2019-05-21 02:01:00 +02:00
Robert Schäfer
2b03b515e2 Implement image upload for posts 2019-05-21 02:01:00 +02:00