21e92b92f3
Merge branch 'master' into bug-fixes
2018-05-07 14:38:55 -04:00
0f47378ae3
Merge pull request #1576 from coralproject/restore-cancel
...
Restore cancel buttons
2018-05-07 14:37:00 -04:00
46e5efbd55
validation for password input in change email
2018-05-07 15:00:55 -03:00
565ba2af06
Restore cancel buttons
2018-05-07 17:54:59 +02:00
802a3bd656
Merge pull request #1573 from coralproject/copy-changes
...
Copy and bug fixes
2018-05-05 10:04:56 -06:00
413b6a2a60
Merge branch 'master' into copy-changes
2018-05-05 09:40:50 -06:00
e37346f544
Merge pull request #1572 from coralproject/csv-copy-changes
...
CSV Copy Changes
2018-05-05 09:40:06 -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
910beb0f40
Merge pull request #1547 from jerodb/es-translations
...
Changed general spanish translations
2018-05-04 16:23:04 -04:00
810cb222f9
Merge branch 'master' into es-translations
2018-05-04 15:48:56 -04:00
7a7dcdd7c6
corrections in spanish translations
2018-05-04 16:35:24 -03:00
66f1fd7d8a
Merge pull request #1569 from coralproject/username-change-fixes
...
Username Change Fixes
2018-05-04 14:55:44 -04:00
7362c6c993
Merge branch 'master' into username-change-fixes
2018-05-04 12:09:52 -06:00
a0fbfe4ff4
Merge pull request #1568 from coralproject/forgot-password-change
...
Forgot password in Change Password
2018-05-04 12:09:38 -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
ade9b99a09
Merge pull request #1570 from coralproject/small-styling-tweaks
...
GDPR styling tweaks
2018-05-04 13:53:39 -04: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
822193bba5
Merge pull request #1556 from coralproject/user-detail-enh
...
User detail refactor
2018-05-04 17:46:52 +02:00
a008503b52
Merge branch 'master' into user-detail-enh
2018-05-04 09:14:06 -04:00
401593afde
Merge pull request #1564 from coralproject/email-auth-gdpr
...
[GDPR] Attach Local Authentication (External Auth)
2018-05-04 09:13:47 -04: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
e51736040f
Merge branch 'master' into user-detail-enh
2018-05-03 20:27:16 -04:00
9d47d3ff91
Merge pull request #1538 from coralproject/gdpr-email
...
[GDPR] Change Email (Local)
2018-05-03 20:08:27 -04:00
15df20e720
fix
2018-05-03 17:57:53 -06:00
00b6f0816c
Merge branch 'master' into gdpr-email
2018-05-03 19:52:39 -04:00
949925586f
handle confirmed email better
2018-05-03 17:50:53 -06:00
3fbd655cb8
Merge branch 'master' into email-auth-gdpr
2018-05-03 16:22:43 -06:00
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
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
b5958d5879
fixed merge error
2018-05-03 15:45:43 -06:00
35cefd5570
Fix build fail
2018-05-03 17:42:47 -04:00
31cb70fa77
JWT_Audience is listed twice in the docs under required keys
2018-05-03 17:42:10 -04:00
aee963ce39
Missed an s
2018-05-03 17:34:41 -04:00
bc3ceac61a
docs patch
2018-05-03 15:26:50 -06:00
ae9732c9b4
Merge branch 'gdpr-email' of git+ssh://github.com/coralproject/talk into gdpr-email
2018-05-03 17:19:17 -04:00
c783d15df3
Merge branch 'master' into gdpr-email
2018-05-03 15:18:22 -06:00
e9fdaa1b5a
Merge branch 'master' into email-auth-gdpr
2018-05-03 15:13:13 -06:00
8bfe344c39
Merge pull request #1536 from coralproject/gdpr-delete
...
[GDPR] Delete Account
2018-05-03 17:08:55 -04:00
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