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
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Wolfgang Huß
b007015eeb Backend test for query "publicKey" to asure that "privatKey" is generated 
Minor approofments.
 2019-04-12 14:30:04 +02:00
Robert Schäfer
216fc2b67c DRY + Better naming: Testing flavours and Github 
cc @mattwr18

I would suggest that each subfolder like `/backend/`, `/webapp/`,
`/deployment/` and so on should have a file README.md. Thus, not only
gitbook will pick it up but also Github itself. Github is looking for a
file called README.md when iterating through subfolders.
 2019-04-12 13:48:47 +02:00
Robert Schäfer
627487629b Merge more READMEs 2019-04-12 13:28:10 +02:00
Ulf Gebhardt
00a95f956a
cypress fixes (windows) 2019-04-12 13:24:15 +02:00
Robert Schäfer
5339aa72d1 Rename h1 section titles 
This is a great way to find out how Gitbook maps the title: Is it the
filename or the first section header?
 2019-04-12 11:19:17 +02:00
Wolfgang Huß
9929aa4626 Rnamed "sessionRes" to "transactionRes" 
Even in the rewards mutation.
 2019-04-12 08:41:53 +02:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
0bec423a81 Delete/move documentation markdown files 2019-04-11 19:02:55 -03:00
Wolfgang Huß
95a0567e69 Query of users "publicKey" 'throws "Not Authorised!"' 
Changes password and permission middleware.

Thanks for your big help @roschaefer !
 2019-04-11 20:01:20 +02:00
Wolfgang Huß
6794156c86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-11 10:54:12 +02:00
dependabot[bot]
90752629e1
Bump neo4j from 3.5.3 to 3.5.4 in /backend/neo4j 
Bumps neo4j from 3.5.3 to 3.5.4.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-11 04:54:37 +00:00
Robert Schäfer
cec94bf381
Merge pull request #366 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/cli-7.4.3 
Bump @babel/cli from 7.2.3 to 7.4.3 in /backend
 2019-04-10 16:01:02 +02:00
Wolfgang Huß
c636d031be Refactored mutations "shout", "unshout" 
Formated "schema.graphql" for better readability.
"
 2019-04-10 15:24:58 +02:00
Robert Schäfer
102a03f552 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-10 15:17:18 +02:00
Wolfgang Huß
2feedc94e7 Refactored mutation "unfollow" 
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations
 2019-04-10 14:45:45 +02:00
Robert Schäfer
65076d24db
Merge pull request #196 from Human-Connection/dependabot/docker/backend/neo4j/neo4j-3.5.3 
Bump neo4j from 3.5.0 to 3.5.3 in /backend/neo4j
 2019-04-10 14:33:55 +02:00
dependabot[bot]
87c651e253 Bump @babel/cli from 7.2.3 to 7.4.3 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.2.3 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.2.3...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-10 14:30:49 +02:00
Wolfgang Huß
6a01146647 Refactored mutation "follow" 
Done by @Tirokk and @mattwr18 .
 2019-04-10 14:11:13 +02:00
Robert Schäfer
a28da06a00
Merge pull request #445 from Human-Connection/346-mark_as_read 
Mark a notification in the backend as read
 2019-04-10 14:04:34 +02:00
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
Robert Schäfer
81b84916a3
Merge branch 'master' into less_flaky_cucumbers 2019-04-10 11:39:49 +02:00
Robert Schäfer
da2cfd4be3
Merge branch 'master' into 346-mark_as_read 2019-04-10 11:39:46 +02:00
Wolfgang Huß
61c781c922 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-10 11:17:43 +02:00
Wolfgang Huß
587025e4d3 Start refactoring follow 2019-04-10 11:15:45 +02:00
dependabot[bot]
8d8c75d6c1
Bump graphql-shield from 5.3.1 to 5.3.2 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.1...v5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-10 08:58:34 +00:00
mattwr18
9c64220c92
Merge branch 'master' into 236-list-social-media-accounts 2019-04-09 21:06:41 -03:00
Robert Schäfer
b63200ac8e Authorize and whitelist Notifications 2019-04-10 01:58:18 +02:00
Robert Schäfer
26caff5a9b Fix lint 2019-04-10 01:58:18 +02:00
Robert Schäfer
0476c15163 Remove dots from matched @mention regex 2019-04-10 01:58:18 +02:00
Robert Schäfer
58019c8975 Avoid to send out notifications for email adresses 2019-04-10 01:58:18 +02:00
Robert Schäfer
771779348a Fix test 2019-04-10 01:58:18 +02:00
Robert Schäfer
bab748e506 Create notifications on CreatePost 2019-04-10 01:58:18 +02:00
Robert Schäfer
4dead6e6f7 Sketch test to create a notificaion for a mention 2019-04-10 01:58:18 +02:00
Robert Schäfer
c44b3b8b96
Merge branch 'master' into 347-display_notifications 2019-04-10 00:02:42 +02:00
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