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

5819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasily Belolapotkov
50feeed8bf fix the bug with scrolling post comments into view 2019-09-24 12:47:42 +03:00
mattwr18
9eb90eea8d
Merge pull request #1690 from Human-Connection/1631-fix_language_chooser_on_create_account 
Bugfix create user page - missing submit buttons
 2019-09-23 23:13:42 +02:00
roschaefer
bafc530366 Bugfix create user page - missing submit buttons 2019-09-23 22:15:53 +02:00
mattwr18
b4b9d895a5
Merge pull request #1681 from Human-Connection/1631-fix_language_chooser_on_create_account 
Fix create account page has no logo, localisation
 2019-09-23 20:16:42 +02:00
mattwr18
af7ab74e4d
Merge pull request #1679 from Human-Connection/fix_intermittent_backed_specs 
Fix intermittent backend specs
 2019-09-23 17:38:37 +02:00
roschaefer
353b846124 Fix #1631 
I don't have time to really test this right now, feel free to do that
before merge.
 2019-09-23 15:04:33 +02:00
roschaefer
c24876c922 Add a double-check just to be sure 2019-09-23 13:51:21 +02:00
roschaefer
c669fc08eb Fix intermittent backend specs 
@mattwr18 I still see those false positives. This should fix it.
 2019-09-23 13:47:43 +02:00
mattwr18
9646a3d7b9
Merge pull request #1678 from Human-Connection/improve-comments-output 
Improve comments output
 2019-09-23 12:45:26 +02:00
Robert Schäfer
c74e103c79
Merge pull request #1670 from Human-Connection/dependabot/npm_and_yarn/codecov-3.6.1 
Bump codecov from 3.6.0 to 3.6.1
 2019-09-23 12:32:49 +02:00
Robert Schäfer
edfd1b3a0e
Merge pull request #1672 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.21.1 
Bump helmet from 3.21.0 to 3.21.1 in /backend
 2019-09-23 12:32:33 +02:00
Robert Schäfer
3295ea4331
Merge pull request #1674 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.18 
Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp
 2019-09-23 12:32:04 +02:00
Robert Schäfer
328a41ab59
Merge pull request #1677 from Human-Connection/fix-intermittent-notifications-test 
Fix intermittent failing test
 2019-09-23 12:31:07 +02:00
mattwr18
a55fab16d2
Merge pull request #1651 from Human-Connection/1650-change_slug 
Change your own slug
 2019-09-23 10:06:32 +02:00
mattwr18
c8a2b03e98 Add removeHtml function in comments tests 2019-09-23 10:04:15 +02:00
mattwr18
4b65d6d1ca
Merge pull request #1668 from Human-Connection/pwa 
Make Human Connection a Progressive Web App
 2019-09-23 09:40:17 +02:00
mattwr18
6542a0a584 RemoveHtml before counting 
- to decide whether to collapse or not
- reduce the innerHtml length to 180
 2019-09-23 08:54:38 +02:00
mattwr18
d6ae96f94b Use same npm package as excerptMiddleware in truncate 
- We want to remove the html from the count, and trucate just the
content; otherwise, we can have a situation where a person mentions
several people, but only the the first user's name appears, and not a
predetermined number of characters.
 2019-09-23 08:47:10 +02:00
mattwr18
865c562048 Fix intermittent failing test 
- the test was regularly failing our build
- change from toEqual to toMatchObject since there is more info coming
back, like errors, etc...
 2019-09-23 08:09:35 +02:00
dependabot-preview[bot]
5aa2359363
Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.17...v2.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 04:21:58 +00:00
dependabot-preview[bot]
cecdbd9aa4
Bump helmet from 3.21.0 to 3.21.1 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.21.0 to 3.21.1.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.21.0...v3.21.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 04:21:20 +00:00
dependabot-preview[bot]
d67ac63b2c
Bump codecov from 3.6.0 to 3.6.1 
Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.6.0...v3.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 04:20:27 +00:00
roschaefer
77d24b5a71 Add backend test for @mattwr18 
This was already covered by `slugifyMiddleware.spec.js`. I do agree that
this is a better place for it. Also we're not testing GraphQL requests
here but the factories. As we're testing the existence of unique
constraints, I think it won't matter if we use factories or actual
GraphQL requests.
 2019-09-23 00:09:08 +02:00
