wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-09 23:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,511 Commits 10 Branches 125 Tags
bfda6a4ce825a94eeee4eeedbe6bd2a239ab58b3
Commit Graph

9511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Gardner bfda6a4ce8 Merge branch 'master' into gdpr-email 2018-05-03 16:54:54 -04:00
Kim Gardner 68dfb9cad7 Merge pull request #1559 from coralproject/cli 
CLI Fixes
 2018-05-03 16:45:52 -04:00
Wyatt Johnson f5099d94bc fix 2018-05-03 14:32:56 -06:00
Wyatt Johnson edf32a911d Merge branch 'master' into cli 2018-05-03 14:20:05 -06:00
okbel 29a840fe06 InputField conflict 2018-05-03 15:38:17 -03: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 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 e1f6dc49a8 Merge branch 'master' into gdpr-email 2018-05-03 13:18:25 -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
Wyatt Johnson 0e20ddb2fd added docs 2018-05-03 10:40:06 -06:00
Cristian 8b35f2300a Added TALK_ prefix to constants RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER 2018-05-03 13:06:47 -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
Kim Gardner 0791a2731b Merge branch 'master' into gdpr-email 2018-05-02 22:18:26 -04:00
Wyatt Johnson db11dc4928 Merge pull request #1563 from coralproject/version-4-4-0 
Update version to 4.4.0
 2018-05-02 14:37:07 -06:00
okbel bfb4b790d4 Adding error 2018-05-02 16:49:56 -03:00
okbel c7db780582 Updating the cache with data from the fragment 2018-05-02 16:46:20 -03:00
Kim Gardner 45c75f3c48 Update version to 4.4.0 2018-05-02 15:22:17 -04:00
Wyatt Johnson c1492d1065 Added incorrect password error 2018-05-02 13:22:15 -06:00
Wyatt Johnson 0159918049 docs updates 2018-05-02 13:04:17 -06:00
Kim Gardner cb9b02c180 remove profile-settings from gitignore 2018-05-02 14:20:19 -04:00
okbel c8e5678c9c Using fragments :) 2018-05-02 14:18:40 -03:00
okbel 48a78735bd Importing translations 2018-05-02 14:11:11 -03:00
okbel 8dcaf8ea4c Moving the translations too 2018-05-02 14:08:29 -03:00
okbel 780bd42ceb Moving gdpr to talk-plugin-local-auth 2018-05-02 13:49:23 -03:00
okbel b2f37733e8 Sending correct parameters 2018-05-02 13:39:08 -03:00
okbel 6c0c76328f merge conflict 2018-05-02 13:28:03 -03:00
Wyatt Johnson 7c16ae2220 cli fix 2018-05-02 10:17:41 -06:00
Kim Gardner 72ca9b38bb Merge branch 'master' into gdpr-email 2018-05-02 11:21:11 -04:00
Kim Gardner 26b9dcdaa9 Merge branch 'master' into cli 2018-05-02 11:13:42 -04:00
Kim Gardner 9dc040f6d2 Merge pull request #1560 from mkonikov/rich-text-docs 
Add note explaining possible plugin conflict
 2018-05-02 11:13:10 -04:00
Mendel Konikov 018addc6ad Remove space to correct markdown link formatting 2018-05-01 20:37:42 -04:00
Mendel Konikov c3d01be0df Add note explaining possible plugin conflict 2018-05-01 20:34:42 -04:00
Wyatt Johnson d6828c5ef4 cli fixes 2018-05-01 16:27:47 -06:00
Kim Gardner 17a63c0bf9 Merge branch 'master' into gdpr-email 2018-05-01 17:50:27 -04:00
Kim Gardner a8dd1ec38b Merge pull request #1557 from coralproject/indexes 
Index Creation Patch
 2018-05-01 17:48:48 -04:00
Wyatt Johnson d12310026b Fixes to shema loading 2018-05-01 15:41:05 -06:00
Wyatt Johnson b014225b73 fixes for index creation 2018-05-01 12:02:39 -06:00
Kim Gardner 7717462300 Merge pull request #1555 from coralproject/configure-enh 
Configure enhancements
 2018-05-01 13:32:38 -04:00
Kim Gardner 06682225c8 Fix error message 2018-05-01 13:25:33 -04:00
Kim Gardner 3145411921 Merge branch 'master' into configure-enh 2018-05-01 13:23:14 -04:00
okbel bd21d9a1a1 fix b 2018-05-01 14:19:43 -03:00
Kim Gardner a12e7a0e90 Merge pull request #1533 from coralproject/gdpr-username 
[GDPR] Username Change
 2018-05-01 12:55:24 -04:00
Kim Gardner 9c809f99c5 Merge branch 'master' into gdpr-email 2018-05-01 12:51:05 -04:00
Kim Gardner 16a21a0562 Merge branch 'master' into gdpr-username 2018-05-01 12:42:12 -04:00
Chi Vinh Le e0dad39600 Merge branch 'configure-enh' of ssh://github.com/coralproject/talk into configure-enh 2018-05-01 18:14:34 +02:00
Chi Vinh Le 74821a4d4c Readd save dialog on section change 2018-05-01 18:14:07 +02:00
Kiwi 41b3245bf4 Merge branch 'master' into configure-enh 2018-05-01 17:58:56 +02:00
Kim Gardner 71cdd146fa Merge pull request #1554 from coralproject/change-config-tab-copy 
Update copy for stream Configure tab
 2018-05-01 11:39:33 -04:00