ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,462 Commits 113 Branches 1,511 Tags
Commit Graph

8462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
roschaefer
fa0e64b7cb Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 
There was a single step definition that created a post and a comment. I
would say let's put that in two different steps.
 2020-02-01 13:33:07 +01:00
dependabot-preview[bot]
367084155b
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /webapp (#2939) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 18:29:10 +01:00
mattwr18
4170e62f7a
Merge pull request #2608 from Human-Connection/1680-Direct_answer_on_Comment 
feat: 🍰 Direct Reply On Comment
 2020-01-31 16:30:29 +01:00
mattwr18
987d01f88c
Merge pull request #2938 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.8.4 
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend
 2020-01-31 15:47:30 +01:00
mattwr18
6a60c5639f
Merge pull request #2930 from Human-Connection/2929-fix-deploy-script 
fix: deploy script with new naming convention
 2020-01-31 14:46:12 +01:00
mattwr18
ce42b2b8e9 Update cypress test casing 2020-01-31 14:45:27 +01:00
dependabot-preview[bot]
e3447d0776
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 13:27:08 +00:00
mattwr18
befbe83680
Merge pull request #2940 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend
 2020-01-31 14:25:09 +01:00
mattwr18
9f198f4849
Merge pull request #2934 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.8.4 
build(deps-dev): bump @babel/cli from 7.8.3 to 7.8.4 in /backend
 2020-01-31 14:03:00 +01:00
mattwr18
c8c71a52c6 Follow @Tirokk PR review suggestions 
- Favor lowercase for words in a sentence after the first
- Use exclamation marks for successful actions that use a toastr
- place events at the end of the list on components
- place class above events
- it would be nice to come to a consensus based on best practices, like
  I had a doubt and places the class definition below the props, is that
what others do?
 2020-01-31 13:09:37 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
dependabot-preview[bot]
a1625b47ec
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 11:44:14 +00:00
mattwr18
a1bd16e6bb
Merge pull request #2935 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.8.4 
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4
 2020-01-31 12:42:26 +01:00
mattwr18
44250d2f66
Merge pull request #2932 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp
 2020-01-31 12:42:06 +01:00
dependabot-preview[bot]
42bc556185
build(deps-dev): bump @babel/cli from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:35 +00:00
dependabot-preview[bot]
d5b664ece4
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:28 +00:00
dependabot-preview[bot]
16bec1a33e
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:43:40 +00:00
mattwr18
9827cfcf75
Merge pull request #2937 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.9.4 
build(deps): bump @nuxtjs/axios from 5.9.3 to 5.9.4 in /webapp
 2020-01-31 08:43:06 +01:00
mattwr18
bed8a1f015
Merge pull request #2936 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.8.4 
build(deps-dev): bump @babel/node from 7.8.3 to 7.8.4 in /backend
 2020-01-31 08:42:28 +01:00
mattwr18
acd2b020d3
Merge pull request #2933 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4
 2020-01-31 08:41:48 +01:00
dependabot-preview[bot]
30e77c38ec
build(deps): bump @nuxtjs/axios from 5.9.3 to 5.9.4 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.3 to 5.9.4.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.3...v5.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:28 +00:00
dependabot-preview[bot]
45e3adc6ca
build(deps-dev): bump @babel/node from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:17 +00:00
dependabot-preview[bot]
e227d21054
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:20:33 +00:00
mattwr18
87b58bcf9c Fix deploy script with new naming convention 2020-01-30 13:40:30 +01:00
mattwr18
b47f46157c
Merge pull request #2714 from Human-Connection/1724-block-users 
feat: Blocked users cannot comment on posts
 2020-01-30 11:39:03 +01:00
dependabot-preview[bot]
f22d36dd21
build(deps): bump @sentry/node from 5.11.1 to 5.11.2 in /backend (#2927) 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.11.1 to 5.11.2.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.11.1...5.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 11:37:00 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
16185ce03e
Merge pull request #2925 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.1 
build(deps): bump cookie-universal-nuxt from 2.1.0 to 2.1.1 in /webapp
 2020-01-30 09:40:06 +01:00
mattwr18
1af53fe493
Merge pull request #2928 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.1.0 
build(deps): bump @nuxtjs/sentry from 3.0.1 to 3.1.0 in /webapp
 2020-01-30 08:40:52 +01:00
dependabot-preview[bot]
00a644996f
build(deps): bump @nuxtjs/sentry from 3.0.1 to 3.1.0 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.1...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 04:18:54 +00:00
mattwr18
de605c1d7d
Merge pull request #2899 from Human-Connection/open-source-bounties 
docs(CONTRIBUTING): Add open-source bounty program
 2020-01-29 20:43:57 +01:00
mattwr18
10d84dc388
Merge pull request #2926 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.10.0 
build(deps-dev): bump eslint-config-prettier from 6.9.0 to 6.10.0 in /webapp
 2020-01-29 20:43:01 +01:00
dependabot-preview[bot]
01aa015960
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 09:03:48 +00:00
mattwr18
6cd10d78be
Merge pull request #2924 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.9 
build(deps): bump graphql-shield from 7.0.8 to 7.0.9 in /backend
 2020-01-29 10:01:35 +01:00
mattwr18
de52994b0c
Merge pull request #2923 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.10.0 
build(deps-dev): bump eslint-config-prettier from 6.9.0 to 6.10.0 in /backend
 2020-01-29 10:01:13 +01:00
dependabot-preview[bot]
277fd4d9dd
build(deps): bump cookie-universal-nuxt from 2.1.0 to 2.1.1 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.0...v2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:21:36 +00:00
dependabot-preview[bot]
4b0adf3eeb
build(deps): bump graphql-shield from 7.0.8 to 7.0.9 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.8 to 7.0.9.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.8...v7.0.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:20:19 +00:00
dependabot-preview[bot]
cc6daa9bb9
build(deps-dev): bump eslint-config-prettier in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 04:19:42 +00:00
roschaefer
910f122087 Fix lint and cypress 2020-01-29 02:02:58 +01:00
roschaefer
f9c42ab2a5 refactor(seeds): Use buildList to setup lists 2020-01-28 23:40:41 +01:00
roschaefer
fc367297e3 Get rid of different factory files 
..and fix some cypress tests
 2020-01-28 23:12:50 +01:00
roschaefer
2fc71d75a5 Refactor factory for comments 2020-01-28 22:43:27 +01:00
roschaefer
95bfb090fd Refactor factory for posts 2020-01-28 22:43:26 +01:00
roschaefer
3d1a964120 Add missing dependency rosie for cypress tests 2020-01-28 22:43:26 +01:00
roschaefer
094fa196e6 Fix factories for cypress tests 2020-01-28 22:43:26 +01:00
roschaefer
2a79c53765 Refactor user factory 2020-01-28 22:43:26 +01:00
roschaefer
63939fa9e0 Refactor all dependencies without dependencies 2020-01-28 22:43:26 +01:00
roschaefer
ee5a2349c0 build(deps): Add rosie for factories 
Why have I not seen this before?
 2020-01-28 22:43:26 +01:00
Robert Schäfer
65811e2d8b
Merge pull request #2898 from Human-Connection/add_underline_menu_button 
feat(editor): Underline markup for posts+comments
 2020-01-28 22:34:30 +01:00