ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,822 Commits 113 Branches 1,511 Tags
Commit Graph

4418 Commits

Author SHA1 Message Date
Robert Schäfer
89914f9a1a Disabling activityPub middleware again 
I thought it might be a good thing to create RSA keys at least for
cucumber testing. At least that's where we test activitityPub. But it
caused too flaky tests and broken builds. @Mastercuber if you need to
create a user and you need the RSA keys, don't create it through seeds
but through the actual server.
 2019-04-09 23:47:13 +02:00
Robert Schäfer
512835f202 Implement NotificationList without store implement 2019-04-09 20:51:54 +02:00
Robert Schäfer
afa0153f55 Show post-card in notification et al. 
* add notification in seeds
* extremely odd styling - on the index page the notification looks OK,
on the post page, the post card elements appear more densely packed
 2019-04-09 20:51:54 +02:00
Robert Schäfer
b355a244ab Fix lint 2019-04-09 20:51:17 +02:00
dependabot[bot]
5b64ba1dd1
Bump nodemon from 1.18.10 to 1.18.11 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.10 to 1.18.11.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.10...v1.18.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 04:52:26 +00:00
Matt Rider
4de8407620 Rename variable, mutation 
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
 2019-04-08 12:05:57 -03:00
Matt Rider
a1ebb89d64 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-08 11:57:35 -03:00
Robert Schäfer
adde8a5965 Remove dots from matched @mention regex 2019-04-08 12:08:49 +02:00
Robert Schäfer
f372cdcbdb Avoid to send out notifications for email adresses 2019-04-08 12:01:09 +02:00
Wolfgang Huß
c513b7ba2e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-08 11:41:42 +02:00
Robert Schäfer
93097d586c Merge remote-tracking branch 'origin/master' into create_notifications 2019-04-08 10:20:23 +02:00
Robert Schäfer
8e6fb3d9e2 Fix test 2019-04-08 10:19:57 +02:00
dependabot[bot]
419b80dae4
Bump cheerio from 1.0.0-rc.2 to 1.0.0-rc.3 in /backend 
Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.2 to 1.0.0-rc.3.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/1.0.0-rc.3/History.md)
- [Commits](https://github.com/cheeriojs/cheerio/compare/1.0.0-rc.2...1.0.0-rc.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-08 04:55:37 +00:00
Robert Schäfer
cf1f655451 Create notifications on CreatePost 2019-04-06 16:02:54 +02:00
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