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

4279 Commits

Author SHA1 Message Date
Robert Schäfer
7f83cb9c3e
Merge pull request #684 from Human-Connection/600-fix_performance_issue_on_index_page 
Use our own fork to workaround #600 for now
 2019-05-27 17:40:28 +02:00
Robert Schäfer
cd9ea3cd48
Merge pull request #674 from Human-Connection/dependabot/npm_and_yarn/backend/express-4.17.1 
Bump express from 4.17.0 to 4.17.1 in /backend
 2019-05-27 17:29:26 +02:00
Robert Schäfer
0e9fce0a07 Add missing dependency git in Dockerfile 2019-05-27 15:37:08 +02:00
Robert Schäfer
fb0e6f5abd Use our own fork to workaround #600 for now 2019-05-27 15:15:13 +02:00
mattwr18
bfb4e06a35
Merge pull request #636 from Human-Connection/uploads-on-server 
Image upload backend implementation
 2019-05-27 09:28:00 -03:00
dependabot-preview[bot]
44165a12a1
Bump express from 4.17.0 to 4.17.1 in /backend 
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 11:23:02 +00:00
dependabot-preview[bot]
1256660d43
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /backend 
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 11:22:26 +00:00
dependabot-preview[bot]
c96652423b
Bump nodemon from 1.19.0 to 1.19.1 in /backend 
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:08:34 +00:00
mattwr18
456ee1dbdb
Merge pull request #666 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.3.1 
Bump graphql from 14.3.0 to 14.3.1 in /backend
 2019-05-24 19:31:59 -03:00
ALau2088
8a8ed5131e refactor backend and add UI 2019-05-24 08:03:39 -07:00
dependabot[bot]
e4fe58035c
Bump graphql from 14.3.0 to 14.3.1 in /backend 
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 04:52:11 +00:00
dependabot[bot]
5b21107f9e
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /backend 
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 04:51:46 +00: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
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
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
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]
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
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
Robert Schäfer
9dd35a887a Fix test 2019-05-21 02:07:43 +02: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
Robert Schäfer
d624a3f232 Write tests for fileUpload 2019-05-21 02:01:00 +02: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
ALau2088
c76e18fae3 Merge remote-tracking branch 'upstream/master' into 552-update_comment 2019-05-19 09:30:11 -07:00
ALau2088
3fe8e9a288 552-update_comment 2019-05-18 23:42:17 -07:00
ALau2088
7ddbab83e9 552-update_comment 2019-05-18 23:32:24 -07:00
ALau2088
f7ef09acbf add UpdateComment mutation 2019-05-18 18:20:43 -07:00
Ulf Gebhardt
341baa5e3b
fixed lint rules 2019-05-18 15:43:26 +02:00
Ulf Gebhardt
e3f9d1fe73
dependencies, fixes 2019-05-18 15:33:12 +02:00
Ulf Gebhardt
b4e7b9c40f
dependencies 2019-05-18 15:31:03 +02:00
Ulf Gebhardt
161921c911
fixes 2019-05-18 15:29:21 +02:00
Ulf Gebhardt
c69e5915f1
backend pretier, more linting rules 2019-05-18 15:07:02 +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
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
dependabot[bot]
45c64db90f
Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.4.2 to 2.6.0.
- [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-14 21:15:12 +00:00
Ulf Gebhardt
eb995d6ad4
Merge pull request #596 from Human-Connection/refactoring_validation_middleware 
Refactoring validation middleware
 2019-05-14 12:02:59 +02:00
Robert Schäfer
2d1daee23a Don't document that we can set IDs in mutations 2019-05-13 12:44:47 +02:00
mattwr18
f724b483c0
Merge pull request #567 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.5.0 
Bump apollo-server-testing from 2.4.8 to 2.5.0 in /backend
 2019-05-10 21:01:18 -03:00
Matt Rider
a6cc634218 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-testing-2.5.0 2019-05-10 14:09:43 -03:00
Matt Rider
595887d582 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/graphql-14.3.0 2019-05-10 14:08:47 -03:00
Robert Schäfer
81a26e14ff Fix test case, move spec to the right location 
@ulfgebhardt: The reason why the test case was failing is pretty
obvious. You forgot to create a user that you want to update. If there
is no user to update, then you get an empty response.

@ulfgebhardt: I moved the spec also in the right directory. You're
testing resolvers, so that's where I moved the `.spec` file.
 2019-05-10 17:34:05 +02:00