ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,194 Commits 104 Branches 1,559 Tags
Commit Graph

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
46cd21db1f Fix registration.spec 2019-07-15 19:35:07 +02:00
Robert Schäfer
b8ab7cacef Fix email filter test 2019-07-15 19:21:17 +02:00
Robert Schäfer
cec3eddcef Fix more test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
88aa8a3929 Encrypt email in JWT - fixes 2 test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
dacc3bb557 Implement fallback User.email resolver 2019-07-15 18:35:38 +02:00
Robert Schäfer
46589362fa Start to refactor User<->EmailAddress 2019-07-15 18:35:38 +02:00
Robert Schäfer
904142cf6e Create a separate node for email in data import 2019-07-15 18:35:38 +02:00
Robert Schäfer
2736738c36 Fix @Tirokk's suggestions 
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
 2019-07-15 18:26:23 +02:00
Robert Schäfer
d59c94c9f3 Keep gql syntax highglighting 
... with custom fake template string
 2019-07-15 18:09:54 +02:00
Robert Schäfer
f6bc72341f
Merge pull request #1042 from Human-Connection/fix_regression_data_import 
Fix regression of data import
 2019-07-15 17:39:15 +02:00
Robert Schäfer
417500eb3e
Merge pull request #1043 from Human-Connection/silence_codecov 
Silence codecov
 2019-07-15 17:38:42 +02:00
Robert Schäfer
f22d8072f4
Merge pull request #1046 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.1 
Bump cypress-file-upload from 3.2.1 to 3.3.1
 2019-07-15 17:37:55 +02:00
Robert Schäfer
9199458cbb
Merge pull request #1047 from Human-Connection/dependabot/npm_and_yarn/webapp/linkify-it-2.2.0 
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp
 2019-07-15 17:36:50 +02:00
Robert Schäfer
b25b5c462d
Merge pull request #1045 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.3.0 
Bump nodemailer from 6.2.1 to 6.3.0 in /backend
 2019-07-15 17:36:01 +02:00
Robert Schäfer
aa6c0efbf7
Merge pull request #1048 from Human-Connection/fix_nuxt_build_folder_file_permissions 
Sledgehammer the file permission problem on docker
 2019-07-15 17:34:02 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Matt Rider
bb4532827a Refactor search input, navbar 
- fix search input width on desktop
- removed adding removing classes on focus/blur search input
- fix notifications dropdown on mobile

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:20:28 -03:00
Matt Rider
b0f999ac05 Fix styling of navbar 
- Follow @Tirokk suggestions

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 11:06:56 -03:00
Matt Rider
d42083a32e Move header to left, add border left 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2019-07-15 09:55:09 -03:00
senderfm
8de9da0148 duplicate entry removed 2019-07-15 13:54:58 +02:00