IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-19 11:21:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,654 Commits 5 Branches 2 Tags
Commit Graph

2941 Commits

Author SHA1 Message Date
roschaefer
b9c0749334 fix: scroll to top as default 
So nuxt's default scrollBehavior seems to have some kind of "scroll to
anchor" already built in. Unfortunately we cannot use it, because the
the anchor is not yet in the DOM when the scroll behavior is called.

So the justification for this change is:
1. Remove scrollBehavior from `nuxt.config.js` it's deprecated to put it
there.
2. Also *don't* use the default scrollbehavior because of the reasons
above ☝️

Instead I assume to always scroll to the top. This might be undesired
sometimes but let's keep a watchful eye and define the behavior if
needed.
 2019-09-29 14:28:38 +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
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
Wolfgang Huß
cb28837e84 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-09-27 13:14:19 +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
Wolfgang Huß
7f7bde9ab9 Started to implement report infos 2019-09-26 10:03:09 +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
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
e8f771b59a first mega PR crazy update, all work 2019-09-25 18:39:01 +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
Vasily Belolapotkov
e1751347fc fix failing client tests 2019-09-25 10:32:35 +03: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
Vasily Belolapotkov
50feeed8bf fix the bug with scrolling post comments into view 2019-09-24 12:47:42 +03:00
dependabot-preview[bot]
14d7695f62
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp 
Bumps [@babel/preset-env](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-24 09:04:40 +00:00
mattwr18
718b8b73c8
Merge pull request #1696 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp
 2019-09-24 11:01:59 +02:00
mattwr18
5e35fd6546
Merge pull request #1689 from Human-Connection/1659-remove-sleep-icon 
Remove sleep icon from comments list
 2019-09-24 10:59:29 +02:00
dependabot-preview[bot]
4d67b46492
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp 
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-24 04:32:06 +00:00