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
11,194 Commits 5 Branches 2 Tags
Commit Graph

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
9405aace6e
Merge pull request #332 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-5.16.0 
Bump eslint from 5.15.3 to 5.16.0 in /webapp
 2019-04-01 16:38:43 +02:00
Robert Schäfer
e43c42e8e7
Merge pull request #335 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-5.16.0 
Bump eslint from 5.15.3 to 5.16.0 in /backend
 2019-04-01 16:37:59 +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
dependabot[bot]
fcafdca306
Bump graphql from 14.2.0 to 14.2.1 in /webapp 
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:45:33 +00:00
dependabot[bot]
24eea67651
Bump eslint from 5.15.3 to 5.16.0 in /webapp 
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:45:06 +00:00
Matt Rider
94288ced54 Update currentUser after successful addSocialMedia mutation 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-03-28 15:54:45 -03: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
342ed3122a
Merge pull request #301 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.2.0 
Bump graphql from 14.1.1 to 14.2.0 in /webapp
 2019-03-27 23:18:54 +01:00
Robert Schäfer
fe6ad9c96e
Merge pull request #300 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.2.0 
Bump graphql from 14.1.1 to 14.2.0 in /backend
 2019-03-27 23:18:34 +01:00
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