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
c6cadc60c3 Remove semicolons added with .vscode linting, unused library 2019-06-03 21:23:11 -03:00
Matt Rider
e3bf68351c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 688-hover-effect-user-image-upload 2019-06-03 20:58:05 -03:00
mattwr18
094a46861b
Merge pull request #721 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.2 
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp
 2019-06-03 19:30:10 -03:00
Matt Rider
5c6147ee47 Fix broken tests, revert changes to error watch property 
- causing breaking change in the tests
 2019-06-03 19:14:29 -03:00
Matt Rider
31a6d36e59 Get overlay working, refactor 
- use arrow function for error watch property, remove let that = this
 2019-06-03 18:54:39 -03:00
aonomike
f7e5c7bf2c Add date relative date on comments 2019-06-03 23:36:04 +03:00
Matt Rider
e5ccdb91d2 Use custom slot for hc-avatar 2019-06-03 16:54:45 -03:00
Wolfgang Huß
d365f9368b Lint Fixes 2019-06-03 13:54:50 +02:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment 
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
 2019-06-03 10:39:13 +02:00
dependabot-preview[bot]
86d1e2a4b9
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.1...tiptap-extensions@1.20.2)
 2019-06-03 05:01:54 +00:00
Matt Rider
e09ef35c4a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-06-01 16:05:43 -03:00
aonomike
78100bec37 Add tests to upload error bug fix 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-06-01 20:23:04 +03:00
Robert Schäfer
13a2f771f8
Merge pull request #712 from Human-Connection/dependabot/docker/webapp/node-12.3.1-alpine 
Bump node from 10-alpine to 12.3.1-alpine in /webapp
 2019-05-31 20:15:10 +02:00
Robert Schäfer
321ead32fc
Merge pull request #663 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.17.1 
Bump prettier from 1.14.3 to 1.17.1 in /webapp
 2019-05-31 19:33:43 +02:00
Robert Schäfer
1773d136e9 Yarn --ignore-engines, v12.x.x will become LTS 2019-05-31 19:32:36 +02:00
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
dependabot-preview[bot]
038e216748
Bump node from 10-alpine to 12.3.1-alpine in /webapp 
Bumps node from 10-alpine to 12.3.1-alpine.
 2019-05-31 15:06:18 +00:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Robert Schäfer
cd9d589801 Update lockfile 2019-05-31 14:57:59 +02:00
Wolfgang Huß
b46016203a Started writing Jest tests for Deletion of Comments 2019-05-31 14:57:44 +02:00
Robert Schäfer
284ca34e03
Merge pull request #711 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.8.0 
Bump nuxt from 2.7.1 to 2.8.0 in /webapp
 2019-05-31 14:26:22 +02:00
Robert Schäfer
d39b5a87ef
Merge pull request #707 from Human-Connection/705-upgrade-axios 
Upgrade @nuxt/axios
 2019-05-31 14:11:21 +02:00
Robert Schäfer
ea42d73d04 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/webapp/prettier-1.17.1 2019-05-31 13:35:20 +02:00
Robert Schäfer
e162cd480e Run yarn run lint --fix on prettier v1.17.1 2019-05-31 13:33:20 +02:00
Robert Schäfer
e366c278a7
Merge pull request #704 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.5 
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp
 2019-05-31 13:05:42 +02:00
Robert Schäfer
a027e7599d
Merge pull request #706 from Human-Connection/686-dummy-placeholder-for-empty-avatars 
Add logo as default avatar background image
 2019-05-31 13:00:45 +02:00
Matt Rider
1f0e7bf7d9 Upgrade @nuxt/axios 
- was dependent on axios <= 0.18.0 and there is a high severity security alert from google
 2019-05-31 12:59:38 +02:00
dependabot-preview[bot]
9c06fe71e8
Bump nuxt from 2.7.1 to 2.8.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.7.1...v2.8.0)
 2019-05-31 10:51:43 +00:00
Wolfgang Huß
52a430fc91 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 11:36:50 +02:00
Wolfgang Huß
76469df059 Getting Jest Tests to run again. 2019-05-31 11:36:27 +02:00
dependabot-preview[bot]
67bce21104
Bump @nuxtjs/axios from 5.5.2 to 5.5.3 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.2...v5.5.3)
 2019-05-31 04:58:50 +00:00
ALau2088
a5f6390f97 552-update_comment 2019-05-30 15:47:55 -07:00
Matt Rider
068f6c2b49 Add logo as default avatar background image 2019-05-30 16:04:16 -03:00
dependabot-preview[bot]
a6112bfe8c
Bump fuse.js from 3.4.4 to 3.4.5 in /webapp 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.4...v3.4.5)
 2019-05-30 05:00:33 +00:00
Wolfgang Huß
542e281450 Fixed lint 2019-05-29 18:30:53 +02:00
Wolfgang Huß
ad7627fe05 Fixed the missing ds-flexin the PostCard 2019-05-29 18:18:58 +02:00
Wolfgang Huß
3e3e447bc5 Refactored three quater of the tests 2019-05-29 17:59:07 +02:00
Matt Rider
f732ff44d0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 2019-05-29 10:33:43 -03:00
aonomike
0111e60f1d Resolve Upload image rerender and double submit 
- Make Upload component re-render on failed upload
- Resolve double submit of uploaded to the backend when uploading with drag and drop

Co-authored-by: @mattWr18
Co-authored-by: @tirrok
 2019-05-29 16:09:34 +03:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
aonomike
7def0b4c20 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-05-29 15:35:12 +03:00
Robert Schäfer
ec1a24cbd3 Fix update incompatibility 
It seems that prettier supports vue in version `v1.15` and above.
See: https://github.com/prettier/prettier/releases/tag/1.15.0

So I guess that interferes with the old vue linter rules in place. I
graduated the vlue rule from `recommended` to `essential` and now
running `yarn run lint --fix` is doing fine.
 2019-05-29 13:21:55 +02:00
Robert Schäfer
66aa744e75
Merge pull request #700 from Human-Connection/685-fix-user-avatar-jumping-on-upload 
Fix user avatar jumping on upload
 2019-05-29 12:33:20 +02:00
Wolfgang Huß
19771a342e First approach to test '_slug.spec.js' 2019-05-29 12:19:51 +02:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +02:00
Wolfgang Huß
810746f138
Merge pull request #695 from Human-Connection/583-localize-tiptap-placeholder-text 
Fix placeholder text not translating bug
 2019-05-29 08:08:29 +02:00
Matt Rider
b08b29ba8e Fix user avatar jumping on upload 2019-05-28 20:35:47 -03:00
aonomike
154b6a6f78 Fix large file sizes bug 2019-05-28 23:31:57 +03:00
Robert Schäfer
13c87ae889 Run coverage only if requested 
I find it annoying to wait for code coverage tools to complete (~3
seconds) and especially to scroll up for every test run. So, this should
run coverage only on our build server *or* if you add `--coverage` on
the command line.
 2019-05-28 18:27:52 +02:00