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

7796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
4c93f65ef4 arrrr* forget to save textfiles :| 2019-12-13 09:17:12 +01:00
ogerly
556adf2e37 final polish :) 2019-12-13 09:02:22 +01:00
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
dependabot-preview[bot]
55b53bc0b7
build(deps-dev): bump cypress from 3.7.0 to 3.8.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.7.0...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 04:17:25 +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
lokalise-bot
60b3035a3d Lokalise: update of locale/ru.json 2019-12-12 21:23:21 +01:00
mattwr18
fd1e2c91fd Refactor to consolidate UpdateUser mutations 2019-12-12 18:48:56 +01:00
mattwr18
d375ebe7d9 Write test/refactor tests/resolvers/middleware 
- write tests for userMiddleware
- checks the functionality of nodes/locations middleware
- refactor to not allow users to update to remove their name
  debatable whether we want that or not, but we do not allow users to
create accounts with no name, so we should be consistent, before we were
using neode to validate this, but we have are removing neode from
production code, so we must validate ourselves
- collate UpdateUser mutations to one
 2019-12-12 18:14:47 +01:00
mattwr18
3e15ecdfa2 Refactor tests, extract validation to middleware 2019-12-12 14:25:28 +01:00
mattwr18
8a93e402b9 Remove neode update from production code 
- Favor transaction functions we have more control over
 2019-12-12 14:24:43 +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
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
ogerly
a30a7ac8b0 mounted removed and everything put on blurImage 2019-12-12 09:44:45 +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
mattwr18
6903a6cc71 Favor transaction functions even for seeds 2019-12-11 19:38:39 +01:00
mattwr18
53791c83e8 Favor transaction functions in login mutation 2019-12-11 19:31:50 +01:00
mattwr18
d38131e24a Refactor to use transaction functions/logging 2019-12-11 19:27:37 +01:00
mattwr18
6ef9ca3343 Refactor to use readTransaction 2019-12-11 19:09:38 +01:00
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
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
mattwr18
c871ec2632 Refactor validationMiddleware 2019-12-11 16:29:20 +01: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
mattwr18
cc0a33ec7d Use transaction function in isUniqueFor 2019-12-11 13:26:18 +01:00
Erhardt Stiefel
eceae24683
Update fr.json 2019-12-11 13:10:17 +01:00
mattwr18
73a5b394d6 Refactor isAuthor to use transaction function 2019-12-11 12:56:49 +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
mattwr18
ca9c58c06b Add errors undefined to tests 
- helps with debugging
 2019-12-11 12:50:46 +01:00
Erhardt Stiefel
aed15f0be9
Update de.json 
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Daten löschen", to "name": "Benutzerkonto löschen", to solve the bug
 2019-12-11 12:28:41 +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
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
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
ogerly
0f3e4673ba clear css 2019-12-11 10:37:08 +01:00
ogerly
46db785550 fix lint, fix test 2019-12-11 10:33:10 +01:00
dependabot-preview[bot]
232787d412
build(deps): bump node from 13.1.0-alpine to 13.3.0-alpine in /webapp 
Bumps node from 13.1.0-alpine to 13.3.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 09:14:16 +00:00