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

44 Commits

Author SHA1 Message Date
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Wolfgang Huß
dab21933af
Merge pull request #3925 from Ocelot-Social-Community/supported-img-formats 
feat: 🍰 Show Supported Image Formats Implemented
 2020-10-27 12:12:32 +01:00
dasari810
ae681ccad3 show supported img formats implemented 2020-10-26 16:35:06 +05:30
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
ogerly
6e934ed6b2 merge: master ok 2020-04-22 10:05:09 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00
Raphael Beer
e70faa0a2d
Review: user-teasers as unordered list 2020-04-19 17:58:22 +02:00
Raphael Beer
97a30ad8f8
Review: more cut off user-teaser vsisible 2020-04-16 20:15:10 +02:00
ogerly
94937c1496 feature: pagenation extended. page number display added, scroll to top at next and back, post display wider 2020-04-15 17:49:11 +02:00
Raphael Beer
b3f1137006
Review: fix styles 2020-04-09 23:39:47 +02:00
mattwr18
db20af2d39 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-02 08:19:43 +02:00
mattwr18
06985c2dbb chore: fix lint w/ new linting rules 2020-03-26 18:55:10 +01:00
mattwr18
cb0a3f5cdd chore: Fix lint w/ new linting rules 2020-03-26 10:14:51 +01:00
Alina Beck
478e4fa08f include magic numbers in tokens, fix tests 2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex 
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
 2020-03-25 11:02:00 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Alina Beck
72d979de55 improve user search results styling 2020-03-23 14:21:41 +01:00
Alina Beck
7a818a04a7 refactor and design search results page (wip) 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
Co-authored-by: Raphael Beer <raphael.beer@protonmail.com>
 2020-03-18 14:33:01 +01:00
Alina Beck
21eae3dcd2 refactor ribbon css 2020-02-24 22:22:51 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +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
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +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
d2148bdd47 Merge branch 'master' into migrate-styleguide-card 2020-02-03 19:23:22 +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
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
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
Alina Beck
db422257e4 add BaseCard component 2020-01-22 12:59:46 +03:00
Alina Beck
c5af2dbfb4 truncate overflowing user name 2020-01-21 11:58:54 +03:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions 
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-01-20 10:04:30 +01:00
mattwr18
6877c9da91 Use new base-button, rename CSS class 2020-01-16 12:29:28 +01:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
c108603b8f fix tests and refactor Paginate component 2020-01-15 13:09:36 +03:00
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00
Alina Beck
70d632e392 use scss tokens for counter icon and loading spinner 2020-01-09 14:47:14 +05:30
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30
Alina Beck
ab9ad46b14 style button variants 2019-12-17 13:29:29 +05:30
Alina Beck
2c2f69fbf8 add BaseButton component 2019-12-10 16:25:14 +03:00
Alina Beck
8f70ce5b31 set up css resets 2019-12-10 13:17:04 +03:00
Alina Beck
0727c3314d move styles from view folder to assets 2019-11-20 16:13:07 +03:00
Alina Beck
70bfd9d70c fix console warnings and failing tests 2019-11-20 15:43:53 +03:00
Alina Beck
f9709bdcf3 add missing category icons 2019-11-19 12:29:08 +03:00
Alina Beck
848e7d76da move icons to main assets folder 2019-11-14 14:11:00 +03:00