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
13,069 Commits 113 Branches 1,511 Tags
Commit Graph

134 Commits

Author SHA1 Message Date
ogerly
8dfb22e7a5 merge event-master 2023-04-25 12:35:54 +02:00
ogerly
76eb8757cb merge event master + changes 2023-04-25 09:17:03 +02:00
ogerly
e172fe917a fix lint 2023-04-24 14:20:36 +02:00
ogerly
1ba79343fe save event 2023-04-24 12:40:52 +02:00
ogerly
dbf89fadfc pre add-further-event-params 2023-04-20 13:55:52 +02:00
ogerly
8d27846602 add datepicker 2023-04-05 20:07:32 +02:00
ogerly
d2fec8ea2f first step for events 2023-04-05 10:24:58 +02:00
Wolfgang Huß
9ded9105a3 Left over of merge conflict 2023-03-16 16:09:18 +01:00
Wolfgang Huß
9dbb8cae41 Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
 2023-03-16 16:06:35 +01:00
Wolfgang Huß
84e483a450 Fix variable name 2023-03-16 16:03:51 +01:00
Wolfgang Huß
04b6dc4407 Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
 2023-03-16 15:56:40 +01:00
Wolfgang Huß
4f6c9319fb
Update webapp/components/ContributionForm/ContributionForm.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2023-03-16 15:52:31 +01:00
Wolfgang Huß
5c634ca688
Update webapp/components/ContributionForm/ContributionForm.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2023-03-16 15:51:16 +01:00
Wolfgang Huß
424f5c4172 Refine style of contribution (post) form hint text for group post 2023-03-16 15:49:13 +01:00
elweyn
9259615a34 Style changes for the action buttons 2023-03-16 12:08:56 +01:00
Wolfgang Huß
fd62a03820 Add hint text to create and edit a post of a group 2023-03-09 18:06:14 +01:00
Wolfgang Huß
42f5df78e4 Cleanup 2022-10-07 23:34:43 +02:00
Wolfgang Huß
7b9b253211 Implement post creation in a group 2022-10-07 11:32:04 +02:00
Wolfgang Huß
ac0aacf776 Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader' 2022-08-29 12:10:23 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
e31f250ea5 env vatiable for CATEGORIES_ACTIVE and switch for categories in contribution form 2022-07-25 18:41:39 +02:00
Wolfgang Huß
aa454893ce Refactor pageParams, third step 
- Implement emails.js in backend as well.
- Move backend links.js into emails.js, because code is not a duplicate of webapp anymore.
 2021-08-05 14:44:54 +02:00
Moriz Wahl
664d3d2c42 image type in frontend 2021-02-04 21:05:04 +01:00
Moriz Wahl
250d231a74
auto detect language. Input field in contribution form removed. 2021-01-21 13:30:56 +01:00
Moriz Wahl
cbf50014ed removed categories from posts 2021-01-15 00:36:55 +01:00
Moriz Wahl
430d07d0c1 link to FAQ changed 2020-11-16 12:59:13 +01:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
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