IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,916 Commits 5 Branches 2 Tags
Commit Graph

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
209b63715f Show social media links as list 2019-03-27 14:28:20 +01:00
Robert Schäfer
9de652c631 Fix render error bug 
🙌 @mattwr18
 2019-03-27 14:17:47 +01:00
Robert Schäfer
8fb9ebd2b5 Expose bug: Server-side render error 2019-03-27 14:07:24 +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]
d49b01319d
Bump graphql from 14.1.1 to 14.2.0 in /webapp 
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:54:27 +00: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
Robert Schäfer
9f174d8489
Merge pull request #320 from Human-Connection/travis_ci_less_log_output 
Reduce Travis CI build log
 2019-03-27 12:50:58 +01: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
1daaf28a5e Remove --verbose on Travis CI 2019-03-27 11:51:22 +01:00
Robert Schäfer
82bb4c4d7d Fix lint 2019-03-27 11:26:07 +01:00
Robert Schäfer
5ec77f3cc1 Put PRIVATE_KEY_PASSPHRASE in kubernetes config 2019-03-27 01:19:04 +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
30fc07e16e
Merge pull request #248 from Human-Connection/240-persistent-links 
240 persistent links
 2019-03-27 00:42:40 +01:00
Robert Schäfer
76dfd08c82 Follow @mattwr18's review 
https://github.com/Human-Connection/Human-Connection/pull/248#pullrequestreview-219203465
 2019-03-27 00:18:26 +01:00
Robert Schäfer
88ac0601f7 DRY: persistentLink implementation 2019-03-26 23:52:01 +01:00
Matt Rider
597d1a0cb0 Pull in icons from currentUser 
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-26 17:43:23 -03:00
Robert Schäfer
5d440d2e5b Fix wrong implementation of cucumber test 2019-03-26 20:49:04 +01:00
Robert Schäfer
d9d7c38800 Add missing id to graphqQl query 2019-03-26 20:19:25 +01:00
Robert Schäfer
40224ab18d Fix bug if id is undefined on post route 
@itbsStefan this is the fix for the bug during our pair-programming. The
request to the server was returning *all* posts if `id` was undefined
and the post for redirecting was the most recently created.
 2019-03-26 20:03:11 +01:00
Robert Schäfer
9545e20a22 Fix Search.feature 2019-03-26 17:28:15 +01:00
Robert Schäfer
6ee9b9d830 Fix WritePost.feature 2019-03-26 17:13:41 +01:00
Robert Schäfer
63d928e12e Change route post-slug to post-id-slug 
And query `slug` and `id` everywhere
 2019-03-26 16:21:39 +01:00
Robert Schäfer
bbdec39017 Implement redirect on posts 2019-03-26 16:09:26 +01:00
Robert Schäfer
203f2091de Implement id takes precedence over slug 2019-03-26 14:28:55 +01:00
Robert Schäfer
b79ae68318 User factory can override slug 2019-03-26 13:52:56 +01:00
Robert Schäfer
51cbc65f4b Rename profile-id to profile-id-slug route 2019-03-26 13:52:56 +01:00
Robert Schäfer
16e60e540f Fix typo 
Cypress tests currently fail because we cannot override `slug` in
factories.
 2019-03-26 13:52:56 +01:00
Robert Schäfer
327bd037a0 Implement redirect for user profile 2019-03-26 13:52:56 +01:00
Robert Schäfer
51ca20335a Sketch 🥒 for #240 2019-03-26 13:52:56 +01:00
Martin Döring
79386c6f66
Filename changed to specification.md 2019-03-26 11:26:37 +01:00
Martin Döring
b9afe8df79
Name of Concept changed to "Network Specification" 2019-03-26 11:25:41 +01:00
Martin Döring
1760b70a96
Name Changed to "Network Specification" 2019-03-26 11:22:47 +01:00
Robert Schäfer
58938dc2d8
Merge pull request #249 from Human-Connection/another-fix-of-activity-pub-implementation 
Another fix of activity pub implementation
 2019-03-26 09:17:35 +01:00
Martin Döring
ca96a07ded
Added network concept to the sidebar 2019-03-26 08:25:24 +01:00
Martin Döring
db93e68806
Merge pull request #30 from Human-Connection/network-concept 
Network Concept added
 2019-03-26 08:18:22 +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
7da9baf748 Update socialMediaIconUrl, display linked icons 
- After successfully adding a socialMedia, update the sociaMeidaIconUrl, and iterate over them to display their icons, which link to the user's profile.

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-25 20:18:49 -03: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
Robert Schäfer
f73198f9f2 Try/error: Add headers back 
`git diff b32c85b2de014770d07df8a642616b016cf69b50..46aecd612018db490fb3d6f91572be848371b32e -- webapp/nuxt.config.js`
showed me that I removed headers because I didn't thought they are
relevant. Now the proxy route `/activityPub` is not reachable anymore.
 2019-03-25 23:53:26 +01: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
46aecd6120
Merge pull request #246 from Human-Connection/234-fix-again 
Apparently this change got overlooked
 2019-03-25 20:59:43 +01: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
5aa2bcf28e
Merge pull request #245 from Human-Connection/fix_rollout_deployment 
Trigger rollout with a change to spec.template
 2019-03-25 19:00:25 +01:00
Robert Schäfer
6d4ac65a92 Apparently this change got overlooked 2019-03-25 17:46:44 +01:00