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

3904 Commits

Author SHA1 Message Date
Ulf Gebhardt
ad307e7008
Merge branch 'master' into dependabot/docker/backend/neo4j/neo4j-3.5.3 2019-04-06 09:46:48 +02:00
Ulf Gebhardt
851e6919e9
Merge branch 'master' into keep_private_rsa_key_secret 2019-04-06 09:45:21 +02:00
Ulf Gebhardt
c1785af8e1
Merge branch 'master' into create_notifications 2019-04-06 09:44:43 +02:00
Ulf Gebhardt
63a646c6b1
Merge branch 'master' into dependabot/docker/backend/neo4j/neo4j-3.5.3 2019-04-05 20:01:07 +02:00
Ulf Gebhardt
1b9ce269cf
Merge branch 'master' into quick-fix 2019-04-05 20:00:14 +02:00
Ulf Gebhardt
256b4d92bb
Merge branch 'master' into create_notifications 2019-04-05 19:58:51 +02:00
Wolfgang Huß
a995c84ddf Merge branch 'keep_private_rsa_key_secret' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-05 18:43:47 +02:00
Wolfgang Huß
c4e57fc928 User to query for "publicKey" is generated on port "4001" 
But still no "publicKey" is generated.
So wished failing test shows not "publicKey" except other than "null".
 2019-04-05 18:32:11 +02:00
Wolfgang Huß
8713f61734 Added Tests to "user_management.spec.js" 
Implemented suppression of "publicKey", now commented out for testing approach.
Use port 4001 for querying, but forgot that I have to generate the user on the same port, before I can query it with generated "publicKey".
Do this in next commit.
 2019-04-05 17:44:43 +02:00
Robert Schäfer
cb5280e6e8 Sketch test to create a notificaion for a mention 2019-04-05 14:35:41 +02:00
Matt Rider
24d4259510 Add validURLMiddleware, remove unused package, extract tests 2019-04-05 09:15:22 -03:00
Matt Rider
2778bca11f Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:32:34 -03:00
Matt Rider
4d4978c0f2 Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:29:44 -03:00
Robert Schäfer
c543d7558c
Merge pull request #415 from Human-Connection/350-query_current_users_notifications 
350 query current users notifications
 2019-04-05 12:00:11 +02:00
Robert Schäfer
a6c2fcebde
Merge pull request #388 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-24.7.1 
Bump babel-jest from 24.5.0 to 24.7.1 in /backend
 2019-04-05 11:51:49 +02:00
Robert Schäfer
710a8515d3 Fix lint 2019-04-05 11:20:19 +02:00
Robert Schäfer
bb3a8525db Only admins are allowed to query all notifications 2019-04-05 02:35:33 +02:00
Robert Schäfer
97d9b6d772 Add notifications to User 2019-04-05 02:35:33 +02:00
Robert Schäfer
03d4c93f96 Add Notification type 2019-04-05 02:35:33 +02:00
Robert Schäfer
8477e71c28 Sketch test for #350 2019-04-05 02:31:32 +02:00
Robert Schäfer
5df54309b1 So close @mattwr18 2019-04-05 00:05:23 +02:00
Matt Rider
a51190d4e9 Add custom resolver for createSocialMedia 2019-04-04 15:43:06 -03:00
Wolfgang Huß
97707f7a20 Added file "backend/src/resolvers/follow.js" 
WIP !!! In development! Not able to run now!
 2019-04-04 18:29:50 +02:00
Robert Schäfer
8627d57906 Don't expose private RSA key 
cc @Tirokk
 2019-04-04 18:02:48 +02:00
