ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,006 Commits 104 Branches 1,559 Tags
Commit Graph

1366 Commits

Author SHA1 Message Date
Wolfgang Huß
49aec6e0b0 Fix lint 2020-02-06 12:39:08 +01:00
Wolfgang Huß
1a3139e95c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-02-06 09:56:42 +01:00
Wolfgang Huß
63f36f02b4 Clarified variable naming 2020-02-06 09:52:18 +01:00
Wolfgang Huß
ff620171b2 Implement suggestions of Robert 2020-02-06 09:35:15 +01:00
Alina Beck
41ef496d6b refactor CategoriesSelect template 2020-02-05 21:45:28 +01:00
Alina Beck
1d435392ff refactor ContributionForm template 2020-02-05 21:39:50 +01:00
Alina Beck
e14cbf8173 refactor TeaserImage component 2020-02-05 20:43:47 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling 
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
Wolfgang Huß
0161b7f16c Implement suggestions of Matt 2020-02-05 12:50:16 +01:00
Wolfgang Huß
bef747b9a1 Implement suggestions of Matt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-05 11:05:37 +01:00
Alexander Friedland
798e4d4f5a
Merge branch 'master' into 1188-Delete_teaser_image 2020-02-05 08:00:55 +01:00
ogerly
28d0b307d4 feat: proposals for changes incorporated, tests started 2020-02-04 16:58:27 +01:00
mattwr18
335e7127b8 Update mute/unmute icon to unused icon 
- we are already using eye/eye-slash for disable/release
 2020-02-03 21:14:38 +01:00
Alina Beck
f29d486da0 replace ds-card in CommentForm 2020-02-03 20:10:44 +01:00
Alina Beck
d2148bdd47 Merge branch 'master' into migrate-styleguide-card 2020-02-03 19:23:22 +01:00
Wolfgang Huß
346a1b0d3e Merge branch '1709-send-feedbacks-in-report-processes' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 2020-02-03 10:11:10 +01:00
roschaefer
d6f5740ac1 Merge remote-tracking branch 'origin/master' into 1709-send-feedbacks-in-report-processes 2020-02-01 15:12:13 +01:00
mattwr18
c8c71a52c6 Follow @Tirokk PR review suggestions 
- Favor lowercase for words in a sentence after the first
- Use exclamation marks for successful actions that use a toastr
- place events at the end of the list on components
- place class above events
- it would be nice to come to a consensus based on best practices, like
  I had a doubt and places the class definition below the props, is that
what others do?
 2020-01-31 13:09:37 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
Robert Schäfer
65811e2d8b
Merge pull request #2898 from Human-Connection/add_underline_menu_button 
feat(editor): Underline markup for posts+comments
 2020-01-28 22:34:30 +01:00
mattwr18
abeb2e97ed
Merge pull request #2871 from Human-Connection/fix-avatar-issues 
fix(webapp): 🐛 Adjust Avatar Sizes and 'z-index'
 2020-01-28 01:09:55 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
Alina Beck
c74eebfcdc use $event instead of event in vue template 2020-01-27 19:25:46 +01:00
Alina Beck
73a1d54915 remove z-index from UserAvatar 2020-01-27 19:17:22 +01:00
mattwr18
36130d9d7c Check that stubbed component method is called 2020-01-27 13:44:40 +01:00
roschaefer
789c40c34e feat(editor): Underline markup for posts+comments 
We had tiptap's underline and never used it. A user has asked for it, so
why not implement it right away?

Suggested by `@raimundo@human-connection.social`:
https://human-connection.social/post/612bf465-91ce-4be8-906e-3bde63617346/hcsocial-dein-netzwerk-news-mit-dennis-and-robert-1#commentId-b864d04f-1e8c-48c4-9ed0-98aefaed1c02
 2020-01-26 20:39:52 +01:00
Wolfgang Huß
9a8720218f Implement suggestions of Matt 2020-01-24 19:35:01 +01:00
Wolfgang Huß
7eeddf2a8f Implement suggestions of Matt 2020-01-24 19:23:01 +01:00
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature 
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2020-01-23 20:30:12 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock 
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
 2020-01-23 19:18:12 +01:00
mattwr18
853ff9b92b Stub component, rename component, refactor 
- We need to stub the Editor since it throws difficult to interpret
  errors about view.root.getSelection, but we want to stub it's methods
as well, so that we don't need a guard clause just for tests.

- CommentForm is already multiword
- Favor update over result for Vue apollo smart queries
 2020-01-23 14:03:14 +01:00
mattwr18
d15037607c Add component test for direct reply to comment 
- we have found it challenging to add component tests that mount the
  tiptap editor, so we are stubbing it, which means that we will add e2e
tests to up the coverage of how much of the workflow has automated tests
 2020-01-23 13:05:36 +01:00
Alina Beck
7c090cc3ed set z-index for UserTeaser only on PostCard 2020-01-22 18:09:44 +03:00
Alina Beck
0392826211 set avatar size to small in AvatarMenu and for Anonymous users 2020-01-22 18:05:00 +03:00
Alina Beck
38eec0fc5f rename Comment to CommentCard 2020-01-22 17:43:25 +03:00
Alina Beck
e7bf499d37 use BaseCard in Comment component and refactor 2020-01-22 17:37:32 +03:00
Wolfgang Huß
58a120d3d7 Clean up 2020-01-22 15:13:13 +01:00
Wolfgang Huß
1c0d54a935 Fix lint 2020-01-22 13:34:52 +01:00
Wolfgang Huß
0bb2b905ee Add example notification for filed report to storybook 2020-01-22 13:32:54 +01:00
Wolfgang Huß
e563887022 Fix test in 'NotificationsTable.spec.js' for new 'user-teaser' component 2020-01-22 13:17:11 +01:00
Wolfgang Huß
71cf2a397a Modify layout of notifications menu 2020-01-22 13:02:54 +01:00
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
ogerly
00c0397919 test: specs is not ok 2020-01-22 11:25:44 +01:00
Alina Beck
db422257e4 add BaseCard component 2020-01-22 12:59:46 +03:00
Wolfgang Huß
4c6c3b8b27 Change the class 'text-notification-header' 2020-01-22 10:55:15 +01:00