wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 07:22:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,577 Commits 10 Branches 125 Tags
35cefd55706c19ca15165c46e1768c9bc7e8aa97
Commit Graph

9577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Gardner 35cefd5570 Fix build fail 2018-05-03 17:42:47 -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
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 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
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
Kim Gardner e1f6dc49a8 Merge branch 'master' into gdpr-email 2018-05-03 13:18:25 -04:00
Kim Gardner 8caf995517 Merge branch 'master' into gdpr-delete 2018-05-03 13:17:44 -04:00
Kim Gardner 287cff289b Update copy to reflect ability to take action up until account is deleted 2018-05-03 13:04:05 -04:00
Wyatt Johnson 368b6fb847 Merge pull request #1565 from cristiandean/recaptcha-env 
Set RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER by env vars
 2018-05-03 10:58:16 -06:00
okbel 3b5a45ec01 translations 2018-05-03 13:45:33 -03:00
Wyatt Johnson 0e20ddb2fd added docs 2018-05-03 10:40:06 -06:00
okbel f6d3f4cb14 translations 2018-05-03 13:32:52 -03:00
Wyatt Johnson 375f1bb6b1 copy fixes 2018-05-03 10:09:36 -06:00
Wyatt Johnson 6485b1f080 added email to final step 2018-05-03 10:09:36 -06:00
Cristian 8b35f2300a Added TALK_ prefix to constants RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER 2018-05-03 13:06:47 -03:00
Kim Gardner 0caa82c1c4 Typo 2018-05-03 11:59:27 -04:00
okbel 94b3ab4ac8 translations 2018-05-03 12:59:03 -03:00
Cristian 12701942c6 RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER now can be set with env vars 2018-05-03 12:57:51 -03:00
Wyatt Johnson bab9347d06 adjusted copy 2018-05-03 09:53:24 -06:00
Kim Gardner b995da8301 Unbold a word 2018-05-03 11:37:48 -04:00
Wyatt Johnson 51847cf955 Updated copy for delete 2018-05-03 09:26:48 -06:00