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
1762894dbb
Merge pull request #3209 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.8.7 
build(deps-dev): bump @babel/preset-env from 7.8.6 to 7.8.7
 2020-03-05 12:35:42 +01:00
Robert Schäfer
47fb70bb4d
Merge pull request #3207 from Human-Connection/improve_performance_of_current_user_query 
perf(neo4j): Improve currentUser read performance
 2020-03-05 12:33:06 +01:00
Raphael Beer
f3d2d35b26
Change: only attempt to style .main-navigation, if it exists 2020-03-05 12:03:11 +01:00
Raphael Beer
f3a7c10e8a
Fix: content shift when y-scrollbar disappears 2020-03-05 12:03:11 +01:00
Raphael Beer
8ffda5e908
Fix: linting, integration tests 2020-03-05 12:02:12 +01:00
Raphael Beer
d5cbfb142f
Change: remove counter from link to /notifications 2020-03-05 12:02:11 +01:00
Raphael Beer
be6c737452
Change: render link to /notifications when no new notifications 2020-03-05 12:02:08 +01:00
ogerly
26a547cdaf test: add propsData 2020-03-05 09:21:35 +01:00
ogerly
ee06039982 test: Added Spec for DeleteUserModal 2020-03-05 09:12:46 +01:00
ogerly
fd12d5c6ee merge: backend/yarn.lock 2020-03-05 08:31:26 +01:00
ogerly
127ddcc77a deleteUserModal style changed, deleteData is no longer included 2020-03-05 08:20:37 +01:00
dependabot-preview[bot]
66002f821a
build(deps-dev): bump @babel/core from 7.8.6 to 7.8.7 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.8.7.
- [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.8.6...v7.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 04:22:35 +00:00
dependabot-preview[bot]
df46675840
build(deps-dev): bump @babel/node from 7.8.4 to 7.8.7 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.8.4 to 7.8.7.
- [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.8.4...v7.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 04:18:17 +00:00
dependabot-preview[bot]
e833886ec1
build(deps-dev): bump @babel/preset-env from 7.8.6 to 7.8.7 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.6 to 7.8.7.
- [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.8.6...v7.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 04:16:45 +00:00
ogerly
9ab2d8395f feat: DeleteUser for Admin added in the profile dropdown menu, deleted from the Admin user overview 2020-03-04 16:23:00 +01:00
roschaefer
628ec2a188 Follow @mogge's PR review 2020-03-04 15:17:31 +01:00
Robert Schäfer
0185951834
Merge pull request #3205 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.11.0 
build(deps-dev): bump apollo-server-testing from 2.10.1 to 2.11.0 in /backend
 2020-03-04 15:04:20 +01:00
Robert Schäfer
7e7e452569
Merge pull request #3201 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.11.0 
build(deps): bump apollo-server from 2.10.1 to 2.11.0 in /backend
 2020-03-04 15:04:11 +01:00
Robert Schäfer
adf2be5c80
Merge pull request #3206 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-7.0.1 
build(deps): bump cross-env from 7.0.0 to 7.0.1 in /webapp
 2020-03-04 15:04:02 +01:00
roschaefer
7d9cbb3ce9 perf(neo4j): Improve currentUser read performance 2020-03-04 13:32:30 +01:00
dependabot-preview[bot]
44a7282336
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.10.1 to 2.11.0.
- [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.10.1...apollo-server-testing@2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 11:57:08 +00:00
dependabot-preview[bot]
636b3eade8
build(deps): bump apollo-server from 2.10.1 to 2.11.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.10.1 to 2.11.0.
- [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.10.1...apollo-server@2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 11:56:58 +00:00
dependabot-preview[bot]
d1f9b7c432
build(deps): bump cross-env from 7.0.0 to 7.0.1 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.0 to 7.0.1.
- [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/v7.0.0...v7.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 11:56:56 +00:00
Robert Schäfer
7e701f530a
Merge pull request #3202 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.11.0 
build(deps): bump apollo-server-express from 2.10.1 to 2.11.0 in /backend
 2020-03-04 12:54:55 +01:00
Robert Schäfer
fd32a3afb3
Merge pull request #3203 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-redis-subscriptions-2.2.1 
build(deps): bump graphql-redis-subscriptions from 2.1.2 to 2.2.1 in /backend
 2020-03-04 12:54:30 +01:00
Robert Schäfer
abc19ba500
Merge pull request #3204 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-7.0.1 
build(deps): bump cross-env from 7.0.0 to 7.0.1 in /backend
 2020-03-04 12:54:04 +01:00
dependabot-preview[bot]
c936386afd
build(deps): bump cross-env from 7.0.0 to 7.0.1 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.0 to 7.0.1.
- [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/v7.0.0...v7.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 04:19:07 +00:00
dependabot-preview[bot]
8033eedeec
build(deps): bump graphql-redis-subscriptions in /backend 
Bumps [graphql-redis-subscriptions](https://github.com/davidyaha/graphql-redis-subscriptions) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/davidyaha/graphql-redis-subscriptions/releases)
- [Commits](https://github.com/davidyaha/graphql-redis-subscriptions/compare/v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 04:18:38 +00:00
dependabot-preview[bot]
3b35487f06
build(deps): bump apollo-server-express in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.10.1 to 2.11.0.
- [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-express@2.10.1...apollo-server-express@2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 04:18:20 +00:00
Robert Schäfer
09d0953bb4
Merge pull request #3175 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.8.6 
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6
 2020-03-03 12:41:02 +01:00
Mogge
7136c9aadd
Merge pull request #3198 from Human-Connection/lokalise-2020-03-03_00-01-09 
feat: Russian Translations Update By Ewald Arnold
 2020-03-03 01:09:28 +01:00
lokalise-bot
2eb4f088e9 Lokalise: update of webapp/locales/ru.json 2020-03-03 00:01:11 +01:00
Mogge
924071ed1f
Merge pull request #3111 from Human-Connection/lokalise-2020-02-19_20-53-55 
feat: Translations update
 2020-03-02 23:57:19 +01:00
Mogge
f17cf9db14
Merge branch 'master' into lokalise-2020-02-19_20-53-55 2020-03-02 23:14:57 +01:00
dependabot-preview[bot]
af64d1b2ec
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 16:19:58 +00:00
Robert Schäfer
44e3619534
Merge pull request #3172 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.8.6 
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /backend
 2020-03-02 17:18:21 +01:00
Robert Schäfer
b8153773d2
Merge pull request #3173 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.8.6 
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6
 2020-03-02 17:18:01 +01:00
mattwr18
0cdae364b8
Merge pull request #3197 from Human-Connection/update-user-at-password-reset 
fix: Update user.updatedAt when password is reset
 2020-03-02 16:18:25 +01:00
Robert Schäfer
2c69998321
Merge pull request #3174 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.8.6 
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 in /backend
 2020-03-02 15:38:25 +01:00
dependabot-preview[bot]
1c0a58f5df
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 14:38:17 +00:00
dependabot-preview[bot]
f39885c927
build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 14:37:55 +00:00
Robert Schäfer
66dd730f55
Merge pull request #3183 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.8.6 
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /webapp
 2020-03-02 15:35:51 +01:00
mattwr18
1b7ff116d1 Update user.updatedAt when password is reset 
- this is updating the user node, so it should update the updatedAt.
we recently ran into an issue where we weren't sure if a user had
successfully changed their password with the passwordReset, and needed
to look into it further to see if the PasswordReset had been used or not
to tell if it was successful.
 2020-03-02 15:22:57 +01:00
dependabot-preview[bot]
c698cf8df9
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.11.4 to 5.11.5.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 10:53:31 +00:00
Robert Schäfer
514dd59775
Merge pull request #3191 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.8.1 
build(deps-dev): bump eslint-plugin-jest from 23.8.0 to 23.8.1 in /backend
 2020-03-02 11:05:22 +01:00
dependabot-preview[bot]
9b8107c1fa
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.4 to 7.8.6.
- [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.8.4...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 09:47:31 +00:00
dependabot-preview[bot]
76591fd049
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.3 to 7.8.6.
- [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.8.3...v7.8.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 09:47:28 +00:00
Robert Schäfer
4eee4706b2
Merge pull request #3176 from Human-Connection/dependabot/npm_and_yarn/backend/wait-on-4.0.1 
build(deps): bump wait-on from 4.0.0 to 4.0.1 in /backend
 2020-03-02 10:46:04 +01:00
Robert Schäfer
30ba67fcd5
Merge pull request #3179 from Human-Connection/dependabot/npm_and_yarn/babel/register-7.8.6 
build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6
 2020-03-02 10:45:48 +01:00
Robert Schäfer
9e09e36421
Merge pull request #3181 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.8.6 
build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /backend
 2020-03-02 10:45:18 +01:00