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

1586 Commits

Author SHA1 Message Date
mattwr18
3b5e39c54d Update orderBy, remove >=, more realistic seed data 2019-10-04 11:42:55 +02:00
Wolfgang Huß
e7fbd169d9 Get backend test to work with new properties 2019-10-04 10:23:31 +02:00
Wolfgang Huß
5458d6640e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-04 09:08:15 +02:00
Robert Schäfer
ff9a8cace3
Merge pull request #1798 from Human-Connection/remove-toggle-from-email 
Remove language toggle from email template
 2019-10-04 01:54:00 +02:00
Robert Schäfer
bf1af5039f
Merge pull request #1801 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.3 
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /backend
 2019-10-04 01:47:02 +02:00
roschaefer
78bf076498 test: add tests for #1809 2019-10-04 01:39:18 +02:00
Robert Schäfer
48fdf956c7
Merge pull request #1806 from Human-Connection/1633-admin-stats 
fix invites count calculation for admin dashboard
 2019-10-03 23:51:17 +02:00
dependabot-preview[bot]
c1effbe46c
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 21:32:39 +00:00
Ivy
57c3d949cf fixes#1305 lastActiveAt 2019-10-03 13:08:06 -07:00
mattwr18
976288d625 Fix lint 2019-10-03 16:39:32 +02:00
mattwr18
a6d86f78f4 Fix lint 2019-10-03 12:04:07 +02:00
Vasily Belolapotkov
af803ce0e6 fix invites count calculation for admin dashboard 2019-10-03 12:54:04 +03:00
mattwr18
6f1c5e3efa Set hasMore to false when returned Posts are equal to pageSize 
- this was causing bugs on User profile page, and saves a database call
 2019-10-03 11:04:23 +02:00
dependabot-preview[bot]
a6309aeb70
build(deps): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.4 to 16.1.5.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.4...v16.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 05:21:23 +00:00
Alina Beck
ad7f5e34f7 remove language toggle from email template 2019-10-02 23:12:34 +02:00
Robert Schäfer
cfdf9dad2c
Merge pull request #1711 from Human-Connection/407-change_your_email_address 
407 change your email address
 2019-10-02 17:43:19 +02:00
Wolfgang Huß
6ad9dc27e9 Write and refactor backend test which are supposed to fail at first 
Implemented the new properties in the GraphQL schema.
 2019-10-02 17:25:36 +02:00
Robert Schäfer
c1235003c5
Merge pull request #1794 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.2 
build(deps): bump cross-env from 6.0.0 to 6.0.2 in /backend
 2019-10-02 15:51:36 +02:00
Robert Schäfer
9a08de347c
Merge pull request #1788 from Human-Connection/1663-moderators-admins-always-see-posts 
Update Post query for blockedByUsers
 2019-10-02 15:50:55 +02:00
dependabot-preview[bot]
54061ccf88
build(deps): bump cross-env from 6.0.0 to 6.0.2 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.0 to 6.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.0...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-02 07:26:41 +00:00
mattwr18
f0d096fcab Prefer guard clause to avoid database call 
- follow @roschaefer's PR review
 2019-10-02 09:20:13 +02:00
dependabot-preview[bot]
8e8fff21b7
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-02 05:40:33 +00:00
roschaefer
1e31a0c620 fix: remove previous email address on change 
This will allow you to change back to your previous email address: The
backend won't complain because of a user who owns that email address
already.
 2019-10-02 01:55:14 +02:00
roschaefer
e6f8bbac9b fix: remove copy+paste oversights 
In the registration resolvers, it makes sense to immediately resolve if
an email address has been found (because you can re-send the
registration email).

In this case, we use the helper method only to trigger the `UserInputError`.
 2019-10-02 01:54:28 +02:00
roschaefer
6ffafff288 fix: ensure no other user owns a new email address 
`BELONGS_TO` means a user owns an email address. `PRIMARY_EMAIL` means a
user authenticates with that email.

So right now, you get a proper error message if you try to change your
email back to your old email address (because you own it already).

