ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,425 Commits 117 Branches 1,511 Tags
Commit Graph

4279 Commits

Author SHA1 Message Date
Wolfgang Huß
dded3344cc
Merge pull request #1040 from Human-Connection/remove_graphql_yoga 
Remove graphql-yoga
 2019-07-16 09:13:44 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 08:12:40 +02:00
dependabot-preview[bot]
9c26bb8f90
Bump eslint-plugin-jest from 22.7.2 to 22.8.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.2 to 22.8.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.7.2...v22.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 04:24:11 +00:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Matt Rider
a91ddd22b7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 14:47:36 -03: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
d59c94c9f3 Keep gql syntax highglighting 
... with custom fake template string
 2019-07-15 18:09:54 +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
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
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Wolfgang Huß
688da7f705 Changed GQL schema and seed data 2019-07-15 13:39:16 +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
Alina Beck
7217bb37a4 avoid duplicate social media urls 2019-07-15 13:30:40 +02:00
Matt Rider
8f17045cdb Update tests to make more reliable 
- hope you are ok with this @roschaefer, it was failing locally and I guess it passed the build because half the time the array is returned in the order expected while half the time not.
 2019-07-15 07:33:22 -03:00
Wolfgang Huß
6430c9e1bf Comment can notify a Mention of a User in the database 
Frontend notification is still missing.
 2019-07-15 09:42:24 +02: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
5bde0ab036 No global codecov install, less verbose CI output 2019-07-14 01:45:38 +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
Robert Schäfer
268ec332b4 Add a first test with apollo-server-testing 2019-07-13 19:26:57 +02:00
Robert Schäfer
f64a21bd01 Remove graphql-yoga 2019-07-13 19:26:56 +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
Robert Schäfer
f9969b964c Implement conditional filtering 2019-07-13 14:07:51 +02:00
Matt Rider
cc61dac818 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-12 10:50:14 -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
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
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
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]
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
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
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
Robert Schäfer
448f350c2e Implement paginating user view for admins 2019-07-10 21:45:37 +02:00
Alina Beck
4c84a02f59 add social media backend test 2019-07-10 15:57:02 +02:00
Alina Beck
8847f071fd update social media links in database 2019-07-10 15:16:28 +02:00
Robert Schäfer
fdd8095e48 Remove always out-of-date schema.gql dump 2019-07-10 14:41:29 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02:00
senderfm
116ff124ed merge remote branch 2019-07-10 14:11:40 +02:00
senderfm
f7ec19f960 merge master 2019-07-10 13:58:11 +02:00
Ulf Gebhardt
0c181758cb
emotion modeled as enum 2019-07-10 12:50:28 +02:00
Robert Schäfer
8c18b9c59b Allow to list all badges 2019-07-10 12:36:19 +02:00