63400a455f
Merge https://github.com/coralproject/talk
2018-05-10 20:53:41 -04:00
85f45f390c
Merge branch 'master' into mobile-fix
2018-05-10 13:33:15 -04:00
a092a197cf
Check correct email
2018-05-09 23:45:53 +02:00
0ded5c72e9
adding media
2018-05-09 14:23:22 -03:00
7348bfc7c9
fixed error
2018-05-08 15:46:24 -06:00
1815bd4d75
fix translation copy
2018-05-08 15:30:12 -06:00
b10141716f
Merge branch 'master' into translation-patch
2018-05-08 15:00:58 -04:00
7b86ec7d0a
Update translations.yml
2018-05-08 12:06:52 -06:00
44ba77b202
Merge branch 'master' into notification-fixes
2018-05-08 10:38:26 -06:00
231dfe7997
Fixes for notifications
2018-05-08 09:32:14 -06:00
57917335cb
Merge branch 'master' into settings
2018-05-07 20:21:17 -04:00
e74b8c9099
Merge branch 'master' into email
2018-05-07 19:55:37 -04:00
08a857e07c
Fixed email in use error
2018-05-07 17:51:46 -06:00
10a99aab88
Fixed bug with password form
2018-05-07 17:47:02 -06:00
3024300a3f
Merge branch 'master' into settings
2018-05-07 14:43:07 -06:00
c9957add72
Merge branch 'master' into settings
2018-05-07 14:31:09 -06:00
2b1108cd88
Settings Cache Refactor
2018-05-07 14:27:00 -06:00
5953ed711a
Remove unused code
2018-05-07 22:21:25 +02:00
8c2733734a
Fix Add Email Dialog
2018-05-07 22:16:36 +02:00
f2ea3bdd42
Merge branch 'master' into save-icon
2018-05-07 15:23:11 -04:00
030b805290
Merge branch 'master' into save-icon
2018-05-07 15:22:09 -04:00
1ca7fd58bd
Merge branch 'master' into inputfield-controlled
2018-05-07 15:10:45 -04:00
4fb511e488
Fix save icon
2018-05-07 21:07:46 +02:00
e3fa99100b
Merge branch 'master' into change-pass-error-bug
2018-05-07 14:59:05 -04:00
21e92b92f3
Merge branch 'master' into bug-fixes
2018-05-07 14:38:55 -04:00
ecf05d76c0
Merge branch 'master' into inputfield-controlled
2018-05-07 14:37:51 -04:00
46e5efbd55
validation for password input in change email
2018-05-07 15:00:55 -03:00
06abccabb4
Fix InputField controlled / uncontrolled mode
2018-05-07 18:26:37 +02:00
565ba2af06
Restore cancel buttons
2018-05-07 17:54:59 +02:00
413b6a2a60
Merge branch 'master' into copy-changes
2018-05-05 09:40:50 -06:00
ce92765218
Swap DeletedOn and DeletedFor
2018-05-04 17:40:10 -04:00
8b5cb9d96d
Copy tweaks
2018-05-04 17:36:05 -04:00
7cf991d672
Change copy
2018-05-04 17:03:22 -04:00
4312b8d024
bug
2018-05-04 17:49:40 -03:00
7362c6c993
Merge branch 'master' into username-change-fixes
2018-05-04 12:09:52 -06:00
103543f830
Merge branch 'master' into forgot-password-change
2018-05-04 11:59:10 -06:00
f2d8e49d5b
Merge branch 'master' into username-change-fixes
2018-05-04 11:58:46 -06:00
6bad9e5306
Fixed bug with button placement
2018-05-04 11:50:37 -06:00
2a5075f434
Form update
2018-05-04 11:33:20 -06:00
d41984f171
Remove unused field
2018-05-04 19:32:29 +02:00
4bc8a167a4
Styling tweaks
2018-05-04 19:29:05 +02:00
9a8f0e98a4
Username Change Fixes
2018-05-04 11:16:53 -06:00
05ec8eaee2
Merge branch 'master' into forgot-password-change
2018-05-04 13:40:22 -03:00
eabcbc36c6
forgot password
2018-05-04 13:34:20 -03:00
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
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
15df20e720
fix
2018-05-03 17:57:53 -06:00
949925586f
handle confirmed email better
2018-05-03 17:50:53 -06:00
fa66f07db6
standardized styles, fixed mutation bug
2018-05-03 15:58:52 -06:00
ea71b779d2
password patches
2018-05-03 15:51:50 -06:00
Mendel Konikov