IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,964 Commits 5 Branches 2 Tags
Commit Graph

4964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
ccae251ad9 Implemented scrollBehavior for better scroll behaviar 
This scrolls even if you go forth and back in the browser.
Corrected URL for notifications in a Post.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-18 16:31:50 +02:00
Wolfgang Huß
744f0cb225 Approach to get scrollBehavior in a useful way. Works, but not fully successful 2019-07-18 08:30:44 +02:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
mattwr18
9237f24b68
Merge pull request #1060 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.9.0 
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /backend
 2019-07-17 07:08:39 -03:00
mattwr18
e4d4be448a
Merge pull request #1057 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.9.0 
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp
 2019-07-17 07:06:43 -03:00
mattwr18
fcfa4722df
Merge pull request #1056 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.0 
Bump apollo-server-testing from 2.6.9 to 2.7.0 in /backend
 2019-07-17 07:06:22 -03:00
mattwr18
0313698b00
Merge pull request #1055 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.2 
Bump cypress-file-upload from 3.3.1 to 3.3.2
 2019-07-17 07:06:01 -03:00
Wolfgang Huß
e0ab41a3d1
Merge pull request #788 from Human-Connection/552-update_comment 
Update comment
 2019-07-17 10:36:53 +02:00
ogerly
47324d4905 example II - lint ok, test local ok 2019-07-17 09:57:08 +02:00
Wolfgang Huß
f7da4a2bdf Rewrite the Backend test that are doublets to make sense 2019-07-17 09:26:03 +02:00
dependabot-preview[bot]
2342f984ce
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.0.
- [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.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:27:48 +00:00
dependabot-preview[bot]
d4a054a5e2
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.0.
- [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.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:26:22 +00:00
dependabot-preview[bot]
5430a5e990
Bump apollo-server-testing from 2.6.9 to 2.7.0 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.9 to 2.7.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.9...apollo-server-testing@2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:25:49 +00:00
dependabot-preview[bot]
0f91cced24
Bump cypress-file-upload from 3.3.1 to 3.3.2 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:25:09 +00:00
Robert Schäfer
b74590821c Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-16 21:33:46 +02:00
Robert Schäfer
7de73f861e
Merge pull request #1044 from Human-Connection/refactor_email_address 
Refactoring: Split User and Email
 2019-07-16 21:28:42 +02:00
Robert Schäfer
1970baaa2d Apparently neode doesn't like multiple connections 
Why? 😟
 2019-07-16 21:05:44 +02:00
Robert Schäfer
95d26a701c Fix lint 2019-07-16 21:00:47 +02:00
Robert Schäfer
99bfd56ea7 Merge remote-tracking branch 'origin/master' into refactor_email_address 2019-07-16 20:20:21 +02:00
Robert Schäfer
4c9dbdb378 Refactor changePassword resolver with neode 2019-07-16 20:06:26 +02:00
Matt Rider
1c53c58f42 Add backend validation tests to expose non-validation 
- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
 2019-07-16 14:54:13 -03:00
Wolfgang Huß
0d5471fee4 Try to implement scrollBehavior for Mentions of User in Comment of a Post 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 19:25:03 +02:00
Wolfgang Huß
cd0c509c81 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-16 16:10:36 +02:00
Matt Rider
16f077fe65 Add authentication tests for AddPostEmotions, emotionsCount 2019-07-16 11:02:43 -03:00
Wolfgang Huß
3b88c47206 Update the contentExcerpt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02:00
Wolfgang Huß
fae5b11607 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:09:50 +02:00
Alina Beck
972425fb09 fix lint errors 2019-07-16 14:00:30 +02:00
Alina Beck
c2887c7b90 add integration test for editing social media 2019-07-16 13:06:34 +02:00
Matt Rider
a019c8c311 Revert unintended changes, refactor 
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
 2019-07-16 07:53:57 -03:00
Matt Rider
7de337f96d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-16 07:24:23 -03:00
Robert Schäfer
c3edaa9d31
Merge pull request #1049 from Human-Connection/minor_change_to_kubernetes_config_templates 
Move secrets into secrets kubernetes template
 2019-07-16 12:04:08 +02:00
Robert Schäfer
cc34a74b60
Merge pull request #1050 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.8.0 
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp
 2019-07-16 12:02:20 +02:00
Robert Schäfer
3a4af2f5fa
Merge pull request #1052 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.8.0 
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /backend
 2019-07-16 12:02:03 +02:00
Alina Beck
05b6c63006 add component tests 2019-07-16 12:01:10 +02:00
Wolfgang Huß
9203f7310d Edit Comment content not contentExcerpt 
Comment button now only active, if the comment has changed.
Remove `console.log`.
 2019-07-16 11:48:33 +02:00
Wolfgang Huß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +02:00
Wolfgang Huß
dded3344cc
Merge pull request #1040 from Human-Connection/remove_graphql_yoga 
Remove graphql-yoga
 2019-07-16 09:13:44 +02:00
Wolfgang Huß
71527afd3f
Merge pull request #1019 from Human-Connection/1000_find_users_by_email_address 
Implement paginating user view for admins
 2019-07-16 09:12:44 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 08:12:40 +02:00
dependabot-preview[bot]
9c26bb8f90
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.0.
- [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.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:24:11 +00:00
dependabot-preview[bot]
033ff572ee
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.0.
- [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.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:23:35 +00:00
Robert Schäfer
b97f7e464f
Merge pull request #969 from Human-Connection/967-filter-post-by-category 
Filter posts by category
 2019-07-16 00:50:56 +02:00
Robert Schäfer
3f00140220
Merge pull request #1041 from Human-Connection/822_fix_load_more_button 
Fix #822 by updating the counts of the user
 2019-07-16 00:45:01 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress 
- Follow @Tirokk PR review
 2019-07-15 19:09:33 -03:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Robert Schäfer
db84afa20b Move secrets into secrets kubernetes template 2019-07-15 23:15:20 +02:00
Matt Rider
2dca04523d Remove key request in badge queries 
- clean up from `PR` which uses id, not key
 2019-07-15 15:04:19 -03:00
Matt Rider
a91ddd22b7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 14:47:36 -03:00