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,457 Commits 104 Branches 1,559 Tags
Commit Graph

199 Commits

Author SHA1 Message Date
Dries Cruyskens
eef33a27a8 Fixed the profile header not showing when it's not present. 2020-06-25 18:27:59 +02:00
Dries Cruyskens
dcaa2cf07b A profile header now has a max height of 250px (instead of fixed) and shrinks vertically when the profile picture is not tall enough to fill 250px. Changed css class to be more specific. 2020-06-23 17:22:44 +02:00
Dries Cruyskens
f62efe39fa Made profile header component that supports uploading and displaying a header image and added it to the profile page. Added locales in all languages for a succesful or failed upload toast. Included test for the new userProfileHeader component. Updated the gql model to include the profileHeader. 2020-06-12 18:28:40 +02:00
Raphael Beer
2c7ca87acc
Review: lint 2020-04-09 23:16:37 +02:00
Raphael Beer
9dd65aa6d5
Remove: redundant defaults 2020-04-01 09:40:07 +02:00
Raphael Beer
e6361c9b74
Refactor: move following/followedBy updating to page component 2020-03-28 05:57:48 +01:00
Raphael Beer
41ea370e4b
Refactor: move all files to folder 2020-03-26 09:48:24 +01:00
Raphael Beer
bf7bd6fd59
[wip|rebase]: lint 2020-03-25 12:51:37 +01:00
Raphael Beer
801eb1e515
Fix: missing stub in _id/_slug spec 2020-03-25 12:51:36 +01:00
Raphael Beer
984f69a738
Chore: lint 2020-03-25 12:51:36 +01:00
Raphael Beer
a873aac44d
Refactor: extract FollowList from profile page 2020-03-25 12:51:35 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
Alina Beck
278868133f use base-card on user profile 2020-02-11 18:31:14 +01:00
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +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
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
Robert Schäfer
a9b7318874
Merge pull request #2826 from Human-Connection/error-pages 
fix: Error pages can be translated
 2020-02-07 11:59:33 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
Moriz Wahl
9948f4ef20 improved layout, key-name changed 2020-01-28 10:18:15 +01:00
Moriz Wahl
7cfd61ecf2 Error page added 2020-01-28 10:18:15 +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
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
mattwr18
74a7db5388 Convert missed ds-avatar, fix cypress test 2020-01-20 10:08:27 +01: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
905f34c827 Support use of initials, add tests, move component 
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
 2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum 
- follow @alina-beck PR review
 2020-01-20 10:04:30 +01:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting 
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
 2020-01-16 20:56:12 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons 
refactor(styleguide): migrate and redesign buttons
 2020-01-15 14:17:06 +03:00
Alina Beck
e9ad67d39b
Merge branch 'migrate-styleguide-buttons' into button-migration-fixes 2020-01-14 17:04:25 +03:00
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Alina Beck
ea612bdf78 replace another batch of ds-buttons with base-buttons (wip) 2019-12-19 12:19:58 +05:30
Alina Beck
f6cdf9ff64 removes LoadMore button 2019-12-19 08:39:27 +05:30
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation 
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-12-18 15:39:42 +01:00
roschaefer
e24d8035b1 Fix this annoying bug with a tested helper 
I don't know where the bug originates. But it can only be that either
`previousResult` or `fetchMore` result is sometimes undefined. This
should make the function bullet-proof for these situations.
 2019-12-10 23:28:01 +01:00
Robert Schäfer
032242ac7c
Merge pull request #2481 from Human-Connection/fix_cannot_read_post_of_undefined 
Fix `Cannot read 'Post' of undefined`
 2019-12-10 19:04:12 +01:00
roschaefer
1a852ebfab Fix Cannot read 'Post' of undefined 2019-12-10 17:53:54 +01:00
mattwr18
fb4f487abd Revert layout changes for imageAspectRatio 
- we still add the imageAspectRatio for new posts, but we don't do
anything with the layout until we figure out how to add
imageAspectRatios for every post with an image in the database without
causing a big downtime
 2019-12-10 15:40:03 +01:00
Alina Beck
c75c8c6d2d pass imageAspectRatio to MasonryGridItems on user and more info page 2019-12-02 16:25:39 +03:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00