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

1087 Commits

Author SHA1 Message Date
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
Vasily Belolapotkov
2c705a8680 sync with master to resolve merge conflicts 2019-09-29 20:33:39 +03:00
roschaefer
57598df228 refactor: re-use @vbelolapotkov's solution 
If we make this a mixin, we can re-use the same solution for e.g. the
comment. If sb. notifies you, the browser automatically scrolls to the
comment in which you have been mentioned.
 2019-09-29 14:28:38 +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ß
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ß
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
Wolfgang Huß
7f7bde9ab9 Started to implement report infos 2019-09-26 10:03:09 +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
Vasily Belolapotkov
e1751347fc fix failing client tests 2019-09-25 10:32:35 +03: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
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
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
Alina Beck
a85fab04b6 remove failing test because specs have changed 2019-09-23 22:38:13 +01:00
roschaefer
bafc530366 Bugfix create user page - missing submit buttons 2019-09-23 22:15:53 +02:00
Alina Beck
3026b923e0 use translated title for comment list 2019-09-23 21:08:20 +01:00
Alina Beck
7104896150 remove sleep icon from comment list 2019-09-23 20:46:41 +01:00
roschaefer
353b846124 Fix #1631 
I don't have time to really test this right now, feel free to do that
before merge.
 2019-09-23 15:04:33 +02:00
mattwr18
9646a3d7b9
Merge pull request #1678 from Human-Connection/improve-comments-output 
Improve comments output
 2019-09-23 12:45:26 +02:00
mattwr18
a55fab16d2
Merge pull request #1651 from Human-Connection/1650-change_slug 
Change your own slug
 2019-09-23 10:06:32 +02:00
mattwr18
c8a2b03e98 Add removeHtml function in comments tests 2019-09-23 10:04:15 +02:00
mattwr18
6542a0a584 RemoveHtml before counting 
- to decide whether to collapse or not
- reduce the innerHtml length to 180
 2019-09-23 08:54:38 +02:00
mattwr18
c771504275 Remove contentExcerpt from comments 
- this does not work with html content:
 2019-09-21 13:30:56 +02:00
mattwr18
dc18ac3723 Fix bug- mentions/links in comments scrubbed 2019-09-21 10:52:45 +02:00