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

744 Commits

Author SHA1 Message Date
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
ogerly
46db785550 fix lint, fix test 2019-12-11 10:33:10 +01:00
ogerly
e737a3cd82 review alina add 2019-12-11 08:25:32 +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
mattwr18
a8edf46b56
Merge pull request #2422 from Human-Connection/2401-Hide_Donations_Bar 
Hide Donations Bar
 2019-12-06 11:25:55 +01:00
ogerly
652f6d1edc fix reviews ContributionForm, ContributionForm.spec 2019-12-06 10:53:26 +01:00
ogerly
a62d59741b fix and changes revies, fix lint 2019-12-06 09:16:14 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
mattwr18
9fd4ad47dd
Merge pull request #2317 from Human-Connection/2253-fix-scroll-layout-issue 
2253 fix scroll layout issue
 2019-12-05 21:02:10 +01:00
mattwr18
2827a6ae38
Merge pull request #2417 from Human-Connection/2387-fix-incorrect-privacy-page-path 
Update privacy path
 2019-12-05 20:36:11 +01:00
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +01:00
mattwr18
235702867d Move components to components/features 
- we are reserving _new directory for components that have no dependency
on the Nitro-Styleguide
- update pat
 2019-12-04 19:38:48 +01:00
ogerly
9ee8ce27bc Donate Button show , lint ok 2019-12-04 17:55:43 +01:00
ogerly
cc3c6e5d35 lint fix 2019-12-04 15:54:34 +01:00
ogerly
b532a38966 lint fix 2019-12-04 15:23:16 +01:00
ogerly
7c26e84463 rename Blur() to blur() 2019-12-04 15:17:21 +01:00
ogerly
7b0b2cc93e rename checkedBlur to blurImage, testing checkbox 2019-12-04 15:14:57 +01:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
ogerly
bcb0bd21a5 test review2 2019-12-04 11:21:26 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
mattwr18
6d7820ca75 Update privacy path 2019-12-03 21:07:26 +01:00
ogerly
fd3accd147 specs ok 2019-12-02 20:55:58 +01:00
Alina Beck
c75c8c6d2d pass imageAspectRatio to MasonryGridItems on user and more info page 2019-12-02 16:25:39 +03:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service 
Terms of use extended with dot - no commercial use
 2019-12-02 13:10:58 +01:00
mattwr18
985d53e52b Fix broken tests 2019-11-29 20:49:46 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
ogerly
7cdca49b48 Fix lint 2019-11-29 16:04:25 +01:00
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
ogerly
06fd8a2ce9 unblur function by contribution 2019-11-29 12:14:54 +01:00
mattwr18
9401d4e1e1 [WIP] Extract code into own components 2019-11-28 17:38:44 +01:00
mattwr18
3d8435dde1 Get frontend working with data from backend 2019-11-28 16:13:48 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
Alina Beck
3116f8cc0a use imageAspectRatio to set an estimated initial height for grid items 2019-11-27 21:35:43 +03:00
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
mattwr18
6324fd7d26 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-11-27 18:05:02 +01:00
mattwr18
1f7d8a023e Update reports query in frontend 2019-11-27 17:45:32 +01:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
Wolfgang Huß
4c91675838 Fix lint 2019-11-23 11:41:48 +01:00
Wolfgang Huß
8a4ca956e8 Rename variable 2019-11-23 11:20:16 +01:00
Wolfgang Huß
116d597d24 Cleaned SCSS 2019-11-23 11:11:00 +01:00
Wolfgang Huß
a8a99e763c Fix client-side rendered virtual DOM warnings 2019-11-23 11:05:41 +01:00
Wolfgang Huß
2f07d528e4 View status icon under type icon 2019-11-23 10:49:34 +01:00