ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-19 19:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,252 Commits 104 Branches 1,559 Tags
Commit Graph

3252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Matt Rider
99d6a75ccb Get rid of deprecation warning 
- DeprecationWarning: File upload property ‘stream’ is deprecated. Use ‘createReadStream()’ instead
 2019-05-20 17:51:22 -03:00
Matt Rider
73fc0a420c Improve CSS, add key to rerender Upload 
- re-renders when avatar is successful updated
 2019-05-20 17:30:51 -03:00
Matt Rider
5cd50ee00d Remove apollo-upload-client 
- we are using graphql-client, which under the hood uses apollo-upload-client
 2019-05-20 16:42:13 -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
Matt Rider
e2d6d6217f Merge branch 'uploads-on-server' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-20 15:45:17 -03:00
Matt Rider
3df7f588d2 Merge branch '399-user-profile-image-uploads' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-20 15:39:57 -03:00
Matt Rider
f60af6a704 Merge github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-20 15:38:30 -03:00
Matt Rider
1bb523a9ef Set up to work with vddrop 
- on vdropzone-drop call vddrop function, which sends the mutation to the backend
 2019-05-20 15:37:08 -03:00
Robert Schäfer
4dbf1b2a2c UpdateUser with avatarUpload 
This is a curl request from a folder where I have a file `avatar.jpg`:

```
curl localhost:4000/ \
  -F operations='{ "query": "mutation($id: ID!, $file: Upload) { UpdateUser(id: $id, avatarUpload: $file) { id name avatar } }", "variables": { "id": "u3", "file": null } }' \
  -F map='{ "0": ["variables.file"] }' \
  -F 0=@avatar.jpg
```

It uploads the avatar to the public folder. We should

* Write tests
* Change the `user.avatar` url and send it to `/api` in the frontend
 2019-05-20 20:35:33 +02:00
Matt Rider
1c072b97b5 Add apollo-upload-client 2019-05-20 13:20:24 -03:00
dependabot[bot]
a96118cfaa
Bump cypress from 3.2.0 to 3.3.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.2.0...v3.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 12:33:49 +00:00
Robert Schäfer
f2577bb06c
Merge pull request #628 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.11.2 
Bump cypress-cucumber-preprocessor from 1.11.0 to 1.11.2
 2019-05-20 14:31:57 +02:00
Ulf Gebhardt
3f030b9e11
more emoji, removed unused sections, more meta data 2019-05-20 11:23:11 +02:00
dependabot[bot]
f27c8c5cc3
Bump tiptap-extensions from 1.19.4 to 1.19.8 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.4 to 1.19.8.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.4...tiptap-extensions@1.19.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 04:59:07 +00:00
dependabot[bot]
8cc4324a2c
Bump cypress-cucumber-preprocessor from 1.11.0 to 1.11.2 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.11.0 to 1.11.2.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.11.0...v1.11.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 04:52:38 +00:00
Robert Schäfer
859d3189f4
Merge pull request #616 from Human-Connection/docs-fix_wrong_instructions_where_to_find_external_ip_address 
Fix wrong screenshot in kubernetes docs
 2019-05-19 19:38:48 +02:00
Robert Schäfer
d73ec2288e
Merge pull request #626 from Human-Connection/613_revert-empty-component-to-use-img-tag 
Refactor to use <img> instead of <hc-image> component for images
 2019-05-19 19:25:44 +02:00
Robert Schäfer
03bf8fb3d5 Merge remote-tracking branch 'origin/master' into 399-user-profile-image-uploads 2019-05-18 13:52:24 +02:00
Robert Schäfer
b7632ed1fa Follow "folder with spec and component" convention 2019-05-18 13:49:13 +02:00
Ulf Gebhardt
df3ec92cf1
Merge branch 'master' into 2019/kw20/fix_post_card_design 2019-05-18 13:01:40 +02:00
Ulf Gebhardt
a7fb3f0095
linting 2019-05-18 12:36:51 +02:00
Ulf Gebhardt
eda58c25e3
ribbon tests, ribbon positions, fixed ssr stuff, fied missing language things 2019-05-18 12:33:41 +02:00
Ulf Gebhardt
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Robert Schäfer
45694b0f89
Merge pull request #617 from Human-Connection/dependabot/npm_and_yarn/backend/node-fetch-2.6.0 
Bump node-fetch from 2.5.0 to 2.6.0 in /backend
 2019-05-17 22:41:15 +02:00
Robert Schäfer
170f1cc35b
Merge pull request #618 from Human-Connection/dependabot/npm_and_yarn/backend/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /backend
 2019-05-17 22:40:51 +02:00
Robert Schäfer
ee1af607de
Merge pull request #619 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /webapp
 2019-05-17 22:40:34 +02:00
Robert Schäfer
f952e131e0
Merge pull request #620 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.3.0 
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp
 2019-05-17 22:40:08 +02:00
Robert Schäfer
d39241b9ec
Merge pull request #621 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/apollo-4.0.0-rc4.2 
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp
 2019-05-17 22:39:49 +02:00
Matt Rider
abcabc460f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-17 07:33:14 -03:00
dependabot[bot]
1095d98131
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.1 to 4.0.0-rc4.2.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.1...v4.0.0-rc.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:52:11 +00:00
dependabot[bot]
505098dd2d
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:47 +00:00
dependabot[bot]
8df1648c5e
Bump express from 4.16.4 to 4.17.0 in /webapp 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [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.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:10 +00:00
dependabot[bot]
4bc6363eff
Bump express from 4.16.4 to 4.17.0 in /backend 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [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.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:48:14 +00:00
dependabot[bot]
f0272ef8ed
Bump node-fetch from 2.5.0 to 2.6.0 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/bitinn/node-fetch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.5.0...v2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:47:39 +00:00
mattwr18
3612eae2af
Merge pull request #610 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp
 2019-05-17 00:43:28 -03:00
Matt Rider
69a01d31f9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:11:27 -03:00
Matt Rider
6825c58e0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:10:16 -03:00
dependabot[bot]
041c9056e7
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 03:06:55 +00:00
Matt Rider
95e2667a9b Add negative margin 2019-05-17 00:06:44 -03:00
mattwr18
83ed3f2b97
Merge pull request #611 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.19.3 
Bump tiptap from 1.19.2 to 1.19.3 in /webapp
 2019-05-17 00:04:49 -03:00
Robert Schäfer
b1923e0c84
Merge pull request #524 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.0 
Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend
 2019-05-17 01:30:06 +02:00
Robert Schäfer
8111bc2190 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.0 2019-05-17 00:15:54 +02:00