Robert Schäfer
3a36b50867
Merge pull request #1667 from Human-Connection/remove-contentExcerpt-from-comments 
Remove contentExcerpt from comments
 2019-09-22 23:54:58 +02:00
roschaefer
cd3829e84d Update manifest.json 2019-09-22 23:49:55 +02:00
roschaefer
6e35b37e49 Fix lint 2019-09-22 23:27:56 +02:00
roschaefer
2e57a17064 Setup @nuxt/pwa 
Following this tutorial here: https://pwa.nuxtjs.org/setup.html
 2019-09-22 22:21:12 +02:00
mattwr18
c771504275 Remove contentExcerpt from comments 
- this does not work with html content:
 2019-09-21 13:30:56 +02:00
Wolfgang Huß
ff933f7503
Merge pull request #1649 from Human-Connection/improve-comments-styling 
Fix bug where short comments scrub links
 2019-09-21 13:20:51 +02:00
mattwr18
dc18ac3723 Fix bug- mentions/links in comments scrubbed 2019-09-21 10:52:45 +02:00
mattwr18
7fe1d39303 Increase limit for displaying show more/less link 
- the limit was too short because of the html saved for mentions and
link
 2019-09-21 10:45:55 +02:00
roschaefer
b7d70bbe90 Fix cypress tests 2019-09-20 23:21:57 +02:00
roschaefer
b58b4dca4f Write a test for UniqueSlugForm 2019-09-20 22:37:38 +02:00
roschaefer
c378505293 Add one test case for update user form 2019-09-20 20:30:57 +02:00
roschaefer
e8f47cb004 Frontend validations for regex 2019-09-20 20:24:04 +02:00
roschaefer
4fbabc879f Add tests for User validations 2019-09-20 20:16:18 +02:00
roschaefer
b4ffa13517 Fix webapp tests by disabling the slug validations 2019-09-20 20:05:27 +02:00
roschaefer
be6c4a6f7c Refactor to use FormSchema 
That way we can re-use the code for slug validation in the
CreateUserAccount component
 2019-09-20 20:05:27 +02:00
roschaefer
efe9c96edb Obviously your own slug does not matter 2019-09-20 20:05:27 +02:00
roschaefer
e6d7d1a936 Fix #1650 2019-09-20 20:05:27 +02:00
Robert Schäfer
ede9dc0d76
Merge pull request #1620 from Human-Connection/1612_refactor-moderator-spec 
1612 refactor moderator spec
 2019-09-20 20:01:34 +02:00
roschaefer
1952d63b3c Remove .only from moderation.spec.js 
@aonomike @vbelolapotkov you made it!! You are the best.

Sure, the disable/enable can be improved by returning a union type. But
I leave that for another PR. 👍
 2019-09-20 18:27:37 +02:00
Robert Schäfer
61b1c4fea4
Merge pull request #1652 from Human-Connection/dependabot/npm_and_yarn/codecov-3.6.0 
Bump codecov from 3.5.0 to 3.6.0
 2019-09-20 18:16:01 +02:00
Robert Schäfer
f8e009c1bc
Merge pull request #1653 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc13.1 
Bump @nuxtjs/apollo from 4.0.0-rc13 to 4.0.0-rc13.1 in /webapp
 2019-09-20 18:15:46 +02:00
Robert Schäfer
290e871189
Merge pull request #1654 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.2 
Bump @hapi/joi from 16.1.1 to 16.1.2 in /backend
 2019-09-20 18:15:25 +02:00
Robert Schäfer
a6ea4a2a3a
Merge pull request #1660 from Human-Connection/1583-remove-follow-type-enum 
Remove follow type enum
 2019-09-20 18:13:22 +02:00
Vasily Belolapotkov
37a0ab6902 update client to use proper follow/unfollow mutation 2019-09-20 16:57:55 +03:00
Vasily Belolapotkov
7cca60358c remove FollowTypeEnum from schema 2019-09-20 16:52:12 +03:00
aonomike
347f37efe4 Add enable resources test path 2019-09-20 14:23:39 +03:00
dependabot-preview[bot]
55711b4a1f
Bump @hapi/joi from 16.1.1 to 16.1.2 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.1 to 16.1.2.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.1...v16.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-20 04:21:14 +00:00