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
6,147 Commits 117 Branches 1,511 Tags
Commit Graph

768 Commits

Author SHA1 Message Date
mattwr18
211bae6362 Fix lint 2019-10-08 22:42:41 +02:00
mattwr18
bced6983ea Fix lint, update tests 
- to remove vue warnings
- favor one expectation per it block
 2019-10-08 20:47:13 +02:00
ogerly
e2da57287b change providers.json 2019-10-08 18:56:45 +02:00
ogerly
0424992358 change specs 2019-10-08 16:35:49 +02:00
ogerly
7cc139e879 add test embeds and links 2019-10-08 13:20:07 +02:00
mattwr18
da1df27799 Extract logic to EmbedComponent to separate concerns 
- Co-authored-by: senderfm <dev@sender.fm>
 2019-10-07 19:15:39 +02:00
ogerly
18cfa0b8c8 tests 2 ok 2019-10-07 13:01:21 +02:00
Alina Beck
9350994cca use translations for data privacy warning 2019-10-07 11:12:48 +02:00
Alina Beck
1ecfee09db hide embed remove button when viewing post 2019-10-07 10:37:52 +02:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02:00
ogerly
574fbcf8b1 tests ok, lint ok 2019-10-07 10:32:11 +02:00
roschaefer
99db1338c1 docs: add storybook section for edit information 2019-10-04 01:05:39 +02:00
roschaefer
3912b21ea2 refactor: use named slot for additional text 
@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
 2019-10-04 01:00:31 +02:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02:00
ogerly
fd697f5f12 Template changed for removeEmbed() function 2019-10-03 10:09:51 +02:00
ogerly
3607bf9551 befor alinas work 2019-10-03 09:20:17 +02:00
Alina Beck
4a1ca2610a show overlay only for embedded html 2019-10-02 18:23:30 +02:00
Alina Beck
1f93c690be only display available data 2019-10-02 18:05:29 +02:00
Alina Beck
3a013d0607 update settings on button click instead of checkbox click 2019-10-02 17:10:08 +02:00
Alina Beck
8c78fef457 toggle preview image with showEmbed 2019-10-02 16:55:30 +02:00
Alina Beck
c46c13dbdf toggle overlay with methods 2019-10-02 16:37:52 +02:00
Alina Beck
99629991d0 style embed preview 2019-10-02 15:49:23 +02:00
Alina Beck
ec12171e80 style embed overlay 2019-10-02 15:11:43 +02:00
roschaefer
8c13234af9 Handle edge case 
It might be that people try to register email addresses that they don't own. Then if the actual owner tries to add this email address, she should not get a unique constraint violation. Instead the email will be re-used.

Is this a security issue? Because we re-use the nonce? 🤔
 2019-10-02 00:54:01 +02:00
Robert Schäfer
b31126c391
Merge pull request #1701 from Human-Connection/1273-fix-post-page-nav 
fix the bug with scrolling post comments into view
 2019-10-01 23:17:53 +02:00
roschaefer
08e73747bd refactor: set global defaults of vue-scrollto 2019-10-01 17:51:16 +02:00
roschaefer
db1bcdd3d2 refactor: register vue-scrollto in nuxt.config.js 
This will allow us to use this.$scrollTo in components. I'm now also
using this in the mixin. With so many `this`s it gets horribly
difficult to properly test the mixin in isolation. So I decided to test
the mixin on the component directly.
 2019-10-01 17:25:28 +02:00
roschaefer
9da40c4895 fix: avoid many scrollTo calls for n components 
Thank you @vbelolapotkov for pointing out the flaws here:
https://github.com/Human-Connection/Human-Connection/pull/1756#discussion_r329361572

So here is my attempt to fix it:
* Install `vue-scrollto` which relies on `requestAnimationFrame`
  - apparently this is better on Safari and IE? 🤔
  - Mocking out entire modules is easier in jest:
    https://jestjs.io/docs/en/bypassing-module-mocks
* Require `checkAnchor` to be implemented on the component
 2019-10-01 11:55:18 +02:00
ogerly
17323aeb25 logic ok 2019-10-01 11:00:14 +02: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
ogerly
63d5140420 break two - two 2019-09-30 11:38:29 +02:00
ogerly
c69d263039 Merge branch 'Allow_embedded_code_in_posts_permanent_memory' of https://github.com/Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-09-30 11:30:49 +02:00
ogerly
27121a1077 break two 2019-09-30 11:29:43 +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
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