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
dependabot-preview[bot]
569216b8bf
Bump node from 12.3.1-alpine to 12.4-alpine in /backend 
Bumps node from 12.3.1-alpine to 12.4-alpine.
 2019-06-05 05:01:44 +00:00
dependabot-preview[bot]
aafcd40fb0
Bump apollo-client from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.5.1 to 2.6.1.
- [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.1)
 2019-06-05 04:58:31 +00:00
dependabot-preview[bot]
084bdbb3f4
Bump graphql-shield from 5.3.5 to 5.3.6 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.5 to 5.3.6.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.5...v5.3.6)
 2019-06-05 04:58:05 +00:00
Robert Schäfer
3952578ffb Merge remote-tracking branch 'origin/master' into 206_setup_neo4j_db_constraints_on_startup 2019-06-05 01:04:38 +02:00
Robert Schäfer
d2130d64f4 Write documentation for Neo4J 
@Tirokk FYI
 2019-06-05 00:31:54 +02:00
Robert Schäfer
e3b4e9bf56 Cleaning the database checks for process.env 2019-06-04 17:33:30 +02:00
Robert Schäfer
0289412ba7 DISABLED_MIDDLEWARES only set outside production 
That way, we don't see verbose logging output on Travis. Setting DEBUG
will have the effect that all calls of `neo4jgraphql` will produce log
output.
 2019-06-04 17:33:30 +02:00
Ulf Gebhardt
dd624ef535
fix for YOU CAN'T CLEAN THE DATABASE WITH DEBUG=false 2019-06-04 00:10:42 +02:00
Ulf Gebhardt
97ff6fdb78
Merge branch 'master' into 2019/kw22/refactor_backend_structure 2019-06-03 23:31:26 +02:00
Ulf Gebhardt
0b270ee7c3
fixed default import syntax 2019-06-03 23:24:26 +02:00
Ulf Gebhardt
1a264a2662
fixed config check for server 2019-06-03 23:19:50 +02:00
Ulf Gebhardt
15bfabcefd
check if config variables are present only when server is started 2019-06-03 23:17:58 +02:00
Ulf Gebhardt
a1db7fa201
corrected config include 2019-06-03 23:13:42 +02:00
Ulf Gebhardt
edcc5adb41
corrected paths and include order 2019-06-03 23:11:48 +02:00
Ulf Gebhardt
edd71b7825
DISABLE_MIDDLEWARES now requires DEBUG=true 2019-06-03 23:00:27 +02:00
Ulf Gebhardt
164f3b6878
fixed lint 2019-06-03 22:57:46 +02:00
Matt Rider
76bca90ede Merge branch 'master' of github.com:Human-Connection/Human-Connection into 553-delete-comment 2019-06-03 16:55:30 -03:00
Ulf Gebhardt
6948666cfe
Merge branch 'master' into 2019/kw22/refactor_backend_structure 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/comments.spec.js
#	backend/src/schema/resolvers/socialMedia.spec.js
 2019-06-03 19:48:47 +02:00
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