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

2622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
c1d6caca38
Merge pull request #406 from Human-Connection/keep_private_rsa_key_secret 
Don't expose private RSA key
 2019-04-12 20:09:31 +02:00
Robert Schäfer
702a239180
Merge pull request #459 from Human-Connection/roschaefer-patch-1 
Fix emojis, remove duplicate link
 2019-04-12 20:07:40 +02:00
Matt Rider
aadfd16374 Remove redundant "not" 2019-04-12 13:23:10 -03:00
Robert Schäfer
c10a8abbf1
Merge branch 'master' into roschaefer-patch-1 2019-04-12 18:13:34 +02:00
Robert Schäfer
5fa6417c7e
Merge pull request #455 from Human-Connection/docs_fix_link 
Fix links to documentation
 2019-04-12 18:06:34 +02:00
Robert Schäfer
0c8b478ce2 Update backend/src/middleware/passwordMiddleware.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 17:32:20 +02:00
Wolfgang Huß
023c636017 Query of "publicKey" is now tested unauthenticated and authenticated 2019-04-12 17:17:01 +02:00
Robert Schäfer
473ae9220a Fix emojis, remove duplicate link 2019-04-12 17:12:04 +02:00
Robert Schäfer
e5e1f0a9fc Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:41 +02:00
Robert Schäfer
828ca50f19 Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:30 +02:00
Robert Schäfer
008d99c6ef Update backend/src/resolvers/user_management.spec.js 
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2019-04-12 16:51:10 +02:00
Robert Schäfer
96c6bd45c2 Fix links to documentation 2019-04-12 16:27:48 +02:00
Robert Schäfer
52be393050
Merge pull request #387 from Human-Connection/342-merge_documentation 
342 merge documentation
 2019-04-12 16:12:20 +02:00
Robert Schäfer
e89e038158 Prevent cypress from parsing markdown files 
If there is a README.md in `integration/` folder, cypress crashes.
 2019-04-12 14:54:40 +02:00
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Robert Schäfer
97dd3f8bee Link cucumber features in feature specification 2019-04-12 14:44:22 +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
Ulf Gebhardt
39c6c97eda
Merge pull request #440 from Human-Connection/2019/kw15/design_differences_post 
2019/kw15/design_differences_post
 2019-04-12 14:14:24 +02:00
Robert Schäfer
5fd269f419 Restructure feature specification 2019-04-12 14:04:46 +02:00
Robert Schäfer
705493daff Update kubernetes README 2019-04-12 14:01:28 +02:00
Robert Schäfer
f7a1ca9911 Remove deployment todos 2019-04-12 13:55:22 +02:00
Robert Schäfer
9c79634964 And lowercase the last three items for consistency 2019-04-12 13:54:17 +02:00
Robert Schäfer
d75509a148 Name the first gitbook item "Introduction" 2019-04-12 13:53:35 +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
901f5b5b22 Move deployment in separate folder 2019-04-12 13:37:31 +02:00
Ulf Gebhardt
c2ef3c9c44
possible fix for cypress create post 2019-04-12 13:37:12 +02:00
Robert Schäfer
61ee8b3a52 Remove documentation/ folder 
I believe, this was created through the Gitbook UI, is that right
@mattwr18?
 2019-04-12 13:34:28 +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
5c9e430a24 Merge feature list by @datenbrei 2019-04-12 13:07:08 +02:00
Robert Schäfer
7c951bfb50 Capitalized titles, encourage to update docs 2019-04-12 11:36:26 +02:00
Robert Schäfer
c4a1c23e0e Edit summary, remove duplicates 2019-04-12 11:32:43 +02:00
Robert Schäfer
18fb3bd7ce Specify location of SUMMARY.md 
cc @mattwr @tirokk @ulfgebhardt

Found it here: https://docs.gitbook.com/integrations/github/content-configuration
 2019-04-12 11:26:13 +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
Ulf Gebhardt
34faf9b8b3
missing test case 'gibberish' for RelativeDateTime 2019-04-12 11:16:45 +02:00
Robert Schäfer
e6b325333f
Merge pull request #450 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.0 
Bump v-tooltip from 2.0.0-rc.33 to 2.0.0 in /webapp
 2019-04-12 11:01:56 +02:00
Ulf Gebhardt
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Ulf Gebhardt
b7228648fc
fixed tests (missing dependency), fixed relativeDateTime language 2019-04-12 10:05:43 +02:00
Ulf Gebhardt
e6ee0477cf
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-12 09:36:21 +02:00
dependabot[bot]
783e8daef6
Bump v-tooltip from 2.0.0-rc.33 to 2.0.0 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0-rc.33 to 2.0.0.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/commits/v2.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-12 04:48:41 +00:00
Matt Rider
e9e6104699 Readd .github directory 
- deleted in the gitbook ui
 2019-04-11 19:16:19 -03:00
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
9bede1913b Move .gitbook/assets to root level 
- contain images for the other markdown files
 2019-04-11 19:03:47 -03:00
Matt Rider
0bec423a81 Delete/move documentation markdown files 2019-04-11 19:02:55 -03:00
Matt Rider
4393c66a7e Add general installation instruction 2019-04-11 18:59:55 -03:00
Matt Rider
807642f91c Add Docker installation instructions 2019-04-11 18:20:37 -03:00
Matt Rider
6d703c73d1 Add Installation, assets directory 
- with screenshot of where to fork a repo
 2019-04-11 17:53:53 -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
Robert Schäfer
4a9a1b5aab
Merge pull request #448 from Human-Connection/dependabot/docker/backend/neo4j/neo4j-3.5.4 
Bump neo4j from 3.5.3 to 3.5.4 in /backend/neo4j
 2019-04-11 15:33:30 +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