Commit Graph
7632 Commits
Author SHA1 Message Date
Wyatt JohnsonandGitHub 9dcb8f8f0e Merge branch 'next' into user-search 2018-01-03 14:08:38 -07:00
Wyatt JohnsonandGitHub 148d329ff8 Merge branch 'master' into next 2018-01-03 14:08:29 -07:00
Wyatt JohnsonandGitHub 517124cc93 Merge pull request #1236 from coralproject/i18n-bug-fix
i18n Default Language Fix
2018-01-03 14:08:11 -07:00
Wyatt Johnson 797cea4f63 added user query by value to graph 2018-01-03 14:01:51 -07:00
okbel cb2f032ae1 fix index for moderation actions, and view options 2018-01-03 17:38:22 -03:00
Belén CurcioandGitHub 0572a1c97d Merge branch 'master' into next 2018-01-03 12:11:44 -03:00
Wyatt JohnsonandGitHub 20e3d9065f Merge branch 'master' into i18n-bug-fix 2017-12-30 02:56:13 -07:00
Wyatt JohnsonandGitHub 0af8a31154 Merge pull request #1240 from gakhov/gakhov-patch-advanced-config
Fix a variable name for redis client configuration
2017-12-30 02:55:46 -07:00
Andrii GakhovandGitHub 140bba23e0 Fix a variable name for redis client configuration
The documentation incorrectly stated that the advanced Redis Client configuration could be set using `TALK_REDIS_CLIENT_CONFIG`, while, in fact, the correct variable is `TALK_REDIS_CLIENT_CONFIGURATION`, as it parsed in https://github.com/coralproject/talk/blob/master/config.js#L114
2017-12-28 13:04:37 +01:00
Wyatt Johnson 69e4c5478d fixes default lang select bug 2017-12-21 23:26:34 -07:00
Kim Gardner 0d70c87ea9 Fix merge conflict 2017-12-21 17:01:48 -05:00
Wyatt Johnson d3ce68e078 Merge branch 'master' into next 2017-12-21 14:51:56 -07:00
Wyatt JohnsonandGitHub 4fa46c4144 Merge pull request #1154 from coralproject/user-status-refactor
User status refactor
2017-12-21 14:35:23 -07:00
Wyatt Johnson c2a8a3e4a3 fixed tests 2017-12-21 14:26:44 -07:00
Kim GardnerandGitHub 5488d5a7fa Merge pull request #1234 from coralproject/modqueue-enh
Modqueue fixes and enhancements
2017-12-21 15:26:09 -05:00
Wyatt Johnson c8ab5cdbf6 fixed tests 2017-12-21 12:43:26 -07:00
Wyatt Johnson 4fb9910221 updates to cli
- removed -c,--config flag in favor of env only or .env files
- loads .env always if found
- scripts re-written to call cli-serve directly
2017-12-21 12:03:34 -07:00
Wyatt Johnson 7ae0df2cbc fixed dist loading error 2017-12-21 11:55:09 -07:00
Wyatt Johnson 8bf2fe7b06 hid not logged in error 2017-12-21 11:51:16 -07:00
Wyatt Johnson c0f8fce442 fixed graphql error 2017-12-21 11:48:16 -07:00
Wyatt Johnson 47e32d5d6d Merge branch 'next' into user-status-refactor 2017-12-21 11:34:39 -07:00
Chi Vinh Le 111af0acf8 More refactor 2017-12-21 18:43:39 +01:00
Chi Vinh Le e34f96832a Refactor 2017-12-21 18:36:15 +01:00
Chi Vinh Le f9e289561e Refactor 2017-12-21 18:29:18 +01:00
Wyatt JohnsonandGitHub e409d071cb Merge branch 'master' into next 2017-12-21 09:37:39 -07:00
Chi Vinh Le 2d6a05433a Mark single dangling comments, reflow issues and scroll enhancement 2017-12-21 15:55:18 +01:00
Kim Gardner 7f75255282 Merge branch 'master' of git+ssh://github.com/coralproject/talk into user-status-refactor 2017-12-21 07:04:27 -05:00
okbel 5925a4b956 updated tests classes 2017-12-20 21:21:16 -03:00
okbel dafd703261 Merge branch 'user-status-refactor' of github.com:coralproject/talk into user-status-refactor
* 'user-status-refactor' of github.com:coralproject/talk:
  added mount path to the endpoint to respect the mounting config
  linting
  removed dev requirement for engine
2017-12-20 21:14:21 -03:00
okbel 5c0f546d50 Adding tests 2017-12-20 21:06:48 -03:00
okbel e8e9a4b5ed bounding fns 2017-12-20 21:06:37 -03:00
okbel 1371776f74 Updating the store mutations 2017-12-20 21:05:52 -03:00
Wyatt Johnson deb2709829 added mount path to the endpoint to respect the mounting config 2017-12-20 16:29:26 -07:00
okbel 4cc35e5b8f rejected usernames should not be able to comment 2017-12-20 20:13:36 -03:00
Wyatt Johnson ad68346332 linting 2017-12-20 16:11:39 -07:00
Wyatt Johnson 97406e1b18 removed dev requirement for engine 2017-12-20 16:10:02 -07:00
okbel 483b306e69 Updated tests 2017-12-20 20:09:51 -03:00
okbel 0bce215d33 Adding tests 2017-12-20 20:00:47 -03:00
okbel 73666399b4 Updating the store mutations 2017-12-20 20:00:34 -03:00
okbel 60e890c244 Adding Classes 2017-12-20 20:00:24 -03:00
okbel 16b5bd5d09 Updating the store mutations 2017-12-20 20:00:05 -03:00
okbel 37eafd2fed Adding Classes 2017-12-20 19:59:14 -03:00
Wyatt JohnsonandGitHub e2cb3fdd3d Merge pull request #1232 from coralproject/expiry-fix
Expiry Parsing Bug
v3.9.1
2017-12-20 15:48:52 -07:00
Wyatt Johnson 2233d993c2 fixed expiry loading 2017-12-20 15:27:55 -07:00
okbel 5d51f71f0c Test 2017-12-20 18:48:43 -03:00
okbel a989a0b20e Adding Classes to the PageObject 2017-12-20 18:48:30 -03:00
okbel 4f3a400358 Classes for AccountHistory 2017-12-20 18:48:10 -03:00
okbel f67f1e3b52 Adding role, instead of roles. And disable banning and suspending for the user thats logged in 2017-12-20 18:10:13 -03:00
okbel 570c0edfb3 merge conficts 2017-12-20 16:06:55 -03:00
Wyatt JohnsonandGitHub b2cc4bdb12 Merge pull request #1231 from coralproject/subscription-hooks
Subscription Connection Plugin Hooks
2017-12-20 10:07:21 -07:00