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

3236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Robert Schäfer
a819d6353a Fix probably randomly failing cypress test 
@mattwr18 @ulfgebhardt @tirokk @appinteractive @ogerly

I think I just fixed a randomly failing test (so-called "flaky" test).
After an update of `neo4j-graphql-js` I wondered why the
`TagsAndCategories.feature` test failed consistently. It turns out the
table that you can see in the test is ordered by the "Users" column:

|   | Name      | Users  | Posts    |
| 1 | Democracy | 2      | 3        |
| 2 | Ecology   | 1      | 1        |
| 3 | Nature    | 1      | 2        |

So there is a tie between row 2 and row 3. It seems that on version
2.4.0 the backend would return those rows in arbitrary order and now it
returns them in a deterministic order, thus failing the test every time.

Therefore I changed the test setup and I believe this should also make
the build more robust now.
 2019-05-17 00:09:54 +02:00
Robert Schäfer
91b1ee7085
Merge pull request #612 from Human-Connection/tansaku-patch-1 
Update CONTRIBUTING.md with codereview notes
 2019-05-16 23:40:59 +02:00
Robert Schäfer
29c5c64c4e Fix wrong screenshot in kubernetes docs 
I made a mistake. The correct external IP address is visible on your
Digital Ocean dashboard, not the kubernetes dashboard.
 2019-05-16 23:26:01 +02:00
Matt Rider
bb5b24cf07 Update to use custom styling, remove backgroundImage 
- Merge in master
 2019-05-16 15:56:20 -03:00
aonomike
29c9adc373 Refactor to use <img> instead of <hc-image> component for images 2019-05-16 16:36:25 +03:00
Sam Joseph
f16b400340
Update CONTRIBUTING.md 2019-05-16 12:58:55 +01:00
Matt Rider
49e19a3bd7 Set avatar as background image of vue-dropzone 2019-05-16 07:42:48 -03:00
dependabot[bot]
f001f7b5e3
Bump tiptap from 1.19.2 to 1.19.3 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.2...tiptap@1.19.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 04:46:33 +00:00
dependabot[bot]
75d54130ea
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-16 04:45:56 +00:00
mattwr18
3c09012833
Merge pull request #607 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.7.1 
Bump nuxt from 2.6.3 to 2.7.1 in /webapp
 2019-05-15 23:23:23 -03:00
mattwr18
1965c81303
Merge pull request #606 from Human-Connection/dependabot/npm_and_yarn/codecov-3.5.0 
Bump codecov from 3.4.0 to 3.5.0
 2019-05-15 23:22:56 -03:00
Robert Schäfer
5881a7d5df
Merge pull request #573 from Human-Connection/docs-354-kubernetes_cron_job_for_backups 
Docs 354 kubernetes cron job for backups
 2019-05-15 18:52:53 +02:00
Robert Schäfer
042f208c1c
Merge pull request #608 from Human-Connection/docs-update_https_configuration 
Docs update https configuration
 2019-05-15 16:44:12 +02:00
Robert Schäfer
0ef2c26f03 Clean up and add a content warning 2019-05-15 16:25:01 +02:00
Robert Schäfer
1b3ee63565 Document Volume Snapshots 2019-05-15 16:25:01 +02:00
Robert Schäfer
222b153242 Provide volume snapshot according to DO support 
Read:
https://github.com/Human-Connection/Human-Connection/pull/573#issuecomment-491358847
 2019-05-15 16:25:01 +02:00