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

333 Commits

Author SHA1 Message Date
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
ogerly
4b11168687 confirm embeded iframes only frontend style 2019-09-23 16:11:20 +02:00
roschaefer
c24876c922 Add a double-check just to be sure 2019-09-23 13:51:21 +02:00
roschaefer
c669fc08eb Fix intermittent backend specs 
@mattwr18 I still see those false positives. This should fix it.
 2019-09-23 13:47:43 +02:00
ogerly
e4c7c1125d zwischenspeichern 2019-09-23 09:11:41 +02:00
mattwr18
865c562048 Fix intermittent failing test 
- the test was regularly failing our build
- change from toEqual to toMatchObject since there is more info coming
back, like errors, etc...
 2019-09-23 08:09:35 +02:00
Robert Schäfer
ede9dc0d76
Merge pull request #1620 from Human-Connection/1612_refactor-moderator-spec 
1612 refactor moderator spec
 2019-09-20 20:01:34 +02:00
roschaefer
1952d63b3c Remove .only from moderation.spec.js 
@aonomike @vbelolapotkov you made it!! You are the best.

Sure, the disable/enable can be improved by returning a union type. But
I leave that for another PR. 👍
 2019-09-20 18:27:37 +02:00
Vasily Belolapotkov
7cca60358c remove FollowTypeEnum from schema 2019-09-20 16:52:12 +03:00
aonomike
347f37efe4 Add enable resources test path 2019-09-20 14:23:39 +03:00
Robert Schäfer
7759d1b98a
Merge pull request #1647 from Human-Connection/Provider_list_approval_hard_cut 
Provider list approval hard cut
 2019-09-19 19:56:01 +02:00
ogerly
b75ebfd004 edit providerlist + test all provider 2019-09-19 18:46:44 +02:00
Robert Schäfer
d830fa4ae4
Merge pull request #1596 from Human-Connection/1583-follow-mutation 
Improve follow/ufollow mutation
 2019-09-19 16:54:35 +02:00
aonomike
8f2456aec4 Test unauthanticated enable 2019-09-19 17:01:42 +03:00
Wolfgang Huß
1fe4ae6619
Merge pull request #1599 from Human-Connection/configure-emails 
Configure emails
 2019-09-19 11:21:18 +02:00
Alina Beck
e843edeb13 unite email templates in templateBuilder 2019-09-19 01:15:52 +01:00
aonomike
bdfc2127d5 fix code review issues 2019-09-18 22:29:14 +03:00
aonomike
ca970eb30a Refactor disable post updates disabled 2019-09-18 17:59:29 +03:00
aonomike
e109b5f6b1 Refactor disable post updates disabledBy 2019-09-18 17:51:35 +03:00
aonomike
84c1d8ef25 Refactor to eliminate duplicate code and start implementing refactor for Post 2019-09-18 17:31:24 +03:00
ogerly
75ea8eaaf0 Provider list approval hard cut 2019-09-18 14:03:51 +02:00
mattwr18
e89aff1272 Fix bug where about must not be empty string 
- add test case to test this use case since it is the default from our
UI
 2019-09-18 13:09:33 +02:00
Vasily Belolapotkov
7d048b029d return user from follow/unfollow mutation 2019-09-18 09:49:59 +03:00
aonomike
3e7e240392 Refactor it updates disabled test for Comment 2019-09-17 18:59:21 +03:00
roschaefer
a8dded2263 Fix #1616 2019-09-17 17:47:26 +02:00
aonomike
5c06ba39e2 Refactor moderate Comment tests 2019-09-17 18:46:45 +03:00
aonomike
a6f4362a3f Refactor Moderator spec tp use apollo-server-testing 
- Refactor unauthentiacted path for logged in and un logged in user
 2019-09-17 15:51:49 +03:00
