IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,011 Commits 5 Branches 2 Tags
Commit Graph

241 Commits

Author SHA1 Message Date
Robert Schäfer
099a5c9cf4 Remove obsolete docker-compose files 
Since we moved to a monorepo, we have it in the top level folder.
 2019-05-07 19:24:59 +02:00
Robert Schäfer
c62e4a717c
Merge pull request #550 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.8.0 
Bump jest from 24.7.1 to 24.8.0 in /webapp
 2019-05-07 14:00:48 +02:00
dependabot[bot]
90603007f3
Bump jest from 24.7.1 to 24.8.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.7.1 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.7.1...v24.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-07 10:47:25 +00:00
dependabot[bot]
d538b4e195
Bump tiptap-extensions from 1.17.0 to 1.18.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.17.0...tiptap-extensions@1.18.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-07 10:47:00 +00:00
Robert Schäfer
b8cecd7fe3
Merge pull request #536 from Human-Connection/352-add-authorship-to-comments 
Add authorship to comments at creation
 2019-05-07 12:03:29 +02:00
dependabot[bot]
30a5e394c7
Bump tiptap from 1.17.0 to 1.18.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.17.0...tiptap@1.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-07 04:52:37 +00:00
Robert Schäfer
0d07873659
Merge pull request #515 from Human-Connection/dependabot/npm_and_yarn/webapp/node-sass-4.12.0 
Bump node-sass from 4.11.0 to 4.12.0 in /webapp
 2019-05-07 01:39:07 +02:00
Robert Schäfer
d0765f82c4
Merge pull request #504 from Human-Connection/469-add-coveralls 
Add test coverage
 2019-05-07 00:05:32 +02:00
Robert Schäfer
4097f0ed82
Merge pull request #452 from Human-Connection/451-lokalise-unlocalised-texts 
[WIP] 451 lokalise unlocalised texts
 2019-05-06 23:10:00 +02:00
dependabot[bot]
a58258c668
Bump node-sass from 4.11.0 to 4.12.0 in /webapp 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 21:08:52 +00:00
Robert Schäfer
4bde7703ae
Merge pull request #531 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.19.0 
Bump nodemon from 1.18.11 to 1.19.0 in /webapp
 2019-05-06 23:06:49 +02:00
dependabot[bot]
c046524b8f
Bump babel-jest from 24.7.1 to 24.8.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.7.1 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.8.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 04:59:48 +00:00
Matt Rider
ad46c2d059 Remove cypress test 
- it is not part of the scope of this ticket, and therefore should be extracted and dealt with separately
 2019-05-05 12:26:02 -03:00
Matt Rider
1fff9bbc46 Add cypress test to expose comment creation bug 
- at the moment, one can create the same comment by clicking rapidly on the "Comment" button
- an idea for a fix https://stackoverflow.com/questions/53101521/prevent-repeated-queries-in-apollo-server-2
 2019-05-04 18:46:34 -03:00
Matt Rider
70fb34345d Improve test by mounting CommentList with data 2019-05-03 15:53:16 -03:00
Matt Rider
da218f8a58 Add component test for extracted CommentList.vue 2019-05-03 15:48:20 -03:00
Matt Rider
d1c8682710 Update method name to be more descriptive/accurate 2019-05-03 15:47:54 -03:00
Matt Rider
ebc290c6af Delete CommentForm.test.js, remove console.log 
- this test is not part of this PR and I'll create another issue and put in a different PR for it
 2019-05-03 13:39:43 -03: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
dependabot[bot]
4f0ded1ff0
Bump nodemon from 1.18.11 to 1.19.0 in /webapp 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.11 to 1.19.0.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.11...v1.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-02 04:50:47 +00: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
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
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
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
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
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]
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
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
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
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