Commit Graph

8345 Commits

Author SHA1 Message Date
Wyatt Johnson 7b6c59b6f1 Merge branch 'master' into admin-pages 2017-12-30 02:56:02 -07:00
Wyatt Johnson 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 Gakhov 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
MEL27 ae0407ed5e Refine zh_CN translation 2017-12-26 12:08:47 +08:00
MEL27 a5d7bca8c0 Refine zh_CN translation 2017-12-26 00:20:58 +08:00
MEL27 8a40093399 Refine zh_CN translation 2017-12-25 22:22:46 +08:00
MEL27 b3d76bba05 Miscellaneous zh_CN translation changes 2017-12-25 17:45:03 +08:00
Kim Gardner e5a00d0793 Merge branch 'master' into master 2017-12-24 16:01:39 -05:00
MEL27 5f0f97edbb Refine locales/zh_CN.yml 2017-12-24 16:55:10 +08:00
MEL27 19c46d3b32 Refine Simplified Chinese translation 2017-12-24 12:51:19 +08:00
MEL27 5b356e6249 Add initial Simplified Chinese translation 2017-12-24 12:22:44 +08:00
Wyatt Johnson 20878ba040 css and standardization on all admin pages 2017-12-21 23:27:37 -07: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 Johnson 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 Gardner 01707a5150 Merge branch 'master' into safari-bs-changes 2017-12-21 15:26:31 -05:00
Kim Gardner 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 Johnson 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
Chi Vinh Le 3c97ce3f66 Merge branch 'safari-bs-changes' of ssh://github.com/coralproject/talk into safari-bs-changes 2017-12-21 14:12:43 +01:00
Chi Vinh Le f8c1733e14 Remove sendKey hack 2017-12-21 14:11:23 +01:00
Chi Vinh Le 2e726c9d6a Set window position 2017-12-21 14:10:28 +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
Kiwi 918b863820 Merge branch 'master' into safari-bs-changes 2017-12-21 12:47:22 +01:00
Chi Vinh Le 3c5991453d Merge branch 'safari-bs-changes' of ssh://github.com/coralproject/talk into safari-bs-changes 2017-12-21 12:32:33 +01:00
Chi Vinh Le 3776c4d050 Use private ip 2017-12-21 12:31:36 +01: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