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

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
1b62dc3b2e Remove sequence for slug as it's not needed 2020-02-18 13:40:48 +01:00
mattwr18
6f6b1534df Reload page to add Category button 
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
 2020-02-18 13:33:34 +01:00
roschaefer
e41a639cf1 fix(jwt): Encode only 3 attributes in JWT 
This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
 2020-02-18 11:23:04 +01:00
Robert Schäfer
e35ca59fbc
Merge pull request #3092 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.2.1 
build(deps-dev): bump eslint-plugin-vue from 6.1.2 to 6.2.1 in /webapp
 2020-02-18 11:17:13 +01:00
mattwr18
0f74273b5b Let post factory create default category 
- since we have factories that ensure a post has a category created, we
  don't need extra code to create a category before the post
 2020-02-18 10:36:34 +01:00
Alina Beck
e68b53eda2 add title to counter icons on PostTeaser 2020-02-18 10:25:42 +01:00
mattwr18
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
mattwr18
492427554b
Merge pull request #3087 from Human-Connection/try_fix_build_server 
build: Fix intermittent failing tests
 2020-02-18 09:38:36 +01:00
dependabot-preview[bot]
ea6856310f
build(deps-dev): bump eslint-plugin-vue from 6.1.2 to 6.2.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.2...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 04:20:05 +00:00
roschaefer
6bba756856 Fix seeds, don't create additional categories 2020-02-18 00:30:53 +01:00
roschaefer
2ca4939ef0 Refactor: Don't use async/await in cypress 2020-02-18 00:30:53 +01:00
mattwr18
0fa96fb537
Merge pull request #3089 from Human-Connection/fix_websocket_configuration_at_runtime 
fix(nuxt-env): Configuration issue with websockets
 2020-02-18 00:25:11 +01:00
roschaefer
2e19cf6592 fix(nuxt-env): Configuration issue with websockets 
After some intensive debugging I found out that `req` (on the server)
and `nuxtState` (on the client) have access to the configurations
changed at runtime.

How did I debug it:
```
yarn run build
env WEBSOCKET_URI=whatever yarn run start
```
I also put a `console.log` into `plugins/apollo-client.js`.
 2020-02-17 23:30:50 +01:00
mattwr18
1ca8a7fc86 Fix other syntax error :doh: 2020-02-17 21:23:49 +01:00
mattwr18
119e542e86 Fix syntax error 2020-02-17 20:51:13 +01:00
mattwr18
a2f78462d2 Use promise for creating category 2020-02-17 20:23:09 +01:00
mattwr18
54af884e50 Log out before logging in as other user 2020-02-17 18:38:51 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
abdellani
e3c95cbbf5 fixes linter error 2020-02-17 15:04:16 +01:00
mattwr18
6d635bac1d Wait for category to be created 2020-02-17 12:41:46 +01:00
Alina Beck
2510643361 improve mobile-responsiveness of BaseCard, following @mattwr18 suggestions 2020-02-17 10:56:07 +01:00
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00
dependabot-preview[bot]
b00be68347
build(deps): bump @nuxtjs/sentry from 3.2.3 to 3.2.4 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.2.3 to 3.2.4.
- [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.2.3...v3.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 04:30:09 +00:00
mattwr18
7ce40b3b37 Fix cypress test 2020-02-14 20:44:39 +01:00
mattwr18
d8d1db389a Follow @roschaefer PR review suggestions 
- create mapping for expectedValues in post.js
- check from image/jpeg and compress, if not just pass to backend as is
 2020-02-14 19:49:00 +01:00
Wolfgang Huß
ba3cfa8e04 Set sensible report properties to moderators only in the permissionsMiddleware 2020-02-14 16:52:51 +01:00
mattwr18
6ea2f3c8a9
Merge pull request #3029 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /backend
 2020-02-14 11:28:18 +01:00
mattwr18
3d64700ce1
Merge pull request #3073 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.2 
build(deps): bump cookie-universal-nuxt from 2.1.1 to 2.1.2 in /webapp
 2020-02-14 09:29:48 +01:00
mattwr18
8b5935a0b1
Merge pull request #3072 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.2.3 
build(deps): bump @nuxtjs/sentry from 3.2.2 to 3.2.3 in /webapp
 2020-02-14 09:28:43 +01:00
mattwr18
ffa06b6678
Merge pull request #3067 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.11.1 
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend
 2020-02-14 09:27:34 +01:00
dependabot-preview[bot]
62d4947dd8
build(deps): bump cookie-universal-nuxt from 2.1.1 to 2.1.2 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.1...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:23:49 +00:00
dependabot-preview[bot]
4fae9191c1
build(deps): bump @nuxtjs/sentry from 3.2.2 to 3.2.3 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.2.2 to 3.2.3.
- [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.2.2...v3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:23:15 +00:00
dependabot-preview[bot]
b93ed8dc1b
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [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.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:52 +00:00
dependabot-preview[bot]
665f66f523
build(deps): bump metascraper-audio from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [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.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:26 +00:00
mattwr18
07f087c20d
Merge pull request #3060 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-loader-15.9.0 
build(deps-dev): bump vue-loader from 15.8.3 to 15.9.0 in /webapp
 2020-02-13 08:58:18 +01:00
dependabot-preview[bot]
5a50a88714
build(deps-dev): bump vue-loader from 15.8.3 to 15.9.0 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.8.3 to 15.9.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.8.3...v15.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-13 04:19:42 +00:00
abdellani
cd62bb457b Removes popover menu 2020-02-13 00:46:50 +01:00
mattwr18
26a1715dd1
Merge pull request #3049 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.13 
build(deps-dev): bump @storybook/addon-actions from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 20:19:29 +01:00
mattwr18
156410b376
Merge pull request #3042 from Human-Connection/2887-refactor-login-step 
refactor(cypress): Speed up builds, avoid login through UI
 2020-02-12 18:57:51 +01:00
dependabot-preview[bot]
f9829e573d
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.12 to 5.3.13.
- [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.3.13/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 17:04:41 +00:00
mattwr18
50ec01d718
Merge pull request #1705 from Human-Connection/1703-add-vue-apollo-subsriptions 
feat: 🍰 Set up Vue-Apollo Subscriptions
 2020-02-12 18:02:05 +01:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader 
- have I missed any important features? too many tests?
 2020-02-12 17:53:38 +01:00
Robert Schäfer
c9d53214ad
Merge pull request #3053 from Human-Connection/fix-issue-template-with-icon 
fix: Update devops_ticket.md
 2020-02-12 16:24:45 +01:00
mattwr18
4391915611 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-12 16:14:05 +01:00
roschaefer
d11e79854c Add jsonwebtoken to development dependencies 2020-02-12 15:54:22 +01:00
mattwr18
9e71855b60
Update devops_ticket.md 2020-02-12 15:45:06 +01:00
Robert Schäfer
544b64442a
Merge pull request #3048 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.13 
build(deps-dev): bump @storybook/addon-notes from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 13:26:28 +01:00
Robert Schäfer
4048b427fd
Merge pull request #3050 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.13 
build(deps-dev): bump @storybook/addon-a11y from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 13:26:01 +01:00
mattwr18
b4fe3de4bb
Merge pull request #3041 from Human-Connection/node_v13_compatiblity 
build(deps): Node v13 compatbility
 2020-02-12 11:40:36 +01:00
dependabot-preview[bot]
5d8d4d7955
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 09:53:35 +00:00