ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,888 Commits 117 Branches 1,511 Tags
Commit Graph

721 Commits

Author SHA1 Message Date
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
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
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
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
mattwr18
7fe1d39303 Increase limit for displaying show more/less link 
- the limit was too short because of the html saved for mentions and
link
 2019-09-21 10:45:55 +02:00
roschaefer
b58b4dca4f Write a test for UniqueSlugForm 2019-09-20 22:37:38 +02:00
roschaefer
c378505293 Add one test case for update user form 2019-09-20 20:30:57 +02:00
roschaefer
e8f47cb004 Frontend validations for regex 2019-09-20 20:24:04 +02:00
roschaefer
be6c4a6f7c Refactor to use FormSchema 
That way we can re-use the code for slug validation in the
CreateUserAccount component
 2019-09-20 20:05:27 +02:00
Vasily Belolapotkov
37a0ab6902 update client to use proper follow/unfollow mutation 2019-09-20 16:57:55 +03:00
Alexander Friedland
006d6e8eeb
Merge pull request #1646 from Human-Connection/changelog 
Point the changelog to Github
 2019-09-19 20:19:26 +02:00
Robert Schäfer
d830fa4ae4
Merge pull request #1596 from Human-Connection/1583-follow-mutation 
Improve follow/ufollow mutation
 2019-09-19 16:54:35 +02:00
mattwr18
0430ab0f74 Fix styling issue in comments list 
- add back class comments which adds spaces between comments
 2019-09-19 15:57:57 +02:00
roschaefer
b761eea700 Point the changelog to Github 
The justification for this change is that the releases page on Github
is more likely to keep up to date than our changelog.

This also means that our changelog is not translated. But I think that's
fine.
 2019-09-19 13:21:51 +02:00
Vasily Belolapotkov
39db954ec6 improve follow/unfollow mutation usage 2019-09-19 12:10:59 +03:00
mattwr18
f3c44711e4
Merge pull request #1641 from Human-Connection/1639_no_limits_for_post_length 
Fix #1639 - No limits for post length
 2019-09-19 09:16:57 +02:00
roschaefer
6a3d534ead Fix #1639 2019-09-19 01:05:43 +02:00
roschaefer
ec7d9753db Follow @alina-beck's PR review 
https://github.com/Human-Connection/Human-Connection/pull/1640#pullrequestreview-290089879
 2019-09-18 23:32:10 +02:00
roschaefer
ade92e387d Add slug to User component, fix #1486 2019-09-18 17:15:01 +02:00
Robert Schäfer
efd103c158
Merge pull request #1618 from Human-Connection/1547-fix-disappearing-comment-embeds 
Fix disappearing embeds on comments
 2019-09-18 14:40:02 +02:00