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

4395 Commits

Author SHA1 Message Date
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
Robert Schäfer
dfdced941c
Merge pull request #192 from Human-Connection/dependabot/npm_and_yarn/backend/supertest-4.0.2 
Bump supertest from 4.0.0 to 4.0.2 in /backend
 2019-03-22 12:26:14 +01:00
Robert Schäfer
84ca1e474d
Merge pull request #197 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.1 
Bump graphql-shield from 5.3.0 to 5.3.1 in /backend
 2019-03-22 12:23:53 +01:00
Robert Schäfer
a1848e8dda
Merge pull request #223 from Human-Connection/204-tests-for-rewarding-badges 
204 tests for rewarding badges
 2019-03-22 11:49:42 +01:00
Robert Schäfer
1d977cac1c
Merge pull request #227 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.2 
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /backend
 2019-03-22 10:52:21 +01:00
dependabot[bot]
fb5f31a1bb
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.4 to 7.4.2.
- [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.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 08:35:09 +00:00
dependabot[bot]
5ed38636b3
Bump eslint from 5.15.1 to 5.15.3 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 5.15.1 to 5.15.3.
- [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.1...v5.15.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 08:33:50 +00:00
Robert Schäfer
59c194ac7b
Merge pull request #224 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.14 
Bump apollo-link-http from 1.5.13 to 1.5.14 in /backend
 2019-03-22 09:32:44 +01:00
Robert Schäfer
39012e8c96
Merge pull request #225 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.4.1 
Bump eslint-plugin-jest from 22.3.2 to 22.4.1 in /backend
 2019-03-22 09:32:19 +01:00
dependabot[bot]
8a5b9b9b53
Bump @babel/register from 7.0.0 to 7.4.0 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.0.0 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.0.0...v7.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 04:25:03 +00:00
dependabot[bot]
4506b2858a
Bump eslint-plugin-jest from 22.3.2 to 22.4.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.3.2 to 22.4.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.3.2...v22.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 04:24:56 +00:00
dependabot[bot]
075757ecd6
Bump apollo-link-http from 1.5.13 to 1.5.14 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.13 to 1.5.14.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.13...apollo-link-http@1.5.14)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 04:24:29 +00:00
Robert Schäfer
9703e2d5e5 Import changes from @Tirokk 2019-03-21 23:53:29 +01:00
dependabot[bot]
f935ae17ff
Bump graphql-shield from 5.3.0 to 5.3.1 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.0...v5.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 21:18:30 +00:00
dependabot[bot]
cdc82d981e
Bump neo4j from 3.5.0 to 3.5.3 in /backend/neo4j 
Bumps neo4j from 3.5.0 to 3.5.3.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 21:18:27 +00:00
dependabot[bot]
232314ff65
Bump supertest from 4.0.0 to 4.0.2 in /backend 
Bumps [supertest](https://github.com/visionmedia/supertest) from 4.0.0 to 4.0.2.
- [Release notes](https://github.com/visionmedia/supertest/releases)
- [Commits](https://github.com/visionmedia/supertest/compare/v4.0.0...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 21:17:59 +00:00
Robert Schäfer
c6d9ea052f Rollout deployment 
* Replace BACKEND_URL with GRAPHQL_URI environment (DRY)
* Trigger rollout deployments by a simple label update
* DRY configmap and secret configuration
 2019-03-21 21:42:20 +01:00
Robert Schäfer
44d1265681 Restructure for monorepo 2019-03-21 02:11:35 +01:00
Robert Schäfer
7a72185c9e Merging backend to master 2019-03-20 21:00:59 +01:00