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

2672 Commits

Author SHA1 Message Date
Robert Schäfer
523f6915de
Merge pull request #2585 from Human-Connection/1188-Delete_teaser_image 
🍰feat: Delete teaser image
 2020-02-18 22:50:33 +01:00
mattwr18
44652a34a7 Merge in master/refactor 
- Add cypress test for DeleteImage
- remove unnecessary ref and function call
- use tokens
- simplify logic to showDeleteImageButton
- emit event when cropInProgress
 2020-02-18 18:50:02 +01:00
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +01:00
Alina Beck
e68b53eda2 add title to counter icons on PostTeaser 2020-02-18 10:25:42 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
abdellani
e3c95cbbf5 fixes linter error 2020-02-17 15:04:16 +01:00
Alina Beck
2510643361 improve mobile-responsiveness of BaseCard, following @mattwr18 suggestions 2020-02-17 10:56:07 +01:00
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00
mattwr18
d8d1db389a Follow @roschaefer PR review suggestions 
- create mapping for expectedValues in post.js
- check from image/jpeg and compress, if not just pass to backend as is
 2020-02-14 19:49:00 +01:00
abdellani
cd62bb457b Removes popover menu 2020-02-13 00:46:50 +01:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader 
- have I missed any important features? too many tests?
 2020-02-12 17:53:38 +01:00
Alina Beck
408b77a3e7 use base-card on post page 2020-02-11 18:19:40 +01:00
Alina Beck
60818c5902 replace CardWithColumns with new and improved BaseCard 2020-02-11 16:57:25 +01:00
Alina Beck
3c8c9d51e1 re-refactor LoginForm, ContributionForm and TeaserImage 2020-02-11 16:34:35 +01:00
Alina Beck
37959d8167 refactor BaseCard to use slots and props 2020-02-11 16:10:45 +01:00
Alina Beck
9c3378807c introduce CardWithColumns component 2020-02-11 11:23:34 +01:00
Alina Beck
1eac8ed14d add variants to BaseCard 2020-02-11 11:17:04 +01:00
Alina Beck
d460819dee move client-only wrapper into LocaleSwitch component 
so we don't have to wrap <locale-switch> in <client-only> every time we use it
 2020-02-11 11:14:59 +01:00
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +01:00
Alina Beck
6671d893e6 refactor PostCard (wip) 2020-02-11 09:20:45 +01:00
Alina Beck
cea538e2f1 refactor Notification component 2020-02-10 17:56:18 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
Alina Beck
861b9aff94 clean up LoginForm 2020-02-10 15:46:49 +01:00
Alina Beck
0a9da862ed replace instances of ds-card with base-card 2020-02-10 15:45:09 +01:00
Alina Beck
509892b6ca refactor DeleteData template and CSS 2020-02-10 12:40:38 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user 
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
 2020-02-10 12:34:40 +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
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
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
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00