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

1968 Commits

Author SHA1 Message Date
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix 
🍰 Fix - maintaining sorting after navigation
 2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students 
Add storybook stories for our university students
 2019-10-22 11:58:17 +02:00
mattwr18
da08e20af5
Merge pull request #1987 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.10.2 
build(deps): bump nuxt from 2.10.1 to 2.10.2 in /webapp
 2019-10-22 11:18:38 +02:00
mattwr18
9f3e6676fb
Merge pull request #1981 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.5 
build(deps-dev): bump @storybook/vue from 5.2.4 to 5.2.5 in /webapp
 2019-10-22 11:17:40 +02:00
mattwr18
73016453ac
Merge pull request #1977 from Human-Connection/dependabot/docker/webapp/node-12.13.0-alpine 
build(deps): bump node from 12.12.0-alpine to 12.13.0-alpine in /webapp
 2019-10-22 11:15:41 +02:00
mattwr18
b92fbbaa85
Merge pull request #1920 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.0 
build(deps-dev): bump async-validator from 3.1.0 to 3.2.0 in /webapp
 2019-10-22 11:12:29 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
mattwr18
d87f9c8a1b
Merge pull request #1973 from Human-Connection/1970-hide-new-comment-form-while-editing-other-comments 
Hide new CommentForm while editing a comment
 2019-10-22 11:01:31 +02:00
dependabot-preview[bot]
d88ad6cbb1
build(deps): bump nuxt from 2.10.1 to 2.10.2 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.1 to 2.10.2.
- [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.10.1...v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 04:28:48 +00:00
dependabot-preview[bot]
45dc6d2fcf
build(deps-dev): bump @storybook/vue from 5.2.4 to 5.2.5 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.5/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 04:26:40 +00:00
dependabot-preview[bot]
065dbcf50a
build(deps): bump node from 12.12.0-alpine to 12.13.0-alpine in /webapp 
Bumps node from 12.12.0-alpine to 12.13.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 04:25:00 +00:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
Wolfgang Huß
736e7cc903 Translate texts for pinning a post to German 2019-10-21 16:03:09 +02:00
mattwr18
46fd534a28
Merge pull request #1840 from Human-Connection/1205-pinned-post-for-admins 
Allow admins to pin a post
 2019-10-21 14:37:14 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
Mogge
8728feaa37
fix: Only one ellipse is displayed 2019-10-21 11:33:26 +02:00
dependabot-preview[bot]
7adeade193
build(deps-dev): bump async-validator from 3.1.0 to 3.2.0 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/commits/v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 07:40:38 +00:00
dependabot-preview[bot]
fa5ce6edca
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.12.0 to 4.0.4.
- [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/v4.0.4/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 04:24:49 +00:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store 
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
 2019-10-18 21:58:53 +02:00
mattwr18
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00
mattwr18
8872dc16cf Follow @Tirokk's PR review suggestions 
- add type :User to match
- remove unneeded outdated pinPost
 2019-10-18 18:27:20 +02:00
mattwr18
73002cf694
Merge pull request #1946 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.4 
build(deps): bump tiptap-extensions from 1.28.3 to 1.28.4 in /webapp
 2019-10-18 16:33:25 +02:00
mattwr18
86d8f833ee
Merge pull request #1942 from Human-Connection/fix_frontend_tests 
fix: console warnings during frontend tests
 2019-10-18 16:28:14 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
mattwr18
be0c8044e8 Return pinnedAt date from pinPost resolver/clean up 
- it's good to return the pinnedAt date for ordering
- move test to a better describe block
- remove unneeded outdated variables from graphql/PostQuery UpdatePost
- fix indentation in Post.gql
- fix pinnedAt to return pinned.createdAt, not post.createdAt

Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-18 15:10:26 +02:00
Alexander Friedland
1fce840efb
locale 
change language to locale
 2019-10-18 12:16:32 +02:00
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
Alexander Friedland
18fe54e095
Update Registration.js 
change language to locale
 2019-10-18 11:49:14 +02:00
dependabot-preview[bot]
3d6ec2c216
build(deps): bump tiptap-extensions from 1.28.3 to 1.28.4 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.3 to 1.28.4.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.3...tiptap-extensions@1.28.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-18 04:19:27 +00:00
mattwr18
411bbabcd5 Add profilePagePostsQuery to deal with bug 
- we do not want to add pinnedPosts to every user's profile page
 2019-10-18 00:42:44 +02:00
roschaefer
25f2fc358d fix: console warnings during frontend tests 2019-10-18 00:21:43 +02:00
mattwr18
b45fd51d15 Pin post on user profile as well 2019-10-18 00:13:01 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up 
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
 2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure 
- clean up
 2019-10-17 22:44:44 +02:00
mattwr18
973912fb87 Add tests for unpinPost, refactor 
- following @roschaefer's PR review suggestions
- simplify UpdatePost by using pinPost/unpinPost
- did not remove filtering because attempting to have two queries caused
problems as well to do with duplicate records, etc... and it's working
now
 2019-10-17 21:51:41 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
cbeecce775 Prefer persistent pinnedPost filter in backend 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning 
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
 2019-10-17 17:56:16 +02:00
mattwr18
3f2d476cf9
Merge pull request #1941 from Human-Connection/1311-fix-vue-errors 
Fix vue errors for Contribution form
 2019-10-17 16:45:27 +02:00
Vasily Belolapotkov
20d9ba2439 wrap user component with client-only 2019-10-17 16:45:09 +03:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments 
Improved comment truncation
 2019-10-17 12:21:43 +02:00
Robert Schäfer
ea1b9d6e1e
Merge pull request #1911 from Human-Connection/typo 
fix: typo in German translation
 2019-10-17 12:18:01 +02:00
ppelegrin
48cfc017ea
Merge pull request #1921 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp
 2019-10-17 10:03:38 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
Youri Seichter
967273a1af remove error logging as it results in linting errors 2019-10-16 19:38:51 +02:00