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

5716 Commits

Author SHA1 Message Date
Matt Rider
2a2f124ba7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into another_try_to_fix_flaky_cypress_tests 2019-04-27 18:01:48 -03:00
Matt Rider
7181f03fdf Fix flaky cypress test 2019-04-27 18:00:37 -03:00
Daniel Grijalva
1f56ce69bf Spanish translation 2019-04-26 16:00:51 -07:00
Daniel Grijalva
a7c701a932 Delete post feature 
-Create post deletion modal
-Add post deletion locales (EN)
-Add delete post option in menu
 2019-04-26 14:03:50 -07:00
Matt Rider
30d0ff3cc7 Search for button with text "Comment" in cypress test 2019-04-26 11:31:18 -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
7b1be0cb7d Add test coverage 2019-04-25 17:17:12 -03:00
Matt Rider
05ad8ccc30 Remove unused variable/method 2019-04-25 16:36:59 -03:00
Matt Rider
c387760046 Extract CommentForm component 
- Cypress test is now passing as a result

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-04-25 14:20:00 -03:00
Matt Rider
3882cfcc48 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-25 10:11:47 -03:00
Matt Rider
092dcd7122 Get cypress test passing in a hacky way 2019-04-25 10:10:08 -03:00
Robert Schäfer
629df47104 Merge remote-tracking branch 'origin/master' into 260-add-comment-form 2019-04-25 14:24:57 +02:00
Wolfgang Huß
18458d23f5 Localisations corrected 
Had some old failures and some criss-cross with German and English.
 2019-04-25 10:36:03 +02:00
dependabot[bot]
418b93e4fd
Bump tippy.js from 4.2.1 to 4.3.0 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.2.1...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 04:54:26 +00:00
Matt Rider
7fafa1eb6e Get clear working properly 2019-04-24 20:56:15 -03:00
Matt Rider
05d393064a Disable Submit Button if comment is less than 3 characters 2019-04-24 14:58:22 -03:00
Matt Rider
f6cf05743a Add users to post for mentions 2019-04-24 12:47:20 -03:00
senderfm
412b56cffe seperatet username from truncate 2019-04-24 17:45:38 +02:00
Matt Rider
d72b2ed271 Merge branch '260-add-comment-form' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 12:30:49 -03:00
Matt Rider
8ae632be7b Fix component test, comment out form submission from cypress 
- Added $t function to test now that it is being localised
- We are submitting the form by clicking on the button as a normal user would
- Cypress test still broken due to peculiarities of tiptap editor
 2019-04-24 12:28:53 -03:00
Wolfgang Huß
bf19fc2b28 Added some translations 2019-04-24 17:10:02 +02:00
Matt Rider
546e2c99ad Localise text, remove frontend validations 
- validations are not working for the editor, they only work for our ds-input
 2019-04-24 09:15:41 -03:00
Matt Rider
23b0bbfbbe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-24 07:41:25 -03:00
Matt Rider
11a1f7991e Remove PostQuery.js 
- to be added in a separate ticket(?)
 2019-04-23 18:19:48 -03:00
Robert Schäfer
5978adff68 Sketch a test for a custom image component 
@tansaku @aonomike I hope this clarifies the task.

When you're done, feel free to use this component wherever we use
`<img>` in `/webapp/`.
 2019-04-23 19:35:41 +02:00
Robert Schäfer
98ad101549 Delete badge images from /webapp/ 
@tansaku @aonomike I don't know that we had those badges stored in the
webapp. That's certainly not the place where they're supposed to be.

Sorry for the confusion.
 2019-04-23 19:16:24 +02:00
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03:00
dependabot[bot]
074155da73
Bump tiptap-extensions from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.15.0...tiptap-extensions@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 15:08:08 +00:00
Matt Rider
c6b11319fe Clear editor, write cypress test 
- the editor only clears once, also there are some other bugs associated with clearing it this way
- according to https://github.com/scrumpy/tiptap/issues/21 there should be a clearContent(), but haven't been able to get it to work
- cypress test for some reason is with a weird bug where I need to submit the form, then click on the submit button, otherwise it doesn't call the handleSubmit method
 2019-04-22 11:51:29 -03:00
dependabot[bot]
54fe7e0029
Bump tiptap from 1.15.0 to 1.16.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.15.0 to 1.16.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.15.0...tiptap@1.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 04:46:05 +00: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
4d8148297e Fix styling of hc-editor, localize toast message 
- validations are not working for hc-editor, neither in this PR nor in ContributionForm
 2019-04-19 12:53:59 -03:00
Matt Rider
9ff194f3d6 Refetch the post to update the comments 
- I'm not happy with this as it is expensive, but seems to be used in other places in the code base, where I found the idea, @appinteractive left a comment suggesting a better approach would be to use subscriptions, but I haven't had time to research/try this option

Co-authored-by: Mike Aono <aonomike@gmail.com>
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-04-19 09:48:17 -03:00
Ulf Gebhardt
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
Ulf Gebhardt
6de253fd32
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/components/_mixins/seo.js
#	webapp/components/mixins/seo.js
#	webapp/layouts/blank.vue
#	webapp/layouts/default.vue
#	webapp/mixins/seo.js
 2019-04-19 12:09:24 +02:00
Ulf Gebhardt
55c1ac276d
use truncate instead of substring 2019-04-19 11:52:01 +02:00
Ulf Gebhardt
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02: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
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
Robert Schäfer
6c37f525c5 Grey out a read notification + test it 2019-04-18 17:11:22 +02:00
Robert Schäfer
9a96f22870 Finish Mention.feature 🥒 2019-04-17 22:29:55 +02:00
Robert Schäfer
91e11eb14d Merge remote-tracking branch 'origin/master' into 347-display_notifications 2019-04-17 20:23:24 +02:00
Matt Rider
86d075292c Update frontend 
- to work with new backend implementation
 2019-04-17 12:51:50 -03:00
Ulf Gebhardt
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
Ulf Gebhardt
59425f4f71
fixed Profile-Menu Username in case of emptystring 2019-04-17 14:57:06 +02:00
Ulf Gebhardt
2efc77097f
match specification of Dennis - minimum 3 characters for username, no hint for user to change the username to "Anonymous", Toast error if userdata cannot be changed due to username restrictions, display "Anonymous" if no username is found in database (even tho this is against implemented rules) 2019-04-17 14:49:03 +02:00
Ulf Gebhardt
e5f98f2cee
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/profile/_id/_slug.vue
 2019-04-17 13:59:30 +02:00
Matt Rider
0bcfefe210 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-17 08:00:07 -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
Robert Schäfer
b9e18c5c49
Merge pull request #472 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.2 
Bump nuxt from 2.6.1 to 2.6.2 in /webapp
 2019-04-17 01:55:00 +02:00