Vasily Belolapotkov
eeee5f8e9b refactor graphQL queries in follow spec 2019-09-17 10:50:03 +03:00
Robert Schäfer
cb574dd850
Merge pull request #1595 from Human-Connection/1454-security-issue-comment-mutations 
Remove deleted/disabled/createdAt from Comment mutations
 2019-09-16 18:20:35 +02:00
mattwr18
f66d234e85 Fix lint 2019-09-16 13:41:10 +02:00
Vasily Belolapotkov
9b970dae15 refactor follow resolver spec 2019-09-16 13:54:00 +03:00
mattwr18
70c72e8f95 Remove deleted/disabled/createdAt from Comment mutations 2019-09-16 12:35:14 +02:00
mattwr18
bec629e8ef Fix intermittent failing test 
- not concerned about the order of the notification in this test
 2019-09-13 20:51:15 +02:00
mattwr18
d1ecac4580 Write tests to ensure createdAt is not deleted on update 
- we had a silly serious bug by overwriting all attributes at the time
of UpdatePost
- tests in place to ensure we don't accidentally delete our createdAt
attribute
 2019-09-13 20:14:47 +02:00
mattwr18
60c473bb94 Create UpdateComment resolver, update UpdateUser 
- UpdateUser should update updatedAt at point of insertion in the
database as well
 2019-09-13 20:14:47 +02:00
mattwr18
16d7e6c91a Update notifications 
- create only one relationship by using merge, but do not update
createdAt attribute/update test
- order by updatedAt_desc
 2019-09-13 20:14:47 +02:00
mattwr18
67d68db231 Update post resolver to fix embarrasing bugs 
- when a user updates a post, we should not override every property in
our database with the new params, since we have read-only properties
like createdAt that we don't want to go deleting aimlessly.
 2019-09-13 20:14:47 +02:00
mattwr18
ce487f1e0f Set notifications.createdAt only at creation 
- we should not be setting it every time a notification is created
 2019-09-13 20:14:47 +02:00
roschaefer
2a3e6ad76f Alternative solution for #1494 2019-09-13 20:14:47 +02:00
roschaefer
f3c31aed28 Don't expose termsAndConditionsAgreedAt 
1. Don't expose `termsAndConditionsAgreedAt` as input param, because of ..why?
2. Make the `termsAndConditionsAgreedVersion` a *required* input param
   for `SignupVerification`. If new users register, they have to confirm
   the terms and conditions. I added another test to check what happens if
   the user sends `null`.
3. Sorry @ogerly for confusing you with my review here:
   https://github.com/Human-Connection/Human-Connection/pull/1556#pullrequestreview-287516516
   What I meant is that we want to simulate a user with no
   `termsAndConditionsAgreedVersion`. But of course the `variables` must
   have it set when you run the mutations. Now we have the
   exclamation mark in the input param, see point 1 ☝️
 2019-09-13 01:11:46 +02:00
Alexander Friedland
8fa42ea6ea
update 2019-09-12 18:51:41 +02:00
Alexander Friedland
0bef3a729c
Update backend/src/schema/resolvers/registration.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-12 18:00:14 +02:00
Alexander Friedland
aa234edc0a
Update backend/src/schema/resolvers/registration.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-12 18:00:02 +02:00
ogerly
4b97131225 old stand 2019-09-12 16:37:30 +02:00
Robert Schäfer
a01c73536f
Merge pull request #1542 from Human-Connection/1538_test-filter-by-followed-by 
Test filter by followed by
 2019-09-11 13:29:00 +02:00
Robert Schäfer
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02:00
aonomike
785b59f96e Test filter by followed by 2019-09-10 23:32:55 +03:00
mattwr18
3712a5d2cf
Merge pull request #1513 from Human-Connection/bugfix_about_me_not_saved_on_signup_verification 
Bugfix: `about me` not saved on signup
 2019-09-10 17:37:22 +02:00
roschaefer
99fe0b001f Fix German signup mail, follow @mattwr18's review 
https://github.com/Human-Connection/Human-Connection/pull/1512#pullrequestreview-285968139
 2019-09-10 16:24:43 +02:00