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
5,747 Commits 117 Branches 1,511 Tags
Commit Graph

642 Commits

Author SHA1 Message Date
Wolfgang Huß
1fe4ae6619
Merge pull request #1599 from Human-Connection/configure-emails 
Configure emails
 2019-09-19 11:21:18 +02:00
Alina Beck
b25d552193 follow @Tirokk and @datenbrei suggestions 2019-09-19 09:52:47 +01:00
Alina Beck
e843edeb13 unite email templates in templateBuilder 2019-09-19 01:15:52 +01:00
Alina Beck
a7d525deab refactor password reset 2019-09-19 00:55:06 +01:00
Alina Beck
b193e180c5 add wrong account html template 2019-09-19 00:42:42 +01:00
Alina Beck
e45948f4f0 use password reset template 2019-09-19 00:23:51 +01:00
Alina Beck
2bd7276523 improve padding 2019-09-19 00:14:13 +01:00
Alina Beck
a304dcbfdf add reset password template 2019-09-19 00:06:57 +01:00
Alina Beck
ec0cf36256 refactor email middleware 2019-09-18 18:00:34 +01:00
Alina Beck
96ced53843 fix hover effect for language toggle 2019-09-18 15:16:53 +01:00
Alina Beck
5b8d2eb2f6 fix lint errors 2019-09-18 14:49:39 +01:00
Alina Beck
b3deea4918 add language toggle 2019-09-18 14:39:03 +01: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
roschaefer
a8dded2263 Fix #1616 2019-09-17 17:47:26 +02:00
Alina Beck
e53609ab14 add german translation to signup template 2019-09-17 15:28:24 +01:00
Alina Beck
24fb601739 clean up email template 2019-09-17 15:17:36 +01:00
Alina Beck
f483220590 use nodemailer-html-to-text plugin to transform html content to plain text 2019-09-17 14:27:10 +01:00
Wolfgang Huß
d28a1f17f1 Merge branch '1276-hashtag-links-url-safe' of https://github.com/Human-Connection/Human-Connection into 1276-hashtag-links-url-safe 2019-09-17 10:01:17 +02:00
Wolfgang Huß
b06b353f6a Corrected comment to unicode letter(s) 2019-09-17 09:58:35 +02:00
mattwr18
7926cb39ba Improve English descriptions 2019-09-17 08:50:22 +02:00
roschaefer
431de3319f Make data-hashtag-id authoritive for #links 
This adds consistency: The mention links with `@` was implemented
that way already. Instead of parsing the URL, we add some redundancy and
add another attribute: data-hashtag-id

So, what characters are valid for html attributes?
Read: https://stackoverflow.com/questions/925994/what-characters-are-allowed-in-an-html-attribute-name

Thanks to @Tirokk, who added some validations on the hahstag ids, I
think we are all set. If you try to write a hashtag with a `"` double
quotation mark for example, it gets automatically replaced with a valid
hashtag. If someone wants to send us invalid hashtag ids to the backend
directly, the regex there would filter it out.
 2019-09-16 23:09:32 +02:00
Wolfgang Huß
15816dd97b Update backend/src/middleware/hashtags/hashtagsMiddleware.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-16 22:06:36 +02:00
Wolfgang Huß
82d5ac99df Make hashtag links URL safe 2019-09-16 22:06:36 +02:00
Alina Beck
c94715a128 pass options to html template 2019-09-16 18:29:43 +01:00
Alina Beck
dcbeed319d add and style links 2019-09-16 18:16:43 +01: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
Alina Beck
61ce27464c adapt template to follow human connection styleguide (wip) 2019-09-16 17:02:59 +01:00
mattwr18
f66d234e85 Fix lint 2019-09-16 13:41:10 +02: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
ca6ae3bd1b Remove dateTimeMiddleware 
- favor adding createdAt, updatedAt attributes at point of insertion to
the database
 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
Alexander Friedland
193ac8e6b2
Merge pull request #1556 from Human-Connection/1503_datum_agb 
II Add Date to Terms and Conditions #1535
 2019-09-13 07:21:19 +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
roschaefer
86f9824c2e Fix lint 2019-09-12 23:13:20 +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
roschaefer
9233049ff3 Show a helpful message only if test fails 
Inspired by the `ON FAIL` markup from the previous commit
0f2398295bcced3af3772bb4add1f42472c97893
 2019-09-12 17:16:10 +02:00
ogerly
4b97131225 old stand 2019-09-12 16:37:30 +02:00
Wolfgang Huß
0f2398295b Helper message for backend tests failed by missing constraints in database 2019-09-12 11:14:42 +02:00
Alina Beck
58b56754a4 remove console log 2019-09-11 12:51:52 +01:00
Alina Beck
1cd354ff17 paste html template from TedGoas/Cerberus 2019-09-11 12:51:27 +01:00
Alina Beck
f802eab27d copy email text to separate file 2019-09-11 12:44:15 +01: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