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

1453 Commits

Author SHA1 Message Date
mattwr18
e553d397a1
Merge pull request #1837 from Human-Connection/dependabot/docker/backend/node-12.11.1-alpine 
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend
 2019-10-09 17:14:14 +02:00
mattwr18
f6264b3ad8
Merge pull request #1847 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.3 
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:42:24 +02:00
mattwr18
dcaa5d5ebf
Merge pull request #1846 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.6.3 
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend
 2019-10-09 15:41:35 +02:00
dependabot-preview[bot]
37bf09dc6e
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend 
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:33:36 +00:00
dependabot-preview[bot]
4cd054834c
build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:31:51 +00:00
dependabot-preview[bot]
297df951d3
build(deps-dev): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 08:31:11 +00:00
mattwr18
4eb312b1ab
Merge pull request #1843 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.6.3 
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend
 2019-10-09 10:29:59 +02:00
dependabot-preview[bot]
ef1b401d07
build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [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.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-09 04:52:42 +00:00
dependabot-preview[bot]
37dff79494
build(deps-dev): bump cucumber from 6.0.1 to 6.0.2 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:01:55 +00:00
Alina Beck
49dfc8ac9d
Merge pull request #1829 from Human-Connection/fix-typo-in-email 
Fix typo in email template
 2019-10-07 15:35:00 +02:00
Robert Schäfer
a5869ffb2e
Merge pull request #1823 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.5 
build(deps-dev): bump apollo-server-testing from 2.9.4 to 2.9.5 in /backend
 2019-10-07 12:48:58 +02:00
Robert Schäfer
0ddb9ba1c5
Merge pull request #1827 from Human-Connection/dependabot/npm_and_yarn/backend/cucumber-6.0.1 
build(deps-dev): bump cucumber from 5.1.0 to 6.0.1 in /backend
 2019-10-07 12:48:38 +02:00
mattwr18
1bf87f937e
Merge pull request #1826 from Human-Connection/dependabot/docker/backend/node-12.11.0-alpine 
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend
 2019-10-07 12:45:40 +02:00
mattwr18
23841b95bb
Merge pull request #1808 from Human-Connection/1704_display-user-email-to-moderators 
Display user email for administrators
 2019-10-07 12:33:33 +02:00
Alina Beck
b0151e4b2e fix typo in email template 2019-10-07 12:09:46 +02:00
dependabot-preview[bot]
74322fc376
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [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.9.4...apollo-server-testing@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 08:57:08 +00:00
Robert Schäfer
f8b06d6727
Merge pull request #1825 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.5 
build(deps): bump apollo-server from 2.9.4 to 2.9.5 in /backend
 2019-10-07 10:53:47 +02:00
dependabot-preview[bot]
73e278f897
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend 
Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 07:27:10 +00:00
dependabot-preview[bot]
3644400174
build(deps-dev): bump cucumber from 5.1.0 to 6.0.1 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 5.1.0 to 6.0.1.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v5.1.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 07:20:51 +00:00
mattwr18
3f778f32a0
Merge pull request #1818 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.4.0 
build(deps-dev): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /backend
 2019-10-07 09:19:55 +02:00
dependabot-preview[bot]
e934148f7d
build(deps): bump apollo-server from 2.9.4 to 2.9.5 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [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.9.4...apollo-server@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:30:25 +00:00
dependabot-preview[bot]
88aa08ef0a
build(deps-dev): bump eslint-config-prettier in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.3.0 to 6.4.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/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:28:30 +00:00
dependabot-preview[bot]
7cea3e2382
build(deps): bump @hapi/joi from 16.1.5 to 16.1.7 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.5 to 16.1.7.
- [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.5...v16.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:27:46 +00:00
aonomike
f8cf975d6c Test that admin can access the email of a user 
- Refactor all tests on permissionsMiddleware
 2019-10-05 17:18:11 +03:00
aonomike
14c44877b7 Refactor the unauthenticated path test 2019-10-05 16:06:19 +03:00
aonomike
45a6016427 Allow admin to receive user email back 2019-10-05 16:00:29 +03:00
Robert Schäfer
9318c28b72
Merge pull request #1809 from Human-Connection/1305-update-lastActiveAt 
fixes#1305 lastActiveAt
 2019-10-04 13:49:14 +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
Vasily Belolapotkov
af803ce0e6 fix invites count calculation for admin dashboard 2019-10-03 12:54:04 +03: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
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