I will make sure to delete the old email so this will be no problem
anymore. But maybe in the future we might have multiple email addresses
per user and then it makes a big difference to use `PRIMARY_EMAIL` or
`BELONGS_TO`.
 2019-10-02 01:31:23 +02:00
roschaefer
6a7970200f refactor: EmailAddr.Request -> UnverifiedEmailAddr. 2019-10-02 01:21:56 +02:00
roschaefer
5848e6af18 Fix a TODO by @alina-beck 2019-10-02 00:54:01 +02:00
roschaefer
e116d52992 Use EmailAddressRequest and validate email 2019-10-02 00:54:01 +02:00
Alina Beck
707cf741de write text for verification email 2019-10-02 00:54:01 +02:00
roschaefer
2b490e00d7 wrap email templates in standard layout to minimize duplicate code 2019-10-02 00:54:01 +02:00
roschaefer
e51124f316 Resolvers for EmailAddress implemented 2019-10-02 00:54:01 +02:00
roschaefer
8c13234af9 Handle edge case 
It might be that people try to register email addresses that they don't own. Then if the actual owner tries to add this email address, she should not get a unique constraint violation. Instead the email will be re-used.

Is this a security issue? Because we re-use the nonce? 🤔
 2019-10-02 00:54:01 +02:00
roschaefer
73d5abd724 Implement AddEmail resolver 2019-10-02 00:54:01 +02:00
roschaefer
3b6cd55c0f Implement unauthenticated part 2019-10-02 00:54:01 +02:00
roschaefer
8a05de5b2d Sketch backend test to change Email Address 2019-10-02 00:54:01 +02:00
dependabot-preview[bot]
c3e7b3938a
Bump metascraper-audio from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-01 21:10:18 +00:00
Robert Schäfer
7ecb9d8bed
Merge pull request #1778 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.7.6 
Bump metascraper-publisher from 5.7.4 to 5.7.6 in /backend
 2019-10-01 23:07:09 +02:00
mattwr18
478f6fef1c Fix query builder/test 2019-10-01 20:57:45 +02:00
dependabot-preview[bot]
30ea40a8a9
Bump metascraper-publisher from 5.7.4 to 5.7.6 in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-01 15:52:40 +00:00
Robert Schäfer
da9ddf1040
Merge pull request #1780 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.5.1 
Bump eslint from 6.4.0 to 6.5.1 in /backend
 2019-10-01 17:51:28 +02:00
Robert Schäfer
809bb7cc30
Merge pull request #1782 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.7.6 
Bump metascraper-url from 5.7.5 to 5.7.6 in /backend
 2019-10-01 17:51:09 +02:00
Robert Schäfer
540d41cd75
Merge pull request #1783 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.7.6 
Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend
 2019-10-01 17:50:52 +02:00
mattwr18
8aa7f376b6 Update Post query for blockedByUsers 
- Admin/Moderators see Posts even if they are blocked
 2019-10-01 17:45:09 +02:00
mattwr18
13ba93eecd
Merge pull request #1781 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-4.0.1 
Bump graphql-middleware from 3.0.5 to 4.0.1 in /backend
 2019-10-01 10:32:04 +02:00
dependabot-preview[bot]
6c6fdcc951
Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-01 08:27:41 +00:00
dependabot-preview[bot]
345bec59be
Bump metascraper-url from 5.7.5 to 5.7.6 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.5...v5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-01 08:27:27 +00:00
mattwr18
96ac4ba4d3
Merge pull request #1777 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.7.6 
Bump metascraper-youtube from 5.7.5 to 5.7.6 in /backend
 2019-10-01 10:26:33 +02:00
mattwr18
857c2228ec
Merge pull request #1776 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.2 
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /backend
 2019-10-01 10:26:19 +02:00
mattwr18
0dd66b9675
Merge pull request #1775 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.7.6 
Bump metascraper-soundcloud from 5.7.4 to 5.7.6 in /backend
 2019-10-01 10:25:37 +02:00
dependabot-preview[bot]
8829b37df8
Bump eslint from 6.4.0 to 6.5.1 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.4.0 to 6.5.1.
- [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/v6.4.0...v6.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-01 08:24:47 +00:00