dependabot[bot]
c30f0164eb
Bump babel-jest from 24.5.0 to 24.7.1 in /backend 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.7.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.7.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 10:51:46 +00:00
dependabot[bot]
ae5f60684b
Bump @babel/core from 7.4.0 to 7.4.3 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.0 to 7.4.3.
- [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.0...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 10:51:32 +00:00
Robert Schäfer
66f6987ab2
Merge pull request #383 from Human-Connection/338-fix_flaky_cucumbers 
Fix flaky cucumbers
 2019-04-04 12:49:23 +02:00
dependabot[bot]
cdbe53650a
Bump jest from 24.7.0 to 24.7.1 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.7.0 to 24.7.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.7.0...v24.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 04:54:15 +00:00
Matt Rider
d9bf8049c5 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-03 13:31:24 -03:00
Robert Schäfer
5f684479f0 Remove nyc altogether - it does not anyways 2019-04-03 18:25:19 +02:00
Robert Schäfer
81219096ff Update backend package.json 
cc @mattwr18 could you try out if `--watch` along with `yarn run
test:jest` works as expected? Before we did not use `yarn run dev` for
the test server and seeder. Now it should hot-reload your changed files
during testing.
 2019-04-03 16:44:41 +02:00
Robert Schäfer
2238afe73b
Merge pull request #367 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.3 
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /backend
 2019-04-03 14:43:53 +02:00
Matt Rider
9f6de23805 Add graphql-constraint-directive, uri contstraint 
- currently not compiling with "Error: Unknown directive "constraint""

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
 2019-04-03 09:00:36 -03:00
dependabot[bot]
853d47f05b
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.2 to 7.4.3.
- [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.2...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:26:31 +00:00
dependabot[bot]
a08d38ea7f
Bump jest from 24.6.0 to 24.7.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.6.0 to 24.7.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.6.0...v24.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:24:54 +00:00
Armin
c7d296fcc4 Fixes #361 2019-04-03 00:21:11 +02:00
Matt Rider
80f664dd78 Match user by id instead of email, update feature 2019-04-02 18:05:45 -03:00
Robert Schäfer
9fc45216b0
Merge pull request #358 from Human-Connection/dependabot/npm_and_yarn/backend/jest-24.6.0 
Bump jest from 24.5.0 to 24.6.0 in /backend
 2019-04-02 17:26:46 +02:00
dependabot[bot]
02113474dc
Bump eslint-plugin-promise from 4.0.1 to 4.1.1 in /backend 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 04:39:05 +00:00
dependabot[bot]
a2f7ed3cf5
Bump jest from 24.5.0 to 24.6.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.6.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 04:38:36 +00:00
Ulf Gebhardt
66b46f3c0d
Merge pull request #339 from Human-Connection/2019/kw14/fixed_windows_build_docu_fixed_server_start_text 
2019/kw14/fixed_windows_build_docu_fixed_server_start_text
 2019-04-01 19:17:26 +02:00
Robert Schäfer
3f44de4397
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:04:05 +02:00
Robert Schäfer
416da0d1ed
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:03:58 +02:00
Robert Schäfer
2218c4812c
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:03:41 +02:00
Robert Schäfer
50444ed6d1
Merge pull request #336 from Human-Connection/dependabot/npm_and_yarn/backend/slug-1.1.0 
Bump slug from 1.0.0 to 1.1.0 in /backend
 2019-04-01 16:41:14 +02:00
Robert Schäfer
2f5b145b5c
Merge pull request #334 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.2.1 
Bump graphql from 14.2.0 to 14.2.1 in /backend
 2019-04-01 16:40:03 +02:00
Ulf Gebhardt
cd6838a468
Fixed windows build, updated readme (prerequisites & requirements), fixed backend server start log output to reflect proper values 2019-04-01 16:32:08 +02:00
dependabot[bot]
4cbc6e8f9d
Bump slug from 1.0.0 to 1.1.0 in /backend 
Bumps [slug](https://github.com/Trott/node-slug) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/v1.0.0...v1.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:52:22 +00:00
dependabot[bot]
00ba5413ca
Bump eslint from 5.15.3 to 5.16.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 5.15.3 to 5.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.15.3...v5.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:51:37 +00:00
dependabot[bot]
bce853a89c
Bump graphql from 14.2.0 to 14.2.1 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.2.0 to 14.2.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.2.0...v14.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:50:55 +00:00