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

8714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lokalise-bot
d21881e8eb Lokalise: update of webapp/locales/de.json 2020-02-19 10:27:52 +01:00
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null 
fix(subscriptions): Don't publish undefined
 2020-02-19 09:47:38 +01:00
mattwr18
90dfe32080
Merge pull request #3077 from Human-Connection/dependabot/npm_and_yarn/webapp/yarn-1.22.0 
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp
 2020-02-19 09:35:42 +01:00
dependabot-preview[bot]
132029460a
build(deps): [security] bump yarn from 1.17.3 to 1.22.0 in /webapp 
Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.17.3 to 1.22.0. **This update includes a security fix.**
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/compare/v1.17.3...v1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-18 23:41:00 +00:00
Robert Schäfer
65649aa0eb
Merge pull request #3003 from Human-Connection/normalize-locale-files 
feat: Normalize locales/json files
 2020-02-19 00:39:15 +01:00
mattwr18
a346632fff Avoid running cypher statement if not needed 
- it just feels safer to not run a cypher statement if there is no user
  in the idsOfUsers array. Why risk notifications pointing to empty
nodes? It doesn't seem like this happens, but I'm not sure how to write
a test to verify, and why run cypher statements, if there is no need to?
 2020-02-18 23:19:14 +01:00
Robert Schäfer
523f6915de
Merge pull request #2585 from Human-Connection/1188-Delete_teaser_image 
🍰feat: Delete teaser image
 2020-02-18 22:50:33 +01:00
mattwr18
54caaaaa0a Remove unnecessary guard clause 
- filter returns an empty array, and no notification is created if
  idsOfUsers is an empty array
 2020-02-18 22:43:19 +01:00
mattwr18
7fe6fb110b Remove unnecessary negation of negation, refactor 
- tests to use `toMatchObject`, which checks that only one notification
  is indeed created
 2020-02-18 22:21:49 +01:00
Moriz Wahl
05424f49b4 locales are normalized 2020-02-18 19:16:30 +01:00
mattwr18
44652a34a7 Merge in master/refactor 
- Add cypress test for DeleteImage
- remove unnecessary ref and function call
- use tokens
- simplify logic to showDeleteImageButton
- emit event when cropInProgress
 2020-02-18 18:50:02 +01:00
Moriz Wahl
934c9906cc sorting keys, comparing de and en locales, yarn run locales 2020-02-18 18:07:57 +01:00
Moriz Wahl
3a33430298 path set correctly for subfolder of translation scripts 2020-02-18 18:07:57 +01:00
roschaefer
069e67f942 chore(ci): Check missing translations keys 2020-02-18 18:07:57 +01:00
Moriz Wahl
fa906efb1f locales sorted. 2020-02-18 18:07:57 +01:00
roschaefer
9011f922bb refactor(ci): Move translations to scripts/ folder 
And refactor the script a little
 2020-02-18 18:05:28 +01:00
Moriz Wahl
d9fcc9f720 Basic script to normalize the locale files and check if those files are normalized 
To Do: Check if keys in en.json and de.json are the same
Check dependencies (jq must be installed)
Where to place the file?
Add test to travis? How?
 2020-02-18 18:05:28 +01:00
Robert Schäfer
b003fb3f10
Merge pull request #2589 from Human-Connection/2587-geolocation-swap-lng-with-lat 
fix: swap lat and lng
 2020-02-18 17:55:57 +01:00
Alina Beck
a7c9337692
Merge pull request #3102 from Human-Connection/fix-avatar-background 
fix(frontend): avatar image covers full circle
 2020-02-18 17:34:41 +01:00
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined 
Fix #3088
 2020-02-18 16:25:11 +01:00
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +01:00
mattwr18
44d503c53c
Merge pull request #3090 from Human-Connection/2202_do_not_encode_the_entire_user_in_bearer_token 
fix(jwt): Whitelist encoded JWT attributes
 2020-02-18 14:37:15 +01:00
mattwr18
708edc06a3
Merge pull request #3056 from Human-Connection/3054-add-e2e-tests-image-uploader 
test: Write cypress tests for ImageUploader
 2020-02-18 14:31:49 +01:00
Moriz Wahl
5b41561cc4 throw error added to template 2020-02-18 14:16:46 +01:00
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
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
mattwr18
6d635bac1d Wait for category to be created 2020-02-17 12:41:46 +01: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
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