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
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
Matt Rider
78ec42e000 Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-28 14:36:33 -03:00
Matt Rider
8efb3484ac Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-28 14:26:55 -03:00
Robert Schäfer
67cbd129a9
Merge pull request #244 from Human-Connection/needed-env-vars 
Added PRIVATE_KEY_PASSPHRASE to needed env vars
 2019-03-27 23:19:21 +01:00
Robert Schäfer
08c2e5d708 I was able to save an empty string as social media 2019-03-27 13:56:28 +01:00
Robert Schäfer
9daa7b81b9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-27 12:55:36 +01:00
dependabot[bot]
82843857b3
Bump graphql from 14.1.1 to 14.2.0 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.1.1 to 14.2.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.1.1...v14.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 11:53:55 +00:00
Matt Rider
3f9916404e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-27 08:33:16 -03:00
Robert Schäfer
82bb4c4d7d Fix lint 2019-03-27 11:26:07 +01:00
Armin
53a2440e3c Add needed env var PRIVATE_KEY_PASSPHRASE + fix WebFinger test 2019-03-27 01:18:52 +01:00
Robert Schäfer
5d440d2e5b Fix wrong implementation of cucumber test 2019-03-26 20:49:04 +01:00
Robert Schäfer
b79ae68318 User factory can override slug 2019-03-26 13:52:56 +01:00
Robert Schäfer
fca2fcf713 Fix lint 2019-03-26 01:41:58 +01:00
Robert Schäfer
c9dfd0d294 Merge remote-tracking branch 'origin/master' into another-fix-of-activity-pub-implementation 2019-03-26 01:37:15 +01:00
Robert Schäfer
b1101bc03d
Merge pull request #239 from Human-Connection/238-default-feed-order 
Order all resources by createdAt descending (as default)
 2019-03-26 01:35:00 +01:00
Robert Schäfer
b78296a546 Fix cucumber features 2019-03-26 01:28:32 +01:00
Robert Schäfer
46c0d0659a Fix routing/proxying of AP, works locally 
RSA keys get seeded but not for tests
 2019-03-26 01:24:52 +01:00
Robert Schäfer
17fdbf4389 Send status 500 instead of not-responsiveness 2019-03-26 00:21:14 +01:00
Matt Rider
599f3814ba Create users with default socialMedia, append url 
- It was such that every time a user updates their social media it would replace the existing url with the one to be added.
creating a user with a default empty array means that we can concatenate the url to the array and not have a complicated cypher query
to account for an intial NULL value.

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-25 20:10:49 -03:00
Matt Rider
e409d6508f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-03-25 17:32:06 -03:00
Robert Schäfer
87ad26ce09 Add CLIENT_URI to the to-be-tested server 
Our ActivityPub service needs to know the public URI how 3rd party
servers can reach the server.

At the moment, we have this configuration:
https://nitro-staging.human-connection.org/activityPub (external)
=> http://nitro-backend.human-connection:4000 (internal)

So, when the backend generates links, they will have the external URI as
a prefix.

This commit might be a little dirty, because CLIENT_URI will be
different now for frontend and backend during testing. I hope this does
not add extra confusion. It seems that our cypress tests are not
affected by this change.
 2019-03-25 19:07:58 +01:00
Robert Schäfer
6d4ac65a92 Apparently this change got overlooked 2019-03-25 17:46:44 +01:00
Robert Schäfer
b32c85b2de Choose correct env var + proxy /activityPub 2019-03-25 15:52:34 +01:00
Robert Schäfer
ebb1c283b7 Refactor: Use URL.host instead of hostname 
This way, we don't have to manually add the port number.

cc @Mastercuber

Documentation: https://nodejs.org/api/url.html#url_urlobject_host
 2019-03-25 15:52:34 +01:00
Armin
a55b253784 Fix for previous commit 2019-03-25 15:37:05 +01:00
Armin
f2735e6275 Use host instead of hostname 2019-03-25 15:33:53 +01:00
Armin
b6b8f073b8 Second fix 2019-03-25 13:50:34 +01:00
Armin
5e4ff7cf9b Fix tests 2019-03-25 13:34:02 +01:00
Armin
1d5a8d3917 Should fix #234 + refactor domain to hostname 2019-03-25 13:15:37 +01:00
Robert Schäfer
dce9a3eea2 Better use defaultOrder only for posts 
E.g. comments should be ordered exactly the opposite way.
 2019-03-24 22:50:29 +01:00
Robert Schäfer
4d70ba68c5 Fix lint 2019-03-24 22:48:44 +01:00
Robert Schäfer
1cbab2a5c4 Implement #238 2019-03-24 19:58:17 +01:00
Robert Schäfer
b9a03b9b8e Expose #238 2019-03-24 16:58:54 +01:00
Robert Schäfer
47e67fe334
Merge pull request #194 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.0 
Bump @babel/core from 7.3.4 to 7.4.0 in /backend
 2019-03-22 20:41:50 +01:00
Matt Rider
aca3562e22 Migrate PRs from archived repos to monorepo 
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-22 14:44:43 -03:00
dependabot[bot]
e676a8fa1d
Bump @babel/core from 7.3.4 to 7.4.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.3.4 to 7.4.0.
- [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.3.4...v7.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 14:51:22 +00:00
dependabot[bot]
05c80f5991
Bump helmet from 3.15.1 to 3.16.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.15.1...v3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 11:28:48 +00:00