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

400 Commits

Author SHA1 Message Date
Wolfgang Huß
3b88c47206 Update the contentExcerpt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 15:48:38 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 08:12:40 +02:00
Matt Rider
2dca04523d Remove key request in badge queries 
- clean up from `PR` which uses id, not key
 2019-07-15 15:04:19 -03:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02:00
Matt Rider
c7959dadb7 Refactor code 
- Remove vuex as we don't need with vue-apollo and watch
- Use chunk[i] instead of firstGroup, etc...
- Extract Category query to its own file
- Mobile responsive categories dropdown
 2019-07-09 13:00:08 -03:00
Matt Rider
3dc5888364 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-08 10:21:33 -03:00
Matt Rider
65f11d6f98 Add functionality to filter posts by category 
- only filters if you send two requests :'(
 2019-07-04 20:32:16 -03:00
Matt Rider
daaa979c99 Remove request for image 
- we do not need to request it and if there is none it throws an error
 2019-07-03 16:20:30 -03:00
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +02:00
Matt Rider
1c1a390d0c Refactor code to extract query to it's own file 2019-07-02 18:38:41 -03:00
senderfm
ffb261b71c load long content after save 2019-07-02 18:18:18 +02:00
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Matt Rider
b8ea32cfc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 778-categories-for-posts 2019-07-01 15:06:52 -03:00
senderfm
e255b71cc8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-07-01 11:19:01 +02:00
Matt Rider
e06b05af90 Remove request for categories from CreatePost 2019-06-29 13:09:48 -03:00
Matt Rider
865e2c0ec3 Refactor resolver, rename params 
- Use one cypher statement

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-06-28 10:17:22 -03:00
Matt Rider
07576d084c Get categories working with CreatePost 2019-06-26 15:59:57 -03:00
Matt Rider
145f488556 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-25 09:41:40 -03:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality 
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
 2019-06-24 18:21:52 -03:00
Matt Rider
be70088dd7 Get imageUpload working for Posts 2019-06-20 17:05:47 -03:00
senderfm
d85f49fb15 Fix: long comments can be folded up and down 2019-06-19 17:45:52 +02:00
Wolfgang Huß
23185fa29e Fix a problem in PostMutations.js which came in through merging the master 2019-06-14 20:25:25 +02:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00
Wolfgang Huß
472bfc2a88 Used PostMutations in PostHelpers now 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-14 18:44:56 +02:00
Wolfgang Huß
45bd1299ce Rewrote the PostHelpers and put them in a utils folder 2019-06-14 10:37:43 +02:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
5986ab2070 Create Posts with a specified language, or fallback 2019-06-10 17:12:00 -03:00
Robert Schäfer
574b42a2a7 "commentedCount" is different from "commentsCount" 
One is how many comments you wrote, one is how many **posts** are there
with at least one comment of you.

E.g. you can comment twice on the same post. You will have a
`commentedCount` increase of 1 but a `commentsCount` of 2.

FYI @ogerly @Tirokk
 2019-06-07 01:39:09 +02:00
Robert Schäfer
de0bcd949a Fix test 2019-06-07 01:39:09 +02:00
Robert Schäfer
c9ef1bc5ce Implement switching of tabs and updating list 2019-06-07 01:38:02 +02:00
Robert Schäfer
4278c75d52 Refactor profile page, separate requests 2019-06-06 23:31:27 +02:00
Ulf Gebhardt
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Matt Rider
957d894322 Start writing component test 
- restructured directories
 2019-05-03 11:18:14 -03:00
Matt Rider
40f5b6acd5 Extract CommentsList component 
- this allows to Query for comments by Post
 2019-05-02 21:03:31 -03:00
Matt Rider
346158da7f Update to use autogenerated Comment Query 
- using the custom CommentByPost Query was not returning the author of the Post, therefore the users avatar was not showing up
- there are some weird bugs with the comments, if you dblclick on the button, two comments with the same content are created
- sometimes the comments appear as the bottom of the list, sometimes they appear three comments from the bottom(?)
 2019-05-02 19:59:35 -03:00
Matt Rider
5891129662 Ordered comments like alpha, move HcCommentForm, mobile responsive 
- in the first instance, we will be importing posts/comments from the alpha, so to maintain consistency, we've ordered them alike. In the future, we could support user choice of order.
- Gives more space for HcCommentForm, user can see comments added to list, helps with mobile responsiveness

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-26 08:57:29 -03:00
Matt Rider
11a1f7991e Remove PostQuery.js 
- to be added in a separate ticket(?)
 2019-04-23 18:19:48 -03:00
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03:00
Matt Rider
49c03c92c8 Extract PostQuery/convert to js, try to get clear working 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-04-20 10:49:02 -03:00
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
86d075292c Update frontend 
- to work with new backend implementation
 2019-04-17 12:51:50 -03:00
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end 
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
 2019-04-16 23:12:13 -03:00
Matt Rider
60c56f8872 Start adding social media card section to user profile 2019-04-11 16:38:31 -03:00
Robert Schäfer
d9d7c38800 Add missing id to graphqQl query 2019-03-26 20:19:25 +01:00
Robert Schäfer
63d928e12e Change route post-slug to post-id-slug 
And query `slug` and `id` everywhere
 2019-03-26 16:21:39 +01:00
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00