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

4279 Commits

Author SHA1 Message Date
Ulf Gebhardt
7613ddfc04
lint fixes 2019-06-19 13:36:14 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00
Ulf Gebhardt
65471efb0d
removed fixImageUrls reference 2019-06-19 13:08:51 +02:00
dependabot-preview[bot]
2e66c671c2
Bump apollo-client from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-19 04:20:14 +00:00
Robert Schäfer
29b910cfb7 Really basic passwordReset flow works 2019-06-18 23:28:06 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00
Ulf Gebhardt
8984df9371
lint fixes 2019-06-18 17:43:00 +02:00
dependabot-preview[bot]
994eecd2c2
Bump babel-eslint from 10.0.1 to 10.0.2 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 05:04:09 +00:00
Matt Rider
a750e66063 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 2019-06-17 18:17:30 -03:00
mattwr18
95fc61697a
Merge pull request #842 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-5.0.0 
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend
 2019-06-17 18:15:13 -03:00
mattwr18
115d230181
Merge pull request #841 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.18 
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend
 2019-06-17 18:14:52 -03:00
Ulf Gebhardt
98dbf801ab
Merge branch 'master' into 2019/kw24/fix_imported_img_urls 
# Conflicts:
#	backend/src/middleware/fixImageUrlsMiddleware.js
#	backend/src/middleware/fixImageUrlsMiddleware.spec.js
 2019-06-17 13:24:29 +02:00
Robert Schäfer
5a806ca99e Remove duplicate test case 2019-06-17 12:24:14 +02:00
dependabot-preview[bot]
7458fd62e2
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.14 to 1.5.15.
- [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.14...apollo-link-http@1.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:59:16 +00:00
dependabot-preview[bot]
4566980eaa
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.3.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:59 +00:00
dependabot-preview[bot]
8ff98cbc25
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.17 to 1.0.18.
- [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-context@1.0.17...apollo-link-context@1.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:20 +00:00
dependabot-preview[bot]
dc420d4116
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.33 to 2.0.0-alpha.34.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.33...v2.0.0-alpha.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:57:46 +00:00
Robert Schäfer
c9ea956f85 Test+Implement resetPassword 2019-06-16 23:32:16 +02:00
Robert Schäfer
145a8d8bf6 Check invalid email 
Sending a mail with further instructions even if the email is invalid
seems to be a good practice: A potential attacker will not now if a user
has an account under that email address. If a user does not remember the
email address, but has control over the other mail account, she will get
feedback that this mail account is incorrect.
 2019-06-15 23:01:34 +02:00
Robert Schäfer
c7ee0c8121 Implement tests for requestPasswordReset 2019-06-15 16:22:28 +02:00
Robert Schäfer
e44ed7d281 Start writing a resolver for requestPasswordReset 2019-06-15 15:42:17 +02:00
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Ulf Gebhardt
794bb08f14
removed reference for fixImageUrls middleware 2019-06-14 14:04:15 +02:00
Ulf Gebhardt
89d630b1eb
removed fixImageUrlsMiddleware 2019-06-14 14:03:37 +02:00
Robert Schäfer
aee0403cc7
Merge pull request #823 from Human-Connection/343_whitelist_all_queries_and_mutations 
Whitelist queries/mutations, fix tests
 2019-06-14 13:22:00 +02:00
Robert Schäfer
0fc7061333 Disable broken cucumber tests for now 
@Mastercuber the justification for simply disabling the tests is that
the entire implemntation for the follow activities is wrong. It's still
using the `AddUserFollowedBy` auto-generated mutation. The mutation that
is actually used when you do a follow or unfollow are called `follow`
and `unfollow` - these are custom mutations implemented by ourselves.

So the proper fix for these tests would be to refactor the entire
ActivityPub implementation. Since there is a pending PR already I
decided not to go down the rabbit hole and simply tag the failing
sceario as "work-in-progress" (@wip).
 2019-06-14 11:33:32 +02:00
Robert Schäfer
eb4b05e431 Add relevant permissions to let cypress tests pass 2019-06-14 10:14:48 +02:00
dependabot-preview[bot]
2bab4d5563
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.33 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.33.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.31...v2.0.0-alpha.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 08:04:36 +00:00
Robert Schäfer
354d8787b0 Merge remote-tracking branch 'origin/master' into 343_whitelist_all_queries_and_mutations 2019-06-14 09:45:54 +02:00
mattwr18
920234ec2a
Merge pull request #819 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.3 
Bump apollo-server-testing from 2.6.2 to 2.6.3 in /backend
 2019-06-13 21:18:27 -03:00
mattwr18
3f87b42987
Merge pull request #818 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.3 
Bump apollo-server from 2.6.2 to 2.6.3 in /backend
 2019-06-13 21:17:58 -03:00
Robert Schäfer
fc4e9f40b3 Whitelist queries/mutations, fix backend tests 2019-06-13 23:29:29 +02:00
Matt Rider
8a214a4007 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-13 17:30:24 -03:00
ALau2088
3cc05c0916 add backend managecomments tests 2019-06-13 13:00:20 -07:00
Matt Rider
589fb16c51 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-13 14:59:23 -03:00
ALau2088
d91221fe7e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-13 10:22:25 -07:00
dependabot-preview[bot]
bbe6d63512
Bump apollo-server-testing from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.2...apollo-server-testing@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:29 +00:00
dependabot-preview[bot]
f77aa4ec4e
Bump apollo-server from 2.6.2 to 2.6.3 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.2...apollo-server@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:04:05 +00:00
dependabot-preview[bot]
6507b97fdf
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 05:03:26 +00:00
mattwr18
d0fd4de079
Merge pull request #809 from Human-Connection/800_fix_broken_image_urls 
Fix #800
 2019-06-12 19:53:18 -03:00
Robert Schäfer
113cf04c60 Fix build 2019-06-13 00:26:20 +02:00
Robert Schäfer
1ffa3cd046 Fix #799 
For target `production` the badges were simply not copied. It also
explains why we never saw that error in development. For development we
use docker build target `build-and-test`.

FYI: @ulfgebhardt @Tirokk @ogerly
 2019-06-12 23:55:42 +02:00
Robert Schäfer
4166936e5f Fix #800 
Ok, so apparently all we have to do is to remove the `/api` prefix from
fixImageUrlMiddleware. I guess that's just a leftover.
 2019-06-12 23:27:43 +02:00
Matt Rider
6e6407b265 Upgrade apollo-cache-inmemory 2019-06-12 17:06:37 -03:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Matt Rider
d15857d240 Set user's posts/comments' delete attribute to true 
- favor over actually deleting the node so that the comments will appear as anonymous and not lose the context of the conversation
- the post will not appear, but for admin it will be accessible
- follow @roschaefer `PR` review
 2019-06-12 15:27:57 -03:00
Robert Schäfer
45fc604c25
Merge pull request #797 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.8 
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend
 2019-06-12 10:27:45 +02:00