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

2938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Grijalva
07bf1b4653 comply with tests 2019-05-08 13:57:47 -07:00
Daniel Grijalva
87c3f4619e lint fix 2019-05-08 13:29:39 -07:00
Daniel Grijalva
885a282b2a Merge branch 'delete-posts' of github.com:danielgrijalva/Human-Connection into delete-posts 2019-05-08 12:16:13 -07:00
Daniel Grijalva
6af29c6b8e DeleteModal tests 2019-05-08 12:15:48 -07:00
Robert Schäfer
b742efd02e
Merge branch 'master' into delete-posts 2019-05-02 19:29:24 +02:00
Robert Schäfer
c3cfe90aa2
Merge pull request #526 from Human-Connection/unexpose_8080 
Unexpose irrelevant port 8080
 2019-05-02 00:03:39 +02:00
Robert Schäfer
8f40b25cfd
Merge pull request #507 from Human-Connection/dependabot/npm_and_yarn/backend/sanitize-html-1.20.1 
Bump sanitize-html from 1.20.0 to 1.20.1 in /backend
 2019-05-02 00:03:03 +02:00
Robert Schäfer
5921e0b9f4
Merge pull request #527 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.17.0 
Bump tiptap-extensions from 1.16.2 to 1.17.0 in /webapp
 2019-05-02 00:02:21 +02:00
dependabot[bot]
ce6523b3d9
Bump tiptap-extensions from 1.16.2 to 1.17.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.16.2...tiptap-extensions@1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 21:02:50 +00:00
Robert Schäfer
5ddda1da0f
Merge pull request #513 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.4 
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /webapp
 2019-05-01 22:59:08 +02:00
Robert Schäfer
5572808bdf
Merge pull request #528 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.17.0 
Bump tiptap from 1.16.2 to 1.17.0 in /webapp
 2019-05-01 22:58:23 +02:00
dependabot[bot]
8a3ac4ede2
Bump tiptap from 1.16.2 to 1.17.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.16.2...tiptap@1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 04:56:44 +00:00
dependabot[bot]
e70bdc4754
Bump sanitize-html from 1.20.0 to 1.20.1 in /backend 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 21:03:09 +00:00
Robert Schäfer
0fa83188f5
Merge pull request #505 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.3 
Bump nuxt from 2.6.2 to 2.6.3 in /webapp
 2019-04-30 23:02:17 +02:00
Robert Schäfer
33710e9bc9
Merge branch 'master' into dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.4 2019-04-30 23:01:16 +02:00
Robert Schäfer
24cb43eb49
Merge pull request #514 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.7.0 
Bump @vue/cli-shared-utils from 3.6.0 to 3.7.0 in /webapp
 2019-04-30 23:00:13 +02:00
Robert Schäfer
773396622d
Merge pull request #521 from Human-Connection/dependabot/npm_and_yarn/backend/node-fetch-2.4.1 
Bump node-fetch from 2.3.0 to 2.4.1 in /backend
 2019-04-30 22:59:33 +02:00
Robert Schäfer
559c21efcb
Merge pull request #518 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/cli-7.4.4 
Bump @babel/cli from 7.4.3 to 7.4.4 in /backend
 2019-04-30 22:58:52 +02:00
dependabot[bot]
9138f0032e
Bump @babel/cli from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 12:31:10 +00:00
dependabot[bot]
44f9595d90
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 12:31:04 +00:00
Robert Schäfer
dd24745814
Merge pull request #506 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.2.0 
Bump eslint-config-prettier from 4.1.0 to 4.2.0 in /webapp
 2019-04-30 14:28:11 +02:00
Robert Schäfer
2052e69c60
Merge pull request #516 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.4 
Bump @babel/core from 7.4.3 to 7.4.4 in /backend
 2019-04-30 14:27:26 +02:00
Robert Schäfer
006554fdda
Merge pull request #522 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/register-7.4.4 
Bump @babel/register from 7.4.0 to 7.4.4 in /backend
 2019-04-30 14:26:46 +02:00
dependabot[bot]
cd9ff076f8
Bump nuxt from 2.6.2 to 2.6.3 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.6.2 to 2.6.3.
- [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.6.2...v2.6.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:59 +00:00
dependabot[bot]
cb42cc0187
Bump node-fetch from 2.3.0 to 2.4.1 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/bitinn/node-fetch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.3.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:36 +00:00
dependabot[bot]
23e6ef3c06
Bump @vue/cli-shared-utils from 3.6.0 to 3.7.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.7.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:26:08 +00:00
dependabot[bot]
af9595fc61
Bump eslint-config-prettier from 4.1.0 to 4.2.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.1.0...v4.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:25:24 +00:00
dependabot[bot]
1294f99366
Bump @babel/core from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:23:04 +00:00
dependabot[bot]
fefe4a9ef2
Bump @babel/register from 7.4.0 to 7.4.4 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.4.0 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.0...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 11:22:58 +00:00
Robert Schäfer
f3d49cd057
Merge pull request #508 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.5.1 
Bump eslint-plugin-jest from 22.5.0 to 22.5.1 in /backend
 2019-04-30 13:22:16 +02:00
Robert Schäfer
890810743a
Merge pull request #475 from Human-Connection/260-add-comment-form 
Add Comment Form
 2019-04-30 13:13:32 +02:00
Matt Rider
94384a7608 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-29 14:57:46 -03:00
Robert Schäfer
e948a50c12
Merge pull request #484 from Human-Connection/another_try_to_fix_flaky_cypress_tests 
Fix? flaky cypress by waiting for <no-ssr> content
 2019-04-29 19:50:47 +02:00
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -03:00
Robert Schäfer
63ea40b5eb Unexpose irrelevant port 8080 2019-04-29 16:19:06 +02:00
Robert Schäfer
5eb3de5e87
Merge pull request #517 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.4 
Bump @babel/core from 7.4.3 to 7.4.4 in /webapp
 2019-04-29 12:42:36 +02:00
Robert Schäfer
1e8369f388
Merge pull request #519 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.2 
Bump v-tooltip from 2.0.1 to 2.0.2 in /webapp
 2019-04-29 12:39:31 +02:00
Robert Schäfer
53fbe04b9f
Merge pull request #520 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.4 
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /backend
 2019-04-29 12:38:29 +02:00
dependabot[bot]
303e66b383
Bump @babel/preset-env from 7.4.3 to 7.4.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:54:51 +00:00
dependabot[bot]
20adf8cf95
Bump v-tooltip from 2.0.1 to 2.0.2 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:54:18 +00:00
dependabot[bot]
fc55d1d738
Bump @babel/core from 7.4.3 to 7.4.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.3...v7.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-29 04:53:29 +00:00
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
8d7fdec17f Update the cypress test for new button text 2019-04-26 09:22:57 -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
dependabot[bot]
d7102d48a1
Bump eslint-plugin-jest from 22.5.0 to 22.5.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.5.0 to 22.5.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.5.0...v22.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-26 04:49:58 +00:00
Matt Rider
05ad8ccc30 Remove unused variable/method 2019-04-25 16:36:59 -03:00