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

306 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Matt Rider
ba7e44a762 Refactor CreateComment resolver 
- extract out the validations for a valid comment
 2019-07-12 08:07:07 -03: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
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
Ulf Gebhardt
0c181758cb
emotion modeled as enum 2019-07-10 12:50:28 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Matt Rider
0d4617399b Fix/add tests 2019-07-09 18:29:31 -03:00
Robert Schäfer
e77bf31470 User role must be set 2019-07-08 16:51:17 +02:00
Matt Rider
a875fe0d5e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-04 20:33:24 -03:00
mattwr18
063ba642a0
Merge pull request #945 from Human-Connection/943_bring_user_mutation_under_control 
943 bring user mutation under control
 2019-07-04 07:18:29 -03:00
Wolfgang Huß
4b1bcdc0f9
Merge pull request #951 from Human-Connection/805-remove-unused-query 
Remove unused query as cleanup
 2019-07-04 08:09:58 +02:00
Matt Rider
c6b261853f Add test for filter posts by category 2019-07-03 19:46:26 -03:00
Robert Schäfer
8b991ea686 Less log output 2019-07-03 23:22:31 +02:00
Robert Schäfer
09ff79763d Follow @mattwr18's other suggestion 2019-07-03 23:20:36 +02:00
Robert Schäfer
ef46f71c0d Follow @mattwr18 code review 👍 2019-07-03 22:22:42 +02:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
Matt Rider
4c7718afb4 Remove unused query as cleanup 2019-07-02 14:36:03 -03:00
Matt Rider
677f657b2e Update schemas, fix typo 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-07-02 10:40:32 -03:00
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Matt Rider
b8ea32cfc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 778-categories-for-posts 2019-07-01 15:06:52 -03:00
mattwr18
730c18faec
Merge pull request #935 from Human-Connection/fix_cypher_injection 
Patch cypher injection vulnerability
 2019-07-01 12:30:31 -03:00
Ulf Gebhardt
a264ff8eee
emotion data modelling 2019-07-01 16:21:11 +02:00
Robert Schäfer
4e687a06ea Patch cypher injection vulnerability 
@mattwr18 this patches the vulnerability. However we should never do
string interpolation with user input.
 2019-06-29 13:48:40 +02:00
Matt Rider
865e2c0ec3 Refactor resolver, rename params 
- Use one cypher statement

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-06-28 10:17:22 -03:00
Matt Rider
351f258fab Refactor resolver, write component tests 
- use UNWIND instead of iterating over categories(cypher magic)
- do not return nested categories on post creation as it's expensive and we don't use
- refactor backend test
- component tests for CategoriesSelect
 2019-06-27 16:57:55 -03:00
ALau2088
912b94d43c add EditCommentForm spec.js 2019-06-27 10:59:53 -07:00