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

4215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
4c9dbdb378 Refactor changePassword resolver with neode 2019-07-16 20:06:26 +02:00
Robert Schäfer
46cd21db1f Fix registration.spec 2019-07-15 19:35:07 +02:00
Robert Schäfer
b8ab7cacef Fix email filter test 2019-07-15 19:21:17 +02:00
Robert Schäfer
cec3eddcef Fix more test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
88aa8a3929 Encrypt email in JWT - fixes 2 test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
dacc3bb557 Implement fallback User.email resolver 2019-07-15 18:35:38 +02:00
Robert Schäfer
46589362fa Start to refactor User<->EmailAddress 2019-07-15 18:35:38 +02:00
Robert Schäfer
904142cf6e Create a separate node for email in data import 2019-07-15 18:35:38 +02:00
Robert Schäfer
f6bc72341f
Merge pull request #1042 from Human-Connection/fix_regression_data_import 
Fix regression of data import
 2019-07-15 17:39:15 +02:00
Robert Schäfer
417500eb3e
Merge pull request #1043 from Human-Connection/silence_codecov 
Silence codecov
 2019-07-15 17:38:42 +02:00
Robert Schäfer
f22d8072f4
Merge pull request #1046 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.1 
Bump cypress-file-upload from 3.2.1 to 3.3.1
 2019-07-15 17:37:55 +02:00
Robert Schäfer
9199458cbb
Merge pull request #1047 from Human-Connection/dependabot/npm_and_yarn/webapp/linkify-it-2.2.0 
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp
 2019-07-15 17:36:50 +02:00
Robert Schäfer
b25b5c462d
Merge pull request #1045 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.3.0 
Bump nodemailer from 6.2.1 to 6.3.0 in /backend
 2019-07-15 17:36:01 +02:00
Robert Schäfer
aa6c0efbf7
Merge pull request #1048 from Human-Connection/fix_nuxt_build_folder_file_permissions 
Sledgehammer the file permission problem on docker
 2019-07-15 17:34:02 +02:00
senderfm
8de9da0148 duplicate entry removed 2019-07-15 13:54:58 +02:00
Wolfgang Huß
ea896f8b3a
Merge pull request #1039 from Human-Connection/bugfix_email_template 
Bugfix: Signup email was missing email query param
 2019-07-15 13:35:57 +02:00
Robert Schäfer
fa024ac47a Sledgehammer the file permission problem on docker 
NuxtJS wants to write into .nuxt. If the docker container writes into
.nuxt it will have the file permissions of the docker container user
even on the host system. So on the host system you cannot remove the
folder .nuxt anymore. This gets in the way of running NuxtJS on the host
system.
 2019-07-15 13:14:40 +02:00
dependabot-preview[bot]
5360038ac0
Bump linkify-it from 2.1.0 to 2.2.0 in /webapp 
Bumps [linkify-it](https://github.com/markdown-it/linkify-it) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/markdown-it/linkify-it/releases)
- [Changelog](https://github.com/markdown-it/linkify-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/linkify-it/compare/2.1.0...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:52 +00:00
dependabot-preview[bot]
38ee22d452
Bump cypress-file-upload from 3.2.1 to 3.3.1 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.2.1 to 3.3.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.2.1...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:41 +00:00
dependabot-preview[bot]
6eea5924dc
Bump nodemailer from 6.2.1 to 6.3.0 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.2.1 to 6.3.0.
- [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.2.1...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 04:26:08 +00:00
Robert Schäfer
8a16768180 Disable codecov's PR comments 
Our fellow @Hardy-Peaceglobal already turned off Github's notifications
completely because of codecov's PR comments. I think it's more important
not to annoy open-source contributors than to have these comments.
 2019-07-14 01:45:38 +02:00
Robert Schäfer
5bde0ab036 No global codecov install, less verbose CI output 2019-07-14 01:45:38 +02:00
Robert Schäfer
43a2c502c9 Fix regression of data import 2019-07-14 01:43:44 +02:00
Robert Schäfer
1ec26ccdb5
Merge pull request #968 from Human-Connection/878-Update-of-polish-locales 
polish language on current status
 2019-07-14 00:00:14 +02:00
Robert Schäfer
0d06b78ad4
Merge pull request #1038 from Human-Connection/1037-refactor-comments-resolver-extract-out-validations 
Refactor CreateComment resolver
 2019-07-13 23:59:15 +02:00
mattwr18
4c91d8fbc5
Merge pull request #1016 from Human-Connection/277_reward_badges 
Refactor reward/unreward Badges in backend
 2019-07-13 10:08:52 -03:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
mattwr18
57ef4cfc02
Merge pull request #1034 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.9 
Bump apollo-server from 2.6.8 to 2.6.9 in /backend
 2019-07-12 17:24:32 -03:00
Robert Schäfer
2d4eec6a52 Bugfix: Signup email was missing email query param 2019-07-12 14:31:28 +02:00
Matt Rider
ba7e44a762 Refactor CreateComment resolver 
- extract out the validations for a valid comment
 2019-07-12 08:07:07 -03:00
Matt Rider
feadde3e5e Merge branch 'dependabot/npm_and_yarn/backend/apollo-server-2.6.9' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-2.6.9 2019-07-12 07:33:58 -03:00
Matt Rider
1e54b8a887 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-2.6.9 2019-07-12 07:33:36 -03:00
dependabot-preview[bot]
a8a989f176
Bump apollo-server from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.8...apollo-server@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 10:33:04 +00:00
mattwr18
bd77c8e450
Merge pull request #1029 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.9 
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend
 2019-07-12 07:30:46 -03:00
mattwr18
54a97575bb
Merge pull request #1031 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.2.1 
Bump cypress-file-upload from 3.2.0 to 3.2.1
 2019-07-12 07:30:20 -03:00
mattwr18
5959c97432
Merge pull request #1028 from Human-Connection/dependabot/npm_and_yarn/backend/wait-on-3.3.0 
Bump wait-on from 3.2.0 to 3.3.0 in /backend
 2019-07-12 07:29:56 -03:00
dependabot-preview[bot]
2b5223204f
Bump apollo-server from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.8...apollo-server@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:31:36 +00:00
dependabot-preview[bot]
0c3d661d86
Bump cypress-file-upload from 3.2.0 to 3.2.1 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:30:05 +00:00
dependabot-preview[bot]
48086ab7f8
Bump apollo-server-testing from 2.6.8 to 2.6.9 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.8...apollo-server-testing@2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:30:02 +00:00
dependabot-preview[bot]
f518da5336
Bump wait-on from 3.2.0 to 3.3.0 in /backend 
Bumps [wait-on](https://github.com/jeffbski/wait-on) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/jeffbski/wait-on/releases)
- [Commits](https://github.com/jeffbski/wait-on/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 04:29:04 +00:00
mattwr18
809d27b01a
Merge pull request #1023 from Human-Connection/dependabot/npm_and_yarn/webapp/lodash-4.17.14 
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp
 2019-07-11 11:06:56 -03:00
dependabot-preview[bot]
c648d62288
[Security] Bump lodash from 4.17.11 to 4.17.14 in /webapp 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 10:32:28 +00:00
Robert Schäfer
fe235ab603
Merge pull request #1027 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.14 
Bump lodash from 4.17.13 to 4.17.14 in /backend
 2019-07-11 12:30:24 +02:00
Robert Schäfer
e2eba389cc
Merge pull request #944 from Human-Connection/2019/kw27/data_import_emotions 
🍰 2019/kw27/data_import_emotions
 2019-07-11 12:27:48 +02:00
dependabot-preview[bot]
fb26c7aac8
Bump lodash from 4.17.13 to 4.17.14 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 06:27:18 +00:00
mattwr18
4265cd057b
Merge pull request #1022 from Human-Connection/dependabot/npm_and_yarn/webapp/lodash.template-4.5.0 
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp
 2019-07-11 00:04:10 -03:00
mattwr18
7e8fc45e70
Merge pull request #1021 from Human-Connection/dependabot/npm_and_yarn/backend/lodash.mergewith-4.6.2 
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /backend
 2019-07-11 00:03:47 -03:00
dependabot-preview[bot]
6fd166deca
[Security] Bump lodash.template from 4.4.0 to 4.5.0 in /webapp 
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 01:42:34 +00:00
dependabot-preview[bot]
b2c3382a42
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /backend 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 00:09:04 +00:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -03:00