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

235 Commits

Author SHA1 Message Date
Wolfgang Huß
a48a338e26 Merge branch 'category-tooltipps' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-description-etc 
# Conflicts:
#	webapp/components/PostTeaser/PostTeaser.vue
#	webapp/pages/post/_id/_slug/index.vue
 2022-09-16 07:18:25 +02:00
Wolfgang Huß
1d3fc9b88a Set tooltip on post page categories 2022-09-16 07:08:32 +02:00
Wolfgang Huß
e570d0773a Remove unneeded eslint-enable 2022-09-16 05:25:00 +02:00
Moriz Wahl
64153ea9e3 change delay of category tooltip to 1500 2022-09-15 10:04:26 +02:00
Moriz Wahl
5727eeb49f feature: Tooltips for Topics 2022-09-13 09:17:04 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Moriz Wahl
938f5ccdf9 fix all tests 2022-07-25 23:20:05 +02:00
Moriz Wahl
b71b20ae81 fix more tests 2022-07-25 23:04:12 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +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
Wolfgang Huß
32856dd60f Suggest a fix and some refinements 2021-05-06 09:58:37 +02:00
Ulf Gebhardt
8a53bda51c
lint fixes 2021-04-26 02:21:50 +02:00
Ulf Gebhardt
a71e864049
asyncData test post/edit/_id.spec.js 2021-04-26 01:52:04 +02:00
Ulf Gebhardt
44038a46ab
test head post/_id/_slug/index.spec.js 2021-04-26 00:34:17 +02:00
Ulf Gebhardt
194178854f
lint fixes 2021-04-25 16:34:14 +02:00
Ulf Gebhardt
43c1c268ca
coverage post/edit/_id.spec.js 2021-04-25 16:33:35 +02:00
Ulf Gebhardt
196fbe0864
lint fixes 2021-04-25 16:29:35 +02:00
Ulf Gebhardt
d16886c1fd
lint fixes 2021-04-25 16:28:29 +02:00
Ulf Gebhardt
609836d48c
coverage post/_id.spec.js 
coverage post/create.spec.js
 2021-04-25 16:25:26 +02:00
Wolfgang Huß
02fa718fae Remove more-info of post 
- Additionally remove take-action.
 2021-03-29 15:16:05 +02:00
Wolfgang Huß
58728df97b Refinied design 2021-02-11 12:39:38 +01:00
Moriz Wahl
4097cc16f7 remove emojis from post page 2021-02-11 12:39:38 +01:00
Moriz Wahl
650e83f4c2 file upload: refactored 2021-02-08 16:10:38 +01:00
Moriz Wahl
80e296604d height of image in post/index.vue is calculated correctly. Why is this necessary? 2021-02-05 14:19:47 +01:00
Wolfgang Huß
9ce1e089fa Fix lint 2021-01-21 16:38:55 +01:00
Wolfgang Huß
16c3d2ab87 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-21 08:01:40 +01:00
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
Moriz Wahl
cbf50014ed removed categories from posts 2021-01-15 00:36:55 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Wolfgang Huß
bcd98c793c Implement mixins for delete, pin, unpin post in lists, done 2020-10-08 15:24:06 +02:00
Wolfgang Huß
c91c9e263f Implement mixins for delete, pin, unpin post in lists, on the way 2020-10-08 09:26:20 +02:00
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
roschaefer
387ea64faa Parameterize links 2020-06-05 17:15:12 +02:00
Dries Cruyskens
38d7ab9661 Moved the sorting function to helper file to prevent duplicate code. 2020-06-04 00:18:51 +02:00
Dries Cruyskens
43a3b57dd9 Fixed linting issues and comments. 2020-05-30 03:20:50 +02:00
Dries Cruyskens
136e83afc2 Alphabetically sorting tags using compute functions on index and more-info page. Added test checking tags are present and shown alphabetically. 2020-05-30 03:10:11 +02:00
Dries Cruyskens
4ab7972a83 Inversed the aspect ratio to fix bug. 2020-05-29 18:26:23 +02:00
Dries Cruyskens
abdc80727d Hero image height on post page is now set withouth having to wait for the image to load. Vue gives the image aspect ratio to css as a css variable, css then sets the correct height in fuction of the width. 2020-05-28 15:15:14 +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
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
Alina Beck
46616f5e6b update cypress tests 2020-02-19 20:50:40 +01:00
roschaefer
f2e2db0bc7 fix(frontend): error when post.author null 2020-02-19 10:49:08 +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
53931a38e5 fix cypress tests 2020-02-11 19:47:05 +01:00
Alina Beck
408b77a3e7 use base-card on post page 2020-02-11 18:19:40 +01:00
Alina Beck
9895c32b0b replace remaining instances of ds-card with base-card 2020-02-11 17:45:32 +01:00