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

4261 Commits

Author SHA1 Message Date
Wolfgang Huß
cc774b03b8 Lint Fix in Backend 2019-06-03 19:48:36 +02:00
Ulf Gebhardt
177e33c022
fixed spec include paths 2019-06-03 19:34:58 +02:00
Ulf Gebhardt
3adb8d0f64
lint fixes 2019-06-03 19:29:14 +02:00
Robert Schäfer
7272c5002d
Merge pull request #725 from Human-Connection/fix_terrible_middleware_bug_in_production 
Don't remove middlewares in production
 2019-06-03 19:27:33 +02:00
Wolfgang Huß
62993cc3e9 Clean up 2019-06-03 19:05:59 +02:00
Wolfgang Huß
25999a6dfd Bug fix for User can delete Comments of others 
Wrote a Jest test for this.
 2019-06-03 19:04:40 +02:00
Ulf Gebhardt
caa6a65f99
removed dotenv.config calls 2019-06-03 18:47:00 +02:00
Wolfgang Huß
deaf1b4307
Merge pull request #609 from Human-Connection/553-delete-comment 
Delete Comment

I’ll come back to your notices and recommendations @roschaefer …
But merge for now.
 2019-06-03 17:20:23 +02:00
Robert Schäfer
5866804fd3 Don't remove middlewares in production 
@ulfgebhardt thank you for pointing out! That was a terrible bug.
 2019-06-03 14:14:57 +02:00
Ulf Gebhardt
4fd2885b26
reference global config 2019-06-03 13:19:08 +02:00
dependabot-preview[bot]
1b35859861
Bump apollo-server from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.5.1...apollo-server@2.6.1)
 2019-06-03 11:05:10 +00:00
dependabot-preview[bot]
ebdfb028b8
Bump apollo-server-testing from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.5.1...apollo-server-testing@2.6.1)
 2019-06-03 04:57:55 +00:00
Ulf Gebhardt
f78c54a3e8
refactored backend structure 2019-05-31 19:31:39 +02:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
Ulf Gebhardt
b51b8423e7
fixed fileloader pattern to actually load smth 2019-05-31 16:40:35 +02:00
Robert Schäfer
9a9118c721 Merge remote-tracking branch 'origin/master' into 2019/kw22/alpha_data_import_status_schema_split 2019-05-31 16:26:06 +02:00
Ulf Gebhardt
754decd308
also wildcard include resolvers 2019-05-31 16:04:17 +02:00
Ulf Gebhardt
4c758a9083
fixed filename extension check 2019-05-31 15:46:37 +02:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
dependabot-preview[bot]
0b93a9b7c6
Bump apollo-server-testing from 2.5.0 to 2.5.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.5.0...apollo-server-testing@2.5.1)
 2019-05-31 10:51:06 +00:00
Robert Schäfer
5c7528dec1
Merge pull request #709 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.5.1 
Bump apollo-server from 2.5.0 to 2.5.1 in /backend
 2019-05-31 12:48:44 +02:00
dependabot-preview[bot]
bc173c0dc3
Bump node from 10-alpine to 12.3.1-alpine in /backend 
Bumps node from 10-alpine to 12.3.1-alpine.
 2019-05-31 05:01:59 +00:00
dependabot-preview[bot]
bbbebbc583
Bump apollo-server from 2.5.0 to 2.5.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.5.0...apollo-server@2.5.1)
 2019-05-31 04:58:49 +00:00
ALau2088
a5f6390f97 552-update_comment 2019-05-30 15:47:55 -07:00
Ulf Gebhardt
630e895f6c
Merge remote-tracking branch 'origin/master' into 2019/kw22/alpha_data_import_status_schema_split 2019-05-29 20:44:14 +02:00
Ulf Gebhardt
816fbdf7cd
fixed slug required - it was not in Nitro 2019-05-29 16:41:27 +02:00
Ulf Gebhardt
6f0447515a
- fixed several errors handling import 
- split graphql schema into parts
- which data is imported which is not - a list
 2019-05-29 15:37:28 +02:00
Robert Schäfer
ffd584ded1 Fix prettier 2019-05-29 12:36:26 +02:00
dependabot-preview[bot]
0003a98fd2 Bump prettier from 1.14.3 to 1.17.1 in /backend 
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 12:35:23 +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
mattwr18
50f655173d
Merge pull request #676 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.17.3 
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /backend
 2019-05-27 19:18:03 -03:00
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