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

7533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
1e85cbb6a2 Refactor shout/unshout mutations 
- Remove unrecommended auto-commit transactions from code base
- Favor transaction functions
 2019-12-11 19:01:29 +01:00
mattwr18
18ab7186f5 Favor transaction functions over auto-commit 2019-12-11 18:53:08 +01:00
mattwr18
b1c5c4dbf9 Avoid testing third-party code 
- This test, though I understand why it was added, is not necessary in
my opinion. It's more difficult to get this test to pass since we don't
call session.run, we call session.writeTransaction which has a callback
that calls transaction.run...
- I think we don't need to test that our third party library does what
it was added to do... they have their own tests, which can be found here
@roschaefer, which I think are sufficient https://github.com/validatorjs/validator.js/blob/master/test/sanitizers.js
- We can always add another type of test, if you feel necessary, maybe
an e2e?
 2019-12-11 18:44:01 +01:00
mattwr18
3c6932e21a Update passwordReset resolver/spec 2019-12-11 18:43:36 +01:00
mattwr18
d39e702e70 Update exisitingEmailAddress 2019-12-11 18:19:40 +01:00
mattwr18
b583b02fb4 Update createPasswordReset helper function 
- the test is broken, can you have a look @roschaefer??
- I tried to get it to work, but it's complicated with multiple
promises... I'm ok if we remove this test as well as it's only testing
that normalizeEmail works as it's supposed to... but that hopefully is
tested on the side of the validator library
 2019-12-11 17:57:25 +01:00
mattwr18
c871ec2632 Refactor validationMiddleware 2019-12-11 16:29:20 +01:00
mattwr18
cc0a33ec7d Use transaction function in isUniqueFor 2019-12-11 13:26:18 +01:00
mattwr18
73a5b394d6 Refactor isAuthor to use transaction function 2019-12-11 12:56:49 +01:00
mattwr18
ca9c58c06b Add errors undefined to tests 
- helps with debugging
 2019-12-11 12:50:46 +01:00
mattwr18
760fd01715 Finish refactor of notifications resolver 2019-12-11 11:06:44 +01:00
mattwr18
79d23cc6de Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2412-favor-transaction-function 2019-12-11 10:56:42 +01:00
Robert Schäfer
5e8bc4ad04
Merge pull request #2453 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.7.5 
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5
 2019-12-11 10:08:44 +01:00
Robert Schäfer
dc95007563
Merge pull request #2489 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.5.1 
build(deps-dev): bump cypress-file-upload from 3.5.0 to 3.5.1
 2019-12-11 10:07:59 +01:00
Robert Schäfer
87571ff453
Merge pull request #2490 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.0 
build(deps): bump cookie-universal-nuxt from 2.0.19 to 2.1.0 in /webapp
 2019-12-11 10:07:38 +01:00
dependabot-preview[bot]
50a20141cf
build(deps): bump cookie-universal-nuxt from 2.0.19 to 2.1.0 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.19 to 2.1.0.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.19...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 04:22:47 +00:00
dependabot-preview[bot]
b48c132451
build(deps-dev): bump cypress-file-upload from 3.5.0 to 3.5.1 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.5.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 04:20:40 +00:00
mattwr18
cf7b5851c3
Merge pull request #2483 from Human-Connection/update-to-version-0.1.12 
Update to version 0.1.12
 2019-12-10 20:59:19 +01:00
mattwr18
0f2900b89f Update to version 0.1.12 2019-12-10 20:04:29 +01:00
mattwr18
f29898f7fe v0.1.12 2019-12-10 20:04:10 +01:00
mattwr18
a348c5dc9c
Merge pull request #2482 from Human-Connection/fix_no_comments_visible 
Show the comments again
 2019-12-10 19:59:04 +01:00
mattwr18
950f33f637
Merge pull request #2470 from Human-Connection/improve_notification_query_performance 
Improve notification query performance by reducing db calls
 2019-12-10 19:26:05 +01:00
Robert Schäfer
032242ac7c
Merge pull request #2481 from Human-Connection/fix_cannot_read_post_of_undefined 
Fix `Cannot read 'Post' of undefined`
 2019-12-10 19:04:12 +01:00
roschaefer
5e53a155be Show the comments again 
@alina-beck the CSS class `.ds-card-footer` gets in the way of the
`overflow: hidden` from the styleguide. The scoping avoids the issue.

Of course this is not a great solution and the whole file needs to be
refactored and fixed. I also see a lot of `<div>`s with a style
attribute. All of that is legacy code that survived for too long.
 2019-12-10 18:53:40 +01:00
mattwr18
2eb0f77a2c
Merge pull request #2480 from Human-Connection/fix_deployment_docker_push_script 
Hope to fix our deployment with explicit call of `bash`
 2019-12-10 18:18:36 +01:00
roschaefer
cc7cd6b8b0 Fix backend tests 2019-12-10 18:13:34 +01:00
mattwr18
4f0df2f28f Remove disable from query request 
- we removed it, prevent null pointer error
 2019-12-10 18:09:32 +01:00
mattwr18
0a50a02f88 Follow @roschaefer suggestion/remove guard clauses 2019-12-10 18:09:32 +01:00
mattwr18
12236c9324 Convert to transaction function/refactor 
- update incorrect variables
 2019-12-10 18:09:32 +01:00
roschaefer
deefc4e12f Improve notification query performance 
Just don't ask for stuff that you don't want to show anyways
 2019-12-10 18:09:32 +01:00
roschaefer
3beef5e3fb Reduce database statements in notifications 2019-12-10 18:09:32 +01:00
roschaefer
b2ccc1b61e Better debugging 2019-12-10 18:09:32 +01:00
roschaefer
1a852ebfab Fix Cannot read 'Post' of undefined 2019-12-10 17:53:54 +01:00
mattwr18
84edde273d
Merge pull request #2467 from Human-Connection/revert-layout-changes-imageAspectRatio 
Revert layout changes image aspect ratio
 2019-12-10 17:41:53 +01:00
roschaefer
7457e677b2 Hope to fix our deployment with explicit bash 
We should have been wary after seeing the version tags in the same loop as the
`latest` tag.
 2019-12-10 16:10:54 +01:00
mattwr18
4293fb845b
Merge pull request #2472 from Human-Connection/quickfix_for_nullpointer_error_in_user_vue 
Quick fix for null pointer error in User.vue
 2019-12-10 15:51:11 +01:00
mattwr18
da169d5d14 Revert changes to test 2019-12-10 15:40:03 +01:00
mattwr18
fb4f487abd Revert layout changes for imageAspectRatio 
- we still add the imageAspectRatio for new posts, but we don't do
anything with the layout until we figure out how to add
imageAspectRatios for every post with an image in the database without
causing a big downtime
 2019-12-10 15:40:03 +01:00
Robert Schäfer
1b787d7687
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount 
Checkbox 'no comercial + no political account' add to creat user account
 2019-12-10 15:21:40 +01:00
dependabot-preview[bot]
ea32cfb897
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-10 13:46:35 +00:00
mattwr18
bc6b1c1a8c
Merge pull request #2421 from Human-Connection/remove-data-test-attributes-in-production 
Remove data-test attriubutes in non-dev env
 2019-12-10 14:44:34 +01:00
mattwr18
19b4fcd9c6
Merge pull request #2452 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.7.6 
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6
 2019-12-10 14:41:36 +01:00
mattwr18
b232b038ec
Merge pull request #2455 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.7.6 
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /backend
 2019-12-10 14:41:18 +01:00
mattwr18
097afbf764
Merge pull request #2458 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.5 
build(deps-dev): bump @babel/cli from 7.7.4 to 7.7.5 in /backend
 2019-12-10 14:41:01 +01:00
mattwr18
9703066699 Rename prop name following @roschaefer suggestion 
- missed in previous PR
 2019-12-10 14:37:05 +01:00
mattwr18
1d7a728ea3
Merge pull request #2473 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.10.2 
build(deps): bump @sentry/node from 5.10.1 to 5.10.2 in /backend
 2019-12-10 14:30:25 +01:00
mattwr18
2633597f7d
Merge pull request #2474 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-import-2.19.1 
build(deps-dev): bump eslint-plugin-import from 2.18.2 to 2.19.1 in /backend
 2019-12-10 14:29:42 +01:00
mattwr18
a9cfd25c2a
Merge pull request #2475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.3.0 
build(deps-dev): bump css-loader from 3.2.1 to 3.3.0 in /webapp
 2019-12-10 14:29:21 +01:00
mattwr18
06163e85fe
Merge pull request #2477 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.19.1 
build(deps-dev): bump eslint-plugin-import from 2.18.2 to 2.19.1 in /webapp
 2019-12-10 14:29:04 +01:00
mattwr18
ce659b8c56 Merge branch 'master' of github.com:Human-Connection/Human-Connection into quickfix_for_nullpointer_error_in_user_vue 2019-12-10 14:28:10 +01:00