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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
f11db05f27
Bump cypress from 3.4.0 to 3.4.1 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 04:25:45 +00:00
Alina Beck
d83819dae3 add social media back into user resolver 2019-07-29 23:19:09 +02:00
Alina Beck
afe61ce4a2 add social media back into user schema 2019-07-29 22:51:11 +02:00
Alina Beck
c7d72bfdee use apollo test client in social media tests 2019-07-29 17:22:37 +02:00
Alina Beck
e161416eff use neode instance in social media resolver 2019-07-29 17:22:05 +02:00
Alina Beck
355c7c764c remove social media from user resolver 2019-07-29 17:20:36 +02:00
Alina Beck
0e1abad123 adjust social media types to fit new definition 2019-07-29 17:19:13 +02:00
Alina Beck
ab3fea19d5 add SocialMedia model 2019-07-29 17:17:18 +02:00
Alina Beck
4f068116b9 add social media permissions in middleware 2019-07-29 17:16:40 +02:00
Alina Beck
0439b4407b remove social media validations from middleware 2019-07-29 17:16:05 +02:00
Matt Rider
3e43539e23 Set up some backend tests for emotions 2019-07-29 17:08:07 +02:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media 
🍰 Refine social media
 2019-07-29 16:08:08 +02:00
Matt Rider
322ec597a3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-07-29 12:40:01 +02:00
mattwr18
ab022d6bbb
Merge pull request #1128 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.7.2 
Bump apollo-server from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:55 +02:00
mattwr18
82c515d84f
Merge pull request #1127 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:37 +02:00
Wolfgang Huß
86777a0a2d
Merge pull request #936 from Human-Connection/760_post-author-last-active 
Add details to contribution form
 2019-07-29 11:13:49 +02:00
Wolfgang Huß
1a1ab418a3 Fix tests and change variable names 2019-07-29 11:01:15 +02:00
Wolfgang Huß
3a153c47c2
Merge pull request #956 from Human-Connection/906-maintenace-mode 
Maintenance service to support maintenance mode
 2019-07-29 10:50:52 +02:00
Wolfgang Huß
fbe304685a
Merge pull request #1132 from Human-Connection/gitignore-ssh-directory 
Gitignore ssh directory
 2019-07-29 10:06:16 +02:00
mattwr18
814421a864
Merge pull request #1131 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.17 
Bump cookie-universal-nuxt from 2.0.16 to 2.0.17 in /webapp
 2019-07-29 09:29:39 +02:00
mattwr18
c2e69bd564
Merge pull request #1130 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.14.0 
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend
 2019-07-29 09:28:57 +02:00
mattwr18
0183788eb5
Merge pull request #1129 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.14.0 
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /webapp
 2019-07-29 09:28:28 +02:00
dependabot-preview[bot]
31d093ed47
Bump apollo-server from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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@2.7.0...apollo-server@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 07:26:46 +00:00
Matt Rider
3d7d735418 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 2019-07-29 09:26:08 +02:00
mattwr18
0cd929645e
Merge pull request #1126 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.7.2 
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend
 2019-07-29 09:24:23 +02:00
mattwr18
bd5d6829ff
Merge pull request #1118 from Human-Connection/dependabot/docker/backend/node-12.7-alpine 
Bump node from 12.6-alpine to 12.7-alpine in /backend
 2019-07-29 09:22:31 +02:00
mattwr18
0e9015e5ea
Merge pull request #1116 from Human-Connection/dependabot/docker/webapp/node-12.7-alpine 
Bump node from 12.6-alpine to 12.7-alpine in /webapp
 2019-07-29 09:22:02 +02:00
mattwr18
2a47ccd18a
Merge pull request #1115 from Human-Connection/increase_neo4j_space 
Give more space to neo4j-data
 2019-07-29 09:19:34 +02:00
mattwr18
8b4fd02398
Merge pull request #1114 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.6.3 
Bump metascraper-video from 4.10.2 to 5.6.3 in /backend
 2019-07-29 09:18:47 +02:00
mattwr18
10841626ef
Merge pull request #1113 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.20.0 
Bump helmet from 3.19.0 to 3.20.0 in /backend
 2019-07-29 09:18:02 +02:00
Matt Rider
6ba550f198 Make page mobile responsive, use styleguide font 2019-07-29 09:13:38 +02:00
Matt Rider
733d3333c9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 906-maintenace-mode 2019-07-29 08:52:10 +02:00
Matt Rider
19b2b7a491 Reset branch to master, copy changes to ContributionForm in 2019-07-29 08:45:58 +02:00
Matt Rider
08504ad2ff Gitignore ssh directory 2019-07-29 08:36:16 +02:00
dependabot-preview[bot]
0b9b42a8f2
Bump cookie-universal-nuxt from 2.0.16 to 2.0.17 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.16 to 2.0.17.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.16...v2.0.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:31:01 +00:00
dependabot-preview[bot]
8deee89c7e
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.13.6 to 22.14.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.13.6...v22.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:30:56 +00:00
dependabot-preview[bot]
b021437a7e
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.13.6 to 22.14.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.13.6...v22.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:30:17 +00:00
dependabot-preview[bot]
f2e20db838
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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.7.0...apollo-server-testing@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:29:19 +00:00
dependabot-preview[bot]
137a761f90
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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-express@2.7.0...apollo-server-express@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:28:13 +00:00
dependabot-preview[bot]
b0bde9f73e
Bump node from 12.6-alpine to 12.7-alpine in /backend 
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:08 +00:00
dependabot-preview[bot]
d4cce87e91
Bump neo4j from 3.5.5 to 3.5.8 in /neo4j 
Bumps neo4j from 3.5.5 to 3.5.8.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:07 +00:00
dependabot-preview[bot]
5380e74887
Bump node from 12.6-alpine to 12.7-alpine in /webapp 
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:06 +00:00
Robert Schäfer
9fcc5202d1 Give more space to neo4j-data 2019-07-25 15:34:43 +02:00
dependabot-preview[bot]
b2bdc0b683
Bump metascraper-video from 4.10.2 to 5.6.3 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 4.10.2 to 5.6.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v4.10.2...v5.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-25 04:30:26 +00:00
dependabot-preview[bot]
f21aded626
Bump helmet from 3.19.0 to 3.20.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.19.0 to 3.20.0.
- [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.19.0...v3.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-25 04:29:54 +00:00
ogerly
0c75d6e089 Fix commit 2019-07-24 16:03:10 +02:00
ogerly
77f45c1508 esoolved comments @tirokk 2019-07-24 15:35:08 +02:00
mattwr18
6dbbd36c6f
Merge pull request #1102 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.6.3 
Bump metascraper-image from 4.10.2 to 5.6.3 in /backend
 2019-07-24 14:39:41 +02:00
mattwr18
1e21091c96
Merge pull request #1111 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.3 
Bump date-fns from 2.0.0-beta.2 to 2.0.0-beta.3 in /webapp
 2019-07-24 10:21:07 +02:00
mattwr18
485b961637
Merge pull request #1106 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.3 
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.3 in /backend
 2019-07-24 10:20:48 +02:00