Chi Vinh Le
4bc8a167a4
Styling tweaks
2018-05-04 19:29:05 +02:00
Kiwi
822193bba5
Merge pull request #1556 from coralproject/user-detail-enh
...
User detail refactor
2018-05-04 17:46:52 +02:00
Kim Gardner
a008503b52
Merge branch 'master' into user-detail-enh
2018-05-04 09:14:06 -04:00
Kim Gardner
401593afde
Merge pull request #1564 from coralproject/email-auth-gdpr
...
[GDPR] Attach Local Authentication (External Auth)
2018-05-04 09:13:47 -04: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
Kim Gardner
e51736040f
Merge branch 'master' into user-detail-enh
2018-05-03 20:27:16 -04:00
Kim Gardner
9d47d3ff91
Merge pull request #1538 from coralproject/gdpr-email
...
[GDPR] Change Email (Local)
2018-05-03 20:08:27 -04:00
Wyatt Johnson
15df20e720
fix
2018-05-03 17:57:53 -06:00
Kim Gardner
00b6f0816c
Merge branch 'master' into gdpr-email
2018-05-03 19:52:39 -04:00
Wyatt Johnson
949925586f
handle confirmed email better
2018-05-03 17:50:53 -06:00
Wyatt Johnson
3fbd655cb8
Merge branch 'master' into email-auth-gdpr
2018-05-03 16:22:43 -06:00
Wyatt Johnson
848ec34e99
Merge pull request #1566 from davisshaver/patch-1
...
JWT_Audience is listed twice in the docs under required keys
2018-05-03 16:22:06 -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
Davis Shaver
31cb70fa77
JWT_Audience is listed twice in the docs under required keys
2018-05-03 17:42:10 -04:00
Kim Gardner
aee963ce39
Missed an s
2018-05-03 17:34:41 -04:00
Wyatt Johnson
bc3ceac61a
docs patch
2018-05-03 15:26:50 -06:00
Kim Gardner
ae9732c9b4
Merge branch 'gdpr-email' of git+ssh://github.com/coralproject/talk into gdpr-email
2018-05-03 17:19:17 -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
Kim Gardner
8bfe344c39
Merge pull request #1536 from coralproject/gdpr-delete
...
[GDPR] Delete Account
2018-05-03 17:08:55 -04:00
Kim Gardner
a20e050559
Merge branch 'gdpr-email' of git+ssh://github.com/coralproject/talk into gdpr-email
2018-05-03 17:08:39 -04:00
Kim Gardner
58b73a4d0a
Add feature overview to GDPR docs
2018-05-03 17:08:20 -04:00
Wyatt Johnson
2e7bad3508
moved settings loading into try/catch block
2018-05-03 14:57:11 -06:00
Kim Gardner
bfda6a4ce8
Merge branch 'master' into gdpr-email
2018-05-03 16:54:54 -04:00
Kim Gardner
9d448d4185
Merge branch 'master' into gdpr-delete
2018-05-03 16:46:32 -04:00
Kim Gardner
68dfb9cad7
Merge pull request #1559 from coralproject/cli
...
CLI Fixes
2018-05-03 16:45:52 -04:00
Kim Gardner
3e9d835eb2
Grammar
2018-05-03 16:37:19 -04:00
Wyatt Johnson
f5099d94bc
fix
2018-05-03 14:32:56 -06:00
Kim Gardner
d9806c0ecc
Fix email subject variables
2018-05-03 16:23:47 -04:00
Wyatt Johnson
edf32a911d
Merge branch 'master' into cli
2018-05-03 14:20:05 -06: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
2b52f07c45
Merge branch 'gdpr-email' of github.com:coralproject/talk into gdpr-email
...
* 'gdpr-email' of github.com:coralproject/talk:
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
Update version to 4.4.0
2018-05-03 15:13:09 -03:00