ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,831 Commits 117 Branches 1,511 Tags
Commit Graph

5831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
588ccfb08b
Merge pull request #1592 from Human-Connection/fix_docker_push_script 
Fix deployment script for docker images
 2019-09-16 13:03:53 +02:00
Vasily Belolapotkov
9b970dae15 refactor follow resolver spec 2019-09-16 13:54:00 +03:00
mattwr18
70c72e8f95 Remove deleted/disabled/createdAt from Comment mutations 2019-09-16 12:35:14 +02:00
roschaefer
4be3e2a0d0 Fix missing images on staging 2019-09-16 11:41:50 +02:00
Wolfgang Huß
22a005eb1c Show categories translated in all places and even in tooltips 
Show `#` symbol in front of hashtags.
Minor design changes on posts more info page.
 2019-09-16 11:14:13 +02:00
roschaefer
2948772d19 Fix deployment script for docker images 2019-09-16 10:21:44 +02:00
Wolfgang Huß
714c658844 Add hint translation to plus icon for creating posts 
- Position adjustment of the news feed plus icon in hight, because in desktop browsers it intersects the footer.
- Added shadow to plus icon on the user page.
 2019-09-16 10:20:36 +02:00
dependabot-preview[bot]
f0f6224cce
Bump @storybook/addon-actions from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.1.11 to 5.2.0.
- [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.0/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:07:16 +00:00
mattwr18
14d1932a18
Merge pull request #1591 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.0.1 
Bump @hapi/joi from 15.1.1 to 16.0.1 in /backend
 2019-09-16 09:05:56 +02:00
dependabot-preview[bot]
293b597f44
Bump metascraper-date from 5.7.0 to 5.7.4 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.7.0 to 5.7.4.
- [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/v5.7.0...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:05:28 +00:00
mattwr18
c330bb2604
Merge pull request #1588 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/dotenv-1.4.1 
Bump @nuxtjs/dotenv from 1.4.0 to 1.4.1 in /webapp
 2019-09-16 09:05:27 +02:00
dependabot-preview[bot]
210166e10f
Bump metascraper-lang from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:59 +00:00
dependabot-preview[bot]
2e2330f40f
Bump graphql from 14.5.4 to 14.5.6 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.4 to 14.5.6.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.4...v14.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:41 +00:00
mattwr18
d5cd18317f
Merge pull request #1586 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.0 
Bump @storybook/vue from 5.1.11 to 5.2.0 in /webapp
 2019-09-16 09:04:38 +02:00
dependabot-preview[bot]
dc9c27448a
Bump metascraper-soundcloud from 5.6.7 to 5.7.4 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.6.7 to 5.7.4.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:08 +00:00
dependabot-preview[bot]
54a6c34148
Bump metascraper-video from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 07:04:06 +00:00
mattwr18
7c1af36b9a
Merge pull request #1581 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.4 
Bump metascraper-description from 5.6.6 to 5.7.4 in /backend
 2019-09-16 09:03:21 +02:00
mattwr18
2d73308131
Merge pull request #1579 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.7.4 
Bump metascraper-logo from 5.6.6 to 5.7.4 in /backend
 2019-09-16 09:02:49 +02:00
mattwr18
e186502d55
Merge pull request #1577 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.7.4 
Bump metascraper-youtube from 5.6.7 to 5.7.4 in /backend
 2019-09-16 09:02:21 +02:00
mattwr18
5c7fd072b9
Merge pull request #1576 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.7.4 
Bump metascraper-url from 5.6.6 to 5.7.4 in /backend
 2019-09-16 09:01:54 +02:00
dependabot-preview[bot]
2c4c63f268
Bump @hapi/joi from 15.1.1 to 16.0.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 15.1.1 to 16.0.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v15.1.1...v16.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 04:25:30 +00:00
dependabot-preview[bot]
6c5c9722b2
Bump @nuxtjs/dotenv from 1.4.0 to 1.4.1 in /webapp 
Bumps [@nuxtjs/dotenv](https://github.com/nuxt-community/dotenv-module) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nuxt-community/dotenv-module/releases)
- [Changelog](https://github.com/nuxt-community/dotenv-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/dotenv-module/compare/v1.4.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 04:24:05 +00:00
dependabot-preview[bot]
47fa830cc9
Bump @storybook/vue from 5.1.11 to 5.2.0 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.11 to 5.2.0.
- [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.0/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 04:22:30 +00:00
dependabot-preview[bot]
8afd3f199e
Bump metascraper-description from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:31 +00:00
dependabot-preview[bot]
06dd347a08
Bump metascraper-logo from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:05 +00:00
dependabot-preview[bot]
da6029dc9b
Bump metascraper-youtube from 5.6.7 to 5.7.4 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.6.7 to 5.7.4.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:02 +00:00
dependabot-preview[bot]
e4029b4a0a
Bump metascraper-url from 5.6.6 to 5.7.4 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.4.
- [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/v5.6.6...v5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 21:50:01 +00:00
mattwr18
6f21926a76
Merge pull request #1564 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.2.1 
Bump date-fns from 2.1.0 to 2.2.1 in /webapp
 2019-09-13 23:49:09 +02:00
mattwr18
99b48429b8
Merge pull request #1562 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.7.0 
Bump metascraper-date from 5.6.6 to 5.7.0 in /backend
 2019-09-13 23:48:28 +02:00
mattwr18
a4a4722bd5
Merge pull request #1561 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.0 
Bump metascraper-title from 5.6.6 to 5.7.0 in /backend
 2019-09-13 23:47:52 +02:00
mattwr18
bec629e8ef Fix intermittent failing test 
- not concerned about the order of the notification in this test
 2019-09-13 20:51:15 +02:00
mattwr18
eff788ac7b
Merge pull request #1573 from Human-Connection/1555_import_createdAt_updatedAt_for_comments 
Fix import to add createdAt and updatedAt for comments
 2019-09-13 20:37:33 +02:00
mattwr18
d1ecac4580 Write tests to ensure createdAt is not deleted on update 
- we had a silly serious bug by overwriting all attributes at the time
of UpdatePost
- tests in place to ensure we don't accidentally delete our createdAt
attribute
 2019-09-13 20:14:47 +02:00
mattwr18
60c473bb94 Create UpdateComment resolver, update UpdateUser 
- UpdateUser should update updatedAt at point of insertion in the
database as well
 2019-09-13 20:14:47 +02:00
mattwr18
ca6ae3bd1b Remove dateTimeMiddleware 
- favor adding createdAt, updatedAt attributes at point of insertion to
the database
 2019-09-13 20:14:47 +02:00
mattwr18
16d7e6c91a Update notifications 
- create only one relationship by using merge, but do not update
createdAt attribute/update test
- order by updatedAt_desc
 2019-09-13 20:14:47 +02:00
mattwr18
67d68db231 Update post resolver to fix embarrasing bugs 
- when a user updates a post, we should not override every property in
our database with the new params, since we have read-only properties
like createdAt that we don't want to go deleting aimlessly.
 2019-09-13 20:14:47 +02:00
mattwr18
ce487f1e0f Set notifications.createdAt only at creation 
- we should not be setting it every time a notification is created
 2019-09-13 20:14:47 +02:00
roschaefer
2a3e6ad76f Alternative solution for #1494 2019-09-13 20:14:47 +02:00
dependabot-preview[bot]
6f127d6e16
Bump styleguide from 793556a to 808b3c5 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `793556a` to `808b3c5`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](793556ad19...808b3c5a95)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 14:10:33 +00:00
Robert Schäfer
6a4a96f5d5
Merge pull request #1560 from Human-Connection/github_release 
Use automatic Github releases as a CHANGELOG
 2019-09-13 16:10:20 +02:00
Robert Schäfer
9c9b7045cf
Merge pull request #1559 from Human-Connection/add_styleguide_as_submodule 
Add styleguide as submodule
 2019-09-13 16:07:41 +02:00
Robert Schäfer
f2b48da828
Merge pull request #1558 from Human-Connection/push_current_version_to_dockerhub 
Push all docker images at VERSION to dockerhub
 2019-09-13 16:06:43 +02:00
roschaefer
5555e64f0f Fix #1555 2019-09-13 13:52:54 +02:00
Alexander Friedland
193ac8e6b2
Merge pull request #1556 from Human-Connection/1503_datum_agb 
II Add Date to Terms and Conditions #1535
 2019-09-13 07:21:19 +02:00
dependabot-preview[bot]
650300bc90
Bump date-fns from 2.1.0 to 2.2.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.1.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:22:37 +00:00
dependabot-preview[bot]
0f4efb3400
Bump metascraper-date from 5.6.6 to 5.7.0 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.0.
- [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/v5.6.6...v5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:21:45 +00:00
dependabot-preview[bot]
20976b08ca
Bump metascraper-title from 5.6.6 to 5.7.0 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.6.6 to 5.7.0.
- [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/v5.6.6...v5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-13 04:21:19 +00:00
roschaefer
1273d5f2b5 Implement automatic Github releases 
I hope this will create a git tag and upload a release for us.
 2019-09-13 03:04:19 +02:00
roschaefer
f3c31aed28 Don't expose termsAndConditionsAgreedAt 
1. Don't expose `termsAndConditionsAgreedAt` as input param, because of ..why?
2. Make the `termsAndConditionsAgreedVersion` a *required* input param
   for `SignupVerification`. If new users register, they have to confirm
   the terms and conditions. I added another test to check what happens if
   the user sends `null`.
3. Sorry @ogerly for confusing you with my review here:
   https://github.com/Human-Connection/Human-Connection/pull/1556#pullrequestreview-287516516
   What I meant is that we want to simulate a user with no
   `termsAndConditionsAgreedVersion`. But of course the `variables` must
   have it set when you run the mutations. Now we have the
   exclamation mark in the input param, see point 1 ☝️
 2019-09-13 01:11:46 +02:00