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

5457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
27cc6c49af
Bump node from 12.5-alpine to 12.6-alpine in /backend 
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:30 +00:00
dependabot-preview[bot]
4c2619acb8
Bump node from 12.5-alpine to 12.6-alpine in /webapp 
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:17 +00:00
dependabot-preview[bot]
01c73e9996
Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:02 +00:00
dependabot-preview[bot]
4436d06c69
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.2.
- [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.1...v22.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:23:31 +00:00
dependabot-preview[bot]
7f054809d6
Bump @babel/node from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:23:30 +00:00
dependabot-preview[bot]
c0f7b48a07
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.2.
- [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.1...v22.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:52 +00:00
dependabot-preview[bot]
069d461a41
Bump @babel/core from 7.4.5 to 7.5.0 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:28 +00:00
dependabot-preview[bot]
d11881b2f4
Bump @babel/cli from 7.4.4 to 7.5.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:06 +00:00
dependabot-preview[bot]
9d5ffa2480
Bump eslint-loader from 2.2.0 to 2.2.1 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:21:55 +00:00
mattwr18
cb19c43c22
Merge pull request #973 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.4.2 
Bump graphql from 14.4.0 to 14.4.2 in /backend
 2019-07-04 21:53:20 -03:00
mattwr18
fdd8519fbe
Merge pull request #972 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.4.2 
Bump graphql from 14.4.0 to 14.4.2 in /webapp
 2019-07-04 21:52:58 -03:00
mattwr18
5747f67e3e
Merge pull request #971 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.9.0 
Bump @vue/cli-shared-utils from 3.8.0 to 3.9.0 in /webapp
 2019-07-04 21:52:37 -03:00
mattwr18
f307009e41
Merge pull request #970 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-2.2.0 
Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp
 2019-07-04 21:52:16 -03:00
Matt Rider
a875fe0d5e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-04 20:33:24 -03:00
Matt Rider
65f11d6f98 Add functionality to filter posts by category 
- only filters if you send two requests :'(
 2019-07-04 20:32:16 -03:00
Wolfgang Huß
7211e781c7 Merge branch '779-tags-of-contribution-in-text' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-04 21:01:37 +02:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
 2019-07-04 20:56:14 +02:00
Wolfgang Huß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02:00
senderfm
aa264a0d56 fixed specs, test ok 2019-07-04 18:02:06 +02:00
senderfm
23cf309cfc HcContributionForm submit is disabled by default replace all editor html tags 2019-07-04 17:14:02 +02:00
senderfm
cb356161e5 HcContributionForm submit is disabled by default 2019-07-04 16:53:56 +02:00
Matt Rider
eded1a5f7b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-04 10:58:58 -03:00
dependabot-preview[bot]
de6a57ebe7
Bump graphql from 14.4.0 to 14.4.2 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 10:20:48 +00:00
dependabot-preview[bot]
7fbf634ff4
Bump graphql from 14.4.0 to 14.4.2 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 10:20:38 +00:00
mattwr18
063ba642a0
Merge pull request #945 from Human-Connection/943_bring_user_mutation_under_control 
943 bring user mutation under control
 2019-07-04 07:18:29 -03:00
senderfm
8de9516b96 large images are set to maximum height fix lint 2019-07-04 11:06:10 +02:00
senderfm
9d6d47cebb large images are set to maximum height 2019-07-04 10:22:03 +02:00
Wolfgang Huß
83c4a1c638
Merge pull request #963 from Human-Connection/716-Postcar-content-excerpt-overflow 
long links and content is wrapped
 2019-07-04 08:11:43 +02:00
Wolfgang Huß
4b1bcdc0f9
Merge pull request #951 from Human-Connection/805-remove-unused-query 
Remove unused query as cleanup
 2019-07-04 08:09:58 +02:00
dependabot-preview[bot]
842df06754
Bump @vue/cli-shared-utils from 3.8.0 to 3.9.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.9.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.9.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 04:30:49 +00:00
dependabot-preview[bot]
450555f658
Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/2.1.2...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 04:29:12 +00:00
Matt Rider
bb93052b88 Add FilterPosts dropdown with category names 2019-07-03 19:46:49 -03:00
Matt Rider
c6b261853f Add test for filter posts by category 2019-07-03 19:46:26 -03:00
Robert Schäfer
8b991ea686 Less log output 2019-07-03 23:22:31 +02:00
Robert Schäfer
09ff79763d Follow @mattwr18's other suggestion 2019-07-03 23:20:36 +02:00
senderfm
07b8116447 Update of polish locales 2019-07-03 22:51:39 +02:00
Robert Schäfer
ef46f71c0d Follow @mattwr18 code review 👍 2019-07-03 22:22:42 +02:00
Matt Rider
e7b70ce7cd Fix failing test after new implementation merged in 2019-07-03 17:08:47 -03:00
Matt Rider
b187fbb7b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-03 16:30:15 -03:00
Matt Rider
daaa979c99 Remove request for image 
- we do not need to request it and if there is none it throws an error
 2019-07-03 16:20:30 -03:00
Matt Rider
5827222e47 Rename labels, decrease replicas to 1 2019-07-03 14:54:19 -03:00
Matt Rider
438bb36e90 Add nginx maintenance and test locally 2019-07-03 14:27:30 -03:00
Matt Rider
e04ab842bd Add service yaml for nginx(maintenance) service 2019-07-03 14:27:30 -03:00
Matt Rider
ed658e9d32 Dockerize embed, kubernetes config, add back deployment .env 2019-07-03 11:12:43 -03:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
senderfm
d108ee5bab long links and content is wrapped 2019-07-03 15:30:21 +02:00
Matt Rider
eabb58e851 Merge in Nitro-Embed 2019-07-03 08:51:39 -03:00
Matt Rider
7a3694aff4 Merging embed to master 2019-07-03 08:47:45 -03:00
Matt Rider
089b07c3e0 Merging Human-Connection to master 2019-07-03 08:47:30 -03:00
Matt Rider
cc6819e77b Root commit for master branch 2019-07-03 08:47:30 -03:00