IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-17 10:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,541 Commits 5 Branches 2 Tags
Commit Graph

611 Commits

Author SHA1 Message Date
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
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
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
Alina Beck
61ce27464c adapt template to follow human connection styleguide (wip) 2019-09-16 17:02:59 +01: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
5586a2b5ea
Merge pull request #1512 from Human-Connection/refactor_email_middleware 
Refactor email middleware
 2019-09-11 01:58:37 +02: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
roschaefer
22af1399b3 Follow @mattwr18's review 2019-09-10 15:40:10 +02:00
mattwr18
77eb8274f3 Improve English grammar in test descriptions 
- Fix typo
- use gender neutral pronoun
- fix third-person conjugation
 2019-09-10 15:39:34 +02:00
roschaefer
b656b5aeb9 Check that about actually gets saved 2019-09-10 15:39:34 +02:00
roschaefer
0cd7ac3d32 Refactor slugifyMiddleware 
* eliminate GraphQL from spec
* much better error handling
* add EmailAdress factory
 2019-09-10 15:39:34 +02:00
mattwr18
2b1590aae1 Add German translation to email template, _ for unused variables 2019-09-10 10:30:17 +02:00
mattwr18
ba3e0ca941 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1488-filter-posts-by-emotion 2019-09-09 16:59:35 +02:00
mattwr18
3b056aacc1 Fix weird indentation issue with VS Code 2019-09-09 16:58:49 +02:00
mattwr18
86d80c689c Fix indentation issue on EMOTED 2019-09-09 16:51:24 +02:00
mattwr18
919dc1924f Fix indent issue 2019-09-09 16:46:51 +02:00
mattwr18
b89043166b Add backend tests for filtering posts by emotions 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-09-09 16:35:11 +02:00
mattwr18
d3952e2ada Use debug npm package over console.log 
- @roschaefer `PR` review
- better because we can leave in the code base and show only when/if we
want to
 2019-09-09 14:32:01 +02:00
mattwr18
2aef2add3d Add temporarily console.log statements to debug failed API call 
- in production environment, the user locationName is updated, but it is
failing the `createOrUpdateLocations` function in backend/src/middleware/nodes/locations.js
For some reason, it seems like the API call is coming back with
something other than what we are looking for.
Need help debugging... we can remove this code after we figure out
what's wrong
 2019-09-09 12:53:47 +02:00
mattwr18
30ea892aa1 Allow filter by multiple emotions, test getters 
- Co-authored-by: vardyb <brent.vardy@challengelogic.net>
- Co-aurhored-by: mike aono <aonomike@gmail.com>
 2019-09-07 12:37:03 +02:00
mattwr18
07c58fc03e Add emotions buttons, get it filtering 2019-09-07 12:37:03 +02:00
roschaefer
06f07c1a75 Fix missing from in templates 2019-09-06 23:31:28 +02:00
roschaefer
e751571981 Refactored email resolvers 
* If the email middleware does not send mails, it will give a warning
similar to sentry middleware
* Eliminated GrapphQLClient in one more test
* Rename code => nonce
 2019-09-06 19:31:03 +02:00
Wolfgang Huß
80d1e03c03
Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user 
1506 Anonymize deleted user also for moderators
 2019-09-06 17:12:31 +02:00
Wolfgang Huß
53be6d41ee
Merge pull request #1507 from Human-Connection/refactor_registration_spec 
Refactor registration.spec.js
 2019-09-06 16:47:21 +02:00
roschaefer
4358d5bb8f Follow @Tirokk's suggestion 
https://github.com/Human-Connection/Human-Connection/pull/1507#pullrequestreview-284841447
 2019-09-06 16:03:46 +02:00
roschaefer
5b24a91d45 Implement better statistics resolver 2019-09-06 13:52:56 +02:00
roschaefer
160552734d Move softDeleteMiddleware into its own folder 2019-09-06 13:12:30 +02:00
roschaefer
f58c1c7cf0 Refactor registration.spec.js 
Only 7 specs left that still use GraphQLClient
 2019-09-06 11:37:40 +02:00
mattwr18
4e065325d1
Merge pull request #1480 from Human-Connection/cleanup_unused_code 
Remove a lot of unused code, reduce graphql schema
 2019-09-05 08:03:39 +02:00
roschaefer
66ed78e19b Remove a lot of unused code, reduce graphql schema 2019-09-05 03:20:32 +02:00
roschaefer
38ea74379a If TAC version is missing, return null 2019-09-05 01:24:51 +02:00
mattwr18
b04649e1ee Remove duplicate code 
- there was the same methods in user.js and user_management.js except
that the login was not filtering out deleted users, so it was failing
one test. Reverted changes back to the user.js from the master branch...
added back our changes.

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 19:31:43 +02:00
mattwr18
c92ba35db6 Remove trailing curly brace, update test 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: ogerly <fridolin@tutanota.com>
 2019-09-04 18:41:48 +02:00