ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,930 Commits 113 Branches 1,511 Tags
Commit Graph

5930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
e24d08f35b Follow Roberts sorting suggestion 2019-09-30 10:06:51 +02:00
Wolfgang Huß
dc0b8d69a2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1637-notifications-self-update 2019-09-30 09:56:25 +02:00
mattwr18
37f447b670
Merge pull request #1755 from Human-Connection/move_storybook_docs 
docs: moves storybook into webapp/README.md
 2019-09-29 23:01:02 +02:00
Robert Schäfer
a883eb3a1e
Merge pull request #1728 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2 in /backend
 2019-09-29 17:43:01 +02:00
roschaefer
0f7bfea1b0 docs: moves storybook into webapp/README.md 
It makes much more sense to put it under the webapp's README than backend.

FYI: @mattwr18
 2019-09-29 00:15:43 +02:00
Robert Schäfer
67dde07b67
Merge pull request #1712 from Human-Connection/1706_refactor-shout-spec 
[WIP]1706 refactor shout spec
 2019-09-29 00:03:03 +02:00
Robert Schäfer
3087231a5f
Merge pull request #1671 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.4 
Bump cypress-file-upload from 3.3.3 to 3.3.4
 2019-09-28 23:48:13 +02:00
dependabot-preview[bot]
2dd47dbdc2
Bump @babel/core from 7.6.0 to 7.6.2 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 21:47:59 +00:00
Robert Schäfer
1f9e61b6b3
Merge pull request #1673 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.4 
Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend
 2019-09-28 23:47:55 +02:00
Robert Schäfer
b923b485f1
Merge pull request #1700 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.5 
Bump metascraper-description from 5.7.4 to 5.7.5 in /backend
 2019-09-28 23:47:19 +02:00
Robert Schäfer
139bb9c11f
Merge pull request #1713 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.2 
Bump @babel/cli from 7.6.0 to 7.6.2 in /backend
 2019-09-28 23:46:03 +02:00
Robert Schäfer
f5a3a44305
Merge pull request #1717 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.4 
Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend
 2019-09-28 23:45:48 +02:00
Robert Schäfer
935bf13ac8
Merge pull request #1752 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.4.0 
Bump date-fns from 2.2.1 to 2.4.0 in /webapp
 2019-09-28 23:45:25 +02:00
dependabot-preview[bot]
acf3102a7c
Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.2 to 16.1.4.
- [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.2...v16.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:15:09 +00:00
dependabot-preview[bot]
fcc10d11ca
Bump metascraper-description from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [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.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:56 +00:00
dependabot-preview[bot]
f52980dade
Bump cypress-file-upload from 3.3.3 to 3.3.4 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.3...v3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:43 +00:00
dependabot-preview[bot]
cfcc17abb6
Bump @babel/cli from 7.6.0 to 7.6.2 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:43 +00:00
dependabot-preview[bot]
61f24dcfed
Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.3 to 2.9.4.
- [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.3...apollo-server-testing@2.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 14:14:41 +00:00
dependabot-preview[bot]
1e9bd2acc6
Bump date-fns from 2.2.1 to 2.4.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.2.1 to 2.4.0.
- [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.2.1...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 13:38:05 +00:00
Robert Schäfer
7ab411bed8
Merge pull request #1729 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.8 
Bump graphql from 14.5.7 to 14.5.8 in /webapp
 2019-09-28 15:35:14 +02:00
Robert Schäfer
520dfe8745
Merge pull request #1655 from Human-Connection/dependabot/npm_and_yarn/backend/mustache-3.1.0 
Bump mustache from 3.0.3 to 3.1.0 in /backend
 2019-09-28 15:34:40 +02:00
Robert Schäfer
bcb7865ba1
Merge pull request #1749 from Human-Connection/try-to-fix-vscode-format-works-against-eslint 
🍰 Try to fix VSCode format works against ESLint
 2019-09-28 15:34:00 +02:00
Robert Schäfer
f3ecb5c4fc
Merge pull request #1688 from Human-Connection/configure-docker-to-work-with-storybook 
Configure docker to work with storybook
 2019-09-28 15:30:57 +02:00
Robert Schäfer
91554b5d1f
Merge pull request #1750 from Human-Connection/neo4j-docker-config 
update neo4j docker-compose config
 2019-09-28 15:27:21 +02:00
Vasily Belolapotkov
8c01f1d332 update neo4j docker config 2019-09-28 12:14:04 +03:00
aonomike
c427cb2b97 refactor the naming of variables 2019-09-28 00:31:08 +03:00
Wolfgang Huß
44c70234fe Try to fix VSCode format works against ESLint 2019-09-27 17:16:10 +02:00
Wolfgang Huß
5cdd358731 Implement click update again, because of mobile has no hover 
But I prevent multiple triggered updates for 10 seconds.
 2019-09-27 16:53:48 +02:00
Wolfgang Huß
cee0a27b14 Try to fix intermitent failing Cypress test for notification 2019-09-27 16:11:25 +02:00
Wolfgang Huß
1543aa4510 Refactored error reporting 2019-09-27 16:11:25 +02:00
Wolfgang Huß
1f8cc9ef15 Sorted notifications after concatenation by Roberts suggestion 2019-09-27 16:11:25 +02:00
Wolfgang Huß
a57d228c40 Remove update on click 2019-09-27 16:11:25 +02:00
Wolfgang Huß
01cf5d3e9d Add logic for hover and little delay for open menu if not updated 2019-09-27 16:11:25 +02:00
Wolfgang Huß
0c25b013db Followed in big parts Roberts suggestions 2019-09-27 16:11:25 +02:00
Wolfgang Huß
a667d5cd85 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Changed to `NOTIFICATIONS_POLL_INTERVAL`

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
mattwr18
99dafcda64 Reduce complexity of notifications watcher 
- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
7727707d49 Followed some of Roberts suggestions and a bit more 2019-09-27 16:11:25 +02:00
Wolfgang Huß
87abcf8237 Implement this.$apollo.queries.notifications.refetch() 2019-09-27 16:11:25 +02:00
Wolfgang Huß
f4c8dec6d5 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
9d884d6fdc Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
21cd33bcf7 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
72011fbe27 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
597ec9d109 Update webapp/components/notifications/NotificationMenu/NotificationMenu.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
d1444619ab Give the test more sence 2019-09-27 16:11:25 +02:00
Wolfgang Huß
da5c63e97d Rewrite the toggleMenu call 2019-09-27 16:11:25 +02:00
Wolfgang Huß
5b6f816ae1 Update notifications menu on click 2019-09-27 16:11:25 +02:00
Wolfgang Huß
92fcaea452 Distinguish between totalNotifications and unreadNotifications 2019-09-27 16:11:25 +02:00
Wolfgang Huß
e3d6509010 Update webapp/constants/notifications.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
fb41d0064d Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
433a555fd4 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:24 +02:00