ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,605 Commits 113 Branches 1,511 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
roschaefer
4ea0d653c4 Remove inappropriate picture help link 
This link is helpful but points to Human Connection, so unfortunately I
have to remove it.
 2020-06-05 17:00:15 +02: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
Raphael Beer
d465e94596
Refactor: use #shorthand for default v-slot attributes 2020-03-12 23:49:27 +01:00
Raphael Beer
5626cb2771
Revert "Refactor: replace default slots" 
This reverts commit f1e308074bc33e6762431f90f335ed849776f4d9.

  Let's take this one at a time...
 2020-03-12 23:49:01 +01:00
Raphael Beer
c3cf682fdf
Refactor: replace default slots 2020-03-12 23:49:01 +01:00
roschaefer
9241305d43 fix: Prever FileReader over URL.createObjectUrl 
Apparently, URL.createObjectUrl is not supported in JSDom, see:
https://github.com/jsdom/jsdom/issues/1721

With FileReader we have the option to avoid it altogether.
 2020-02-20 15:42:47 +01:00
Alina Beck
4a17cf0e07 move deleteImage logic to ImageUploader 2020-02-19 15:55:10 +01:00
Alina Beck
888051a6ae simplify formData in ContributionForm 2020-02-19 14:18:54 +01:00
Alina Beck
e38b6f9625 rename TeaserImage component to ImageUploader 2020-02-19 10:51:04 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +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
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
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
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
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
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +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
Alexander Friedland
15bd6c5d48
Merge branch 'master' into 1188-Delete_teaser_image 2020-01-16 05:32:27 +01:00
ogerly
c1743ce1d0 fix: lint, test 2020-01-15 18:58:42 +01:00
ogerly
2e7f774679 fix: lint 2020-01-15 18:49:32 +01:00
ogerly
75753444ea fix: delete picture and thumbnail in post 2020-01-15 18:48:37 +01: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
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
ogerly
af760c17ea Merge branch '1188-Delete_teaser_image' of https://github.com/Human-Connection/Human-Connection into 1188-Delete_teaser_image 2020-01-06 11:07:46 +01:00
ogerly
f8c0a34194 Proposed changes accepted and incorporated 2020-01-06 11:06:59 +01:00
Alexander Friedland
cd8b244741
Update webapp/components/ContributionForm/ContributionForm.vue 
showDeleteButton change

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2020-01-06 10:57:48 +01:00
mattwr18
730da2029c Fix imageAspectRatio set to null UpdatePost 
- we were not setting the form.imageAspectRatio to the value of the
post's imageAspectRatio, so when a user updated their post, but did not
update their imageAspectRatio it would set it to null
 2019-12-20 00:59:29 +01:00
Alexander Friedland
d38a1f089f
Merge branch 'master' into 1188-Delete_teaser_image 2019-12-19 18:26:05 +01:00
ogerly
b9676271ea Delete teaser image 2019-12-19 17:46:25 +01:00
Alina Beck
56b1a74e64 let eslint do some magic 2019-12-19 12:53:38 +05:30
Alina Beck
7c7a800bc2 replace ds-button with base-button (wip) 2019-12-19 00:50:27 +05:30
Alina Beck
c74bfde652 refactor to use only one value for the blurImage status 2019-12-18 15:26:45 +05:30
ogerly
0213d64ba5 change const height = Math.min, remove 2000 2019-12-18 07:56:36 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
Alexander Friedland
3a98767707
change link to FAQ 
link FAQ Blur: https://support.human-connection.org/kb/faq.php?id=113
 2019-12-16 11:12:30 +01:00
roschaefer
a7a1e4affc fix: editor not visible in server-side-rendering 
This is fixing a bug where sometimes the editor would not get displayed
until you click into the title text fields. This commit also removes
some obscure optimizations.

I'm really annoyed by the cruft that we still carry around until this
very day.

Every single line of untested code, which you left because you thought:
"Well sure this is going to improve performance!" is going to bite you.
 2019-12-14 01:36:59 +01:00
ogerly
556adf2e37 final polish :) 2019-12-13 09:02:22 +01:00
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
ogerly
a30a7ac8b0 mounted removed and everything put on blurImage 2019-12-12 09:44:45 +01:00
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03: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
ogerly
5ae6b3c954 fixed contributionForm.vue 2019-12-06 13:16:40 +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