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

7529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
b7ed402674
build(deps-dev): bump css-loader from 3.3.0 to 3.3.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.0 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/v3.3.2/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 04:19:44 +00:00
Robert Schäfer
692edee313
Merge pull request #2500 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.2 
build(deps): bump nodemailer from 6.4.1 to 6.4.2 in /backend
 2019-12-13 01:07:49 +01:00
Robert Schäfer
8099f717c4
Merge pull request #2491 from Human-Connection/erhardtstiefel-patch-8-1 
Update en.json
 2019-12-13 01:07:08 +01:00
Robert Schäfer
9261f03efb
Merge pull request #2493 from Human-Connection/erhardtstiefel-patch-10 
Update es.json
 2019-12-13 01:06:30 +01:00
Robert Schäfer
7bc8646954
Merge pull request #2494 from Human-Connection/erhardtstiefel-patch-11 
Update fr.json
 2019-12-13 01:05:56 +01:00
Robert Schäfer
7efaa051b4
Merge pull request #2496 from Human-Connection/erhardtstiefel-patch-12 
Update it.json
 2019-12-13 01:04:45 +01:00
dependabot-preview[bot]
40bf38085d
build(deps): bump nodemailer from 6.4.1 to 6.4.2 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.1...v6.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-12 09:48:29 +00:00
mattwr18
871c8e2aa3
Merge pull request #2499 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-2.0.2 
build(deps-dev): bump nodemon from 2.0.1 to 2.0.2 in /backend
 2019-12-12 10:48:08 +01:00
mattwr18
fd0b8d4301
Merge pull request #2498 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc19 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc18 to 4.0.0-rc19 in /webapp
 2019-12-12 10:46:48 +01:00
mattwr18
a403043f68
Merge pull request #2497 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.10.1 
build(deps): bump neo4j-graphql-js from 2.10.0 to 2.10.1 in /backend
 2019-12-12 10:46:28 +01:00
dependabot-preview[bot]
4dd0f3ae4d
build(deps-dev): bump nodemon from 2.0.1 to 2.0.2 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-12 04:19:39 +00:00
dependabot-preview[bot]
d9ca812750
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc18 to 4.0.0-rc19.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.18...v4.0.0-rc.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-12 04:19:21 +00:00
dependabot-preview[bot]
986c1e8d05
build(deps): bump neo4j-graphql-js from 2.10.0 to 2.10.1 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-12 04:19:03 +00:00
Erhardt Stiefel
65a51ea471
Update it.json 
These two lines added to give the user the chance to delete his posts and/or his comments when deleting his account, too
            "contributionsCount": "Cancellare i miei {count} messaggi",
            "commentedCount": "Cancella i miei {count} commenti",
 2019-12-11 13:30:06 +01:00
Erhardt Stiefel
eceae24683
Update fr.json 2019-12-11 13:10:17 +01:00
Erhardt Stiefel
d6442b123e
Update es.json 
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Borrar datos", to "name": "Eliminar cuenta de usuario", to solve the bug
 2019-12-11 12:56:38 +01:00
Robert Schäfer
d7fb263d1e
Merge pull request #2488 from Human-Connection/fix_docker_manifest_deploy 
Fix docker manifest on Travis CI
 2019-12-11 11:58:56 +01:00
Erhardt Stiefel
61862905be
Update en.json 
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Delete data", to "name": "Delete user account", to solve 🐛 [Bug] Misleading description on "Delete your account" #2355
 2019-12-11 11:19:07 +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
roschaefer
28352675ea Fix docker manifest on Travis CI 
So I had `DOCKER_CLI_EXPERIMENTAL=enabled` enabled by default and
couldn't reproduce the error on my machine. This time I'm pretty sure it
works as expected.
 2019-12-10 23:57:05 +01: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