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,094 Commits 5 Branches 2 Tags
Commit Graph

298 Commits

Author SHA1 Message Date
Robert Schäfer
958ebf2c77 No need to use <hc-image> for static URLs 
@aonomike OK, sorry. When I said that we can replace all `<img>` tags,
what I meant is that we can replace every img tag that has a dynamic
`:src` attribute.
 2019-05-10 13:42:27 +02:00
Robert Schäfer
51ed1604a0 Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-10 13:42:21 +02:00
Robert Schäfer
1db35be50f Merge remote-tracking branch 'origin/master' into 296-image_component 2019-05-10 13:30:06 +02:00
mattwr18
12b326c992
Merge pull request #564 from Human-Connection/dependabot/npm_and_yarn/webapp/@human-connection/styleguide-0.5.17 
Bump @human-connection/styleguide from 0.5.15 to 0.5.17 in /webapp
 2019-05-10 00:00:49 -03:00
mattwr18
d63cc3a43e
Merge pull request #579 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.1 
Bump tippy.js from 4.3.0 to 4.3.1 in /webapp
 2019-05-09 23:59:39 -03:00
aonomike
e55129c64b Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-09 21:04:46 +03:00
aonomike
6445c534b4 Refactor to pass imageProps as an object without the computed section 2019-05-09 21:04:07 +03:00
mattwr18
bb6c9088d4
Merge pull request #575 from Human-Connection/572-downgrade-tiptap-due-to-bug-introduced-in-newer-version 
Revert tiptap upgrade
 2019-05-09 13:27:10 -03:00
Ulf Gebhardt
82570bef7f
Merge pull request #478 from Human-Connection/2019/kw15/User_can_change_its_username_to_emptystring 
2019/kw15/user can change its username to emptystring
 2019-05-09 15:01:54 +02:00
Wolfgang Huß
46d3dc8588 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 463-delete-socialMedia 2019-05-09 08:43:11 +02:00
Ulf Gebhardt
7983a93fbd
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-09 08:26:53 +02:00
dependabot[bot]
587fa8cd0d
Bump tippy.js from 4.3.0 to 4.3.1 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.0...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-09 04:50:17 +00:00
Matt Rider
fdab1e12c2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-08 21:32:08 -03:00
aonomike
bf57198815 Refactor code based on comments from PR review 2019-05-09 02:27:03 +03:00
Ulf Gebhardt
0a1359ed63
Merge branch 'master' into 572-downgrade-tiptap-due-to-bug-introduced-in-newer-version 2019-05-09 00:40:40 +02:00
dependabot[bot]
2b67b7ddca
Bump @human-connection/styleguide from 0.5.15 to 0.5.17 in /webapp 
Bumps @human-connection/styleguide from 0.5.15 to 0.5.17.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-08 21:57:33 +00:00
Ulf Gebhardt
d6f423d845
Merge pull request #574 from Human-Connection/2019/kw19/codecov 
2019/kw19/codecov
 2019-05-08 23:55:20 +02:00
Ulf Gebhardt
9c9522af8b
typo 2019-05-08 22:53:11 +02:00
Ulf Gebhardt
63b7ded4b6
ignore test modules in coverage estimation 2019-05-08 22:42:33 +02:00
Ulf Gebhardt
9d7a9fd3de
bavel plugin for dynamic imports, frontend test & coverage collection working fine 2019-05-08 20:40:03 +02:00
Ulf Gebhardt
28c44f2781
corrected testMatch pattern, fixed backend coverage collection (?) 2019-05-08 20:16:18 +02:00
Ulf Gebhardt
900dfb9693
renabled tests - it seems like the reports do not work very well 2019-05-08 20:04:55 +02:00
Ulf Gebhardt
3ca04a5c1e
typo 2019-05-08 20:02:52 +02:00
Ulf Gebhardt
ec9b3607d8
compute coverage over all code 2019-05-08 19:52:04 +02:00
Ulf Gebhardt
4092a8873b
overall coverage seems not to be reported..., removed parts of tests not the whole thing 2019-05-08 19:38:01 +02:00
Ulf Gebhardt
12ec2b8683
fixed codecov report layout, disabled tests in front- & backend for testing - should fail 2019-05-08 19:13:09 +02:00
Matt Rider
943a7c7a89 Revert tiptap upgrade 
- it introduced a bug that caused failing tests
- I have found an open issue on the repo and commented what I experienced here https://github.com/scrumpy/tiptap/issues/188#issuecomment-490532736
 2019-05-08 12:29:23 -03:00
Wolfgang Huß
c4a4d3d1f0 Wrote an additional frontend unit test 
Skipped writing of a modal dialog before deletion, because many code parts are on the way in the delete post PR.
So makes no sense to write them twice.
I make a new issue …
 2019-05-08 16:04:09 +02:00
Wolfgang Huß
ff303fccd3 Fixed linting errors 2019-05-08 14:14:34 +02:00
Wolfgang Huß
0ffbe567c7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 463-delete-socialMedia 2019-05-08 08:54:11 +02:00
dependabot[bot]
a35c77fbab
Bump graphql from 14.2.1 to 14.3.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.2.1 to 14.3.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.2.1...v14.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-08 04:51:14 +00:00
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
aonomike
399507c7fb Fix linting issues 2019-05-07 15:56:31 +03:00
aonomike
3ff034d014 Refactor <img> tags to use Image component 2019-05-07 15:21:42 +03:00
Robert Schäfer
0637d97648 Merge remote-tracking branch 'origin/master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-07 14:09:10 +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
Robert Schäfer
f27dca504b Refactor mixin with computed property 
@ulfgebhardt I refactored the mixin because it's not enough code to
justify the additional complexity. If it's just two lines of code, I
find it the best solution to use a computed property.

You can use components and computed properties excessively, they tend to
be easier to maintain in the long run.
 2019-05-06 22:59:25 +02:00
Robert Schäfer
ad111f5701 Double-check changed expectations, fix tests 
See:
https://github.com/Human-Connection/Human-Connection/pull/478/files#r281267486

> We found the reason for it: If you have an exclamation mark in the schema e.g.
> email! and the response would e.g. expect the email for each User object, and
> the server does not have an email for the client, then the entire User object
> gets nullified.
 2019-05-06 19:26:53 +02:00
Wolfgang Huß
41711c316a Get delete SocialMedia to work, refactored Frontend Jest tests, written Cypress tests 
Optimised tests and Vue for add Social Media a bit.
Added localisation.

Finished this commit together with @mattwr18 !!!
Thank you so much dude! You did great stuff …
 2019-05-06 17:31:02 +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