Commit Graph

1096 Commits

Author SHA1 Message Date
Kim Gardner 21e92b92f3 Merge branch 'master' into bug-fixes 2018-05-07 14:38:55 -04:00
Belen Curcio 46e5efbd55 validation for password input in change email 2018-05-07 15:00:55 -03:00
Chi Vinh Le 565ba2af06 Restore cancel buttons 2018-05-07 17:54:59 +02:00
Wyatt Johnson 413b6a2a60 Merge branch 'master' into copy-changes 2018-05-05 09:40:50 -06:00
Kim Gardner ce92765218 Swap DeletedOn and DeletedFor 2018-05-04 17:40:10 -04:00
Kim Gardner 8b5cb9d96d Copy tweaks 2018-05-04 17:36:05 -04:00
Kim Gardner 7cf991d672 Change copy 2018-05-04 17:03:22 -04:00
Wyatt Johnson 7362c6c993 Merge branch 'master' into username-change-fixes 2018-05-04 12:09:52 -06:00
Wyatt Johnson 103543f830 Merge branch 'master' into forgot-password-change 2018-05-04 11:59:10 -06:00
Wyatt Johnson f2d8e49d5b Merge branch 'master' into username-change-fixes 2018-05-04 11:58:46 -06:00
Wyatt Johnson 6bad9e5306 Fixed bug with button placement 2018-05-04 11:50:37 -06:00
Wyatt Johnson 2a5075f434 Form update 2018-05-04 11:33:20 -06:00
Chi Vinh Le d41984f171 Remove unused field 2018-05-04 19:32:29 +02:00
Chi Vinh Le 4bc8a167a4 Styling tweaks 2018-05-04 19:29:05 +02:00
Wyatt Johnson 9a8f0e98a4 Username Change Fixes 2018-05-04 11:16:53 -06:00
Belén Curcio 05ec8eaee2 Merge branch 'master' into forgot-password-change 2018-05-04 13:40:22 -03:00
Belen Curcio eabcbc36c6 forgot password 2018-05-04 13:34:20 -03:00
okbel 7f9c71a802 Merge branch 'master' of github.com:coralproject/talk into email-auth-gdpr
* 'master' of github.com:coralproject/talk:
  fix
  handle confirmed email better
  standardized styles, fixed mutation bug
  password patches
  fixed merge error
  Fix build fail
  Missed an s
  docs patch
  Add feature overview to GDPR docs
  InputField conflict
  moving mutations to /hocs folder
  moving mutations to /hocs folder
  withUpdateEmailAddress in the plugins hoc
2018-05-04 09:46:58 -03:00
okbel f3a3746d6b Merge branch 'email-auth-gdpr' of github.com:coralproject/talk into email-auth-gdpr
* 'email-auth-gdpr' of github.com:coralproject/talk: (51 commits)
  JWT_Audience is listed twice in the docs under required keys
  moved settings loading into try/catch block
  Grammar
  fix
  Fix email subject variables
  Update email copy
  Styling
  Styling
  Updating InputField
  Updating InputField
  added emails around account deletion
  moving mutations to /hocs folder
  typo
  cleaned up config as js instead of json file
  added space
  added durations to configuration file
  Update copy to reflect ability to take action up until account is deleted
  translations
  copy fixes
  added email to final step
  ...
2018-05-04 09:41:22 -03:00
Wyatt Johnson 15df20e720 fix 2018-05-03 17:57:53 -06:00
Wyatt Johnson 949925586f handle confirmed email better 2018-05-03 17:50:53 -06:00
Wyatt Johnson fa66f07db6 standardized styles, fixed mutation bug 2018-05-03 15:58:52 -06:00
Wyatt Johnson ea71b779d2 password patches 2018-05-03 15:51:50 -06:00
Wyatt Johnson b5958d5879 fixed merge error 2018-05-03 15:45:43 -06:00
Kim Gardner 35cefd5570 Fix build fail 2018-05-03 17:42:47 -04:00
Wyatt Johnson c783d15df3 Merge branch 'master' into gdpr-email 2018-05-03 15:18:22 -06:00
Wyatt Johnson e9fdaa1b5a Merge branch 'master' into email-auth-gdpr 2018-05-03 15:13:13 -06:00
Wyatt Johnson 2e7bad3508 moved settings loading into try/catch block 2018-05-03 14:57:11 -06:00
Kim Gardner 3e9d835eb2 Grammar 2018-05-03 16:37:19 -04:00
Kim Gardner d9806c0ecc Fix email subject variables 2018-05-03 16:23:47 -04:00
Kim Gardner 903b74cb31 Update email copy 2018-05-03 15:43:22 -04:00
okbel 070ecbaafc translations 2018-05-03 16:30:15 -03:00
okbel f9f7855775 Merge branch 'email-auth-gdpr' of github.com:coralproject/talk into email-auth-gdpr
* 'email-auth-gdpr' of github.com:coralproject/talk:
  added docs
  Added TALK_ prefix to constants RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER
  cleaned up refs to passwor dhash
  RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER now can be set with env vars
2018-05-03 16:25:17 -03:00
okbel 438c515d2f moving mutations to /hocs folder 2018-05-03 16:06:28 -03:00
okbel 65aa90904a Styling 2018-05-03 16:00:25 -03:00
okbel 140ef3eb5e Styling 2018-05-03 15:57:00 -03:00
okbel 467aecf0ee Merge branch 'gdpr-delete' of github.com:coralproject/talk into gdpr-delete
* 'gdpr-delete' of github.com:coralproject/talk:
  added emails around account deletion
2018-05-03 15:48:49 -03:00
okbel 10dbce55ba Updating InputField 2018-05-03 15:45:19 -03:00
okbel 6cfebb408f Updating InputField 2018-05-03 15:42:28 -03:00
okbel 29a840fe06 InputField conflict 2018-05-03 15:38:17 -03:00
Wyatt Johnson 690e6752ee added emails around account deletion 2018-05-03 12:29:05 -06:00
okbel 788cf25fa5 moving mutations to /hocs folder 2018-05-03 15:20:07 -03:00
okbel 687d0555c8 moving mutations to /hocs folder 2018-05-03 15:18:09 -03:00
okbel bc9e76c889 Merge branch 'gdpr-delete' of github.com:coralproject/talk into gdpr-delete
* 'gdpr-delete' of github.com:coralproject/talk:
  typo
  cleaned up config as js instead of json file
  added space
  added durations to configuration file
  Update copy to reflect ability to take action up until account is deleted
  added docs
  Added TALK_ prefix to constants RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER
  RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER now can be set with env vars
2018-05-03 15:17:04 -03:00
okbel f173f495a5 moving mutations to /hocs folder 2018-05-03 15:15:58 -03:00
okbel 8a9af89699 withUpdateEmailAddress in the plugins hoc 2018-05-03 15:12:23 -03:00
Kim Gardner 64cb665124 typo 2018-05-03 14:00:07 -04:00
Wyatt Johnson df29e610b3 cleaned up config as js instead of json file 2018-05-03 11:40:55 -06:00
Wyatt Johnson 20c5804559 added space 2018-05-03 11:38:23 -06:00
Wyatt Johnson 06b08756e7 added durations to configuration file 2018-05-03 11:36:34 -06:00