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

1692 Commits

Author SHA1 Message Date
dependabot-preview[bot]
6f32da4de5
Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 22:30:36 +00:00
Robert Schäfer
10c50a912f
Merge pull request #1765 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.0 
Bump tiptap from 1.25.0 to 1.26.0 in /webapp
 2019-10-01 00:27:44 +02:00
Robert Schäfer
e6d6ce0fcd
Merge pull request #1768 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.4.1 
Bump date-fns from 2.4.0 to 2.4.1 in /webapp
 2019-10-01 00:27:12 +02:00
Robert Schäfer
1fed79a674
Merge pull request #1658 from Human-Connection/1637-notifications-self-update 
🍰 Notifications self update and refactoring
 2019-09-30 17:52:41 +02:00
dependabot-preview[bot]
f6091aefb8
Bump date-fns from 2.4.0 to 2.4.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.0 to 2.4.1.
- [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.4.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:49:00 +00:00
dependabot-preview[bot]
3877d559e0
Bump tiptap from 1.25.0 to 1.26.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.25.0...tiptap@1.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:48:42 +00:00
roschaefer
0e2a0af7bf feat: no primary button for unread notifications 
@Tirokk if find this better, because a primary button always wants to be
clicked.
 2019-09-30 17:24:57 +02:00
Wolfgang Huß
9a4187a6af Remove update on hover and click by Roberts suggestion 2019-09-30 10:15:56 +02:00
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
dependabot-preview[bot]
ba22b7cca6
Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.27.0 to 1.28.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.27.0...tiptap-extensions@1.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:31:25 +00: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
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
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ß
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
Wolfgang Huß
ca8bb9e434 Added timing as constant 2019-09-27 16:11:24 +02:00
Wolfgang Huß
f968c12ccf Implement updating by time and add new ones to the list 2019-09-27 16:11:24 +02:00
Wolfgang Huß
73cc068469 Fix lost translation 2019-09-27 16:11:24 +02:00
dependabot-preview[bot]
357d4969ba
Bump graphql from 14.5.7 to 14.5.8 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.7 to 14.5.8.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 07:25:49 +00:00
Robert Schäfer
0869aeb58e
Merge pull request #1719 from Human-Connection/1718-fix-comment-editor-styling-update-bug 
Fix bug UpdateComment, Fix styling on Comment
 2019-09-26 23:14:33 +02:00
mattwr18
ef5cf2e629 Update maintenance page email to support@... 2019-09-26 09:27:00 +02:00
dependabot-preview[bot]
036b948faf
Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 04:22:10 +00:00
mattwr18
1d5dcf5324
Merge pull request #1676 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.7 
Bump graphql from 14.5.6 to 14.5.7 in /webapp
 2019-09-25 22:57:36 +02:00
mattwr18
0f40df7cb4 Fix bug UpdateComment, Fix styling on Comment 
- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-09-25 13:39:18 +02:00
Wolfgang Huß
db9810b436
Merge pull request #1685 from Human-Connection/add-comment-story 
Add Comment story, add spacing above user info
 2019-09-25 10:48:20 +02:00
mattwr18
7b22711dfe
Merge pull request #1694 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.2 
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp
 2019-09-25 08:29:43 +02:00
mattwr18
766c670269 Fix import path 2019-09-25 08:26:24 +02:00
mattwr18
ee99673cec Add Comment story, add spacing above user info 2019-09-25 08:26:24 +02:00
dependabot-preview[bot]
7d9953a5a2
Bump graphql from 14.5.6 to 14.5.7 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.6 to 14.5.7.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.6...v14.5.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-25 06:22:59 +00:00
roschaefer
59232cefe7 Remove repeating labels from emote button 
Our dear @Hardy-Peaceglobal mentioned that when he had a look on the app
on my mobile.
 2019-09-24 11:59:44 +02:00