4eaa234dd8
Merge branch 'master' into simplified-chinese-merge-fixes
2018-01-04 16:48:46 -05:00
bf1fbfe03f
Fix merge conflicts on master
2018-01-04 16:43:51 -05:00
1125351cd1
Merge pull request #1243 from larrylizhao/feature/zh_tw
...
Adding traditional Chinese locales for Coral talk
2018-01-04 15:35:22 -05:00
c7176a4660
Merge branch 'master' into feature/zh_tw
2018-01-04 11:21:07 -05:00
e2534e7ca8
Merge branch 'master' into master
2018-01-04 11:20:57 -05:00
270f865ccd
Merge pull request #1245 from jheasly/version_fix
...
Up patch version to match tag.
2018-01-04 09:18:28 -07:00
d7097ff729
Up patch version to match tag.
2018-01-03 17:51:58 -08:00
94f2b4397e
Merge branch 'master' into feature/zh_tw
2018-01-03 14:57:50 -07:00
517124cc93
Merge pull request #1236 from coralproject/i18n-bug-fix
...
i18n Default Language Fix
2018-01-03 14:08:11 -07:00
bb8a75937a
Fix for typo in plugin
2018-01-03 18:10:25 +08:00
783e485aa5
Add traditional Chinese locales for plugins
2018-01-03 17:21:30 +08:00
6f96bd416c
Traditional Chinese locales
2018-01-03 17:19:11 +08:00
20e3d9065f
Merge branch 'master' into i18n-bug-fix
2017-12-30 02:56:13 -07:00
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
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
ae0407ed5e
Refine zh_CN translation
2017-12-26 12:08:47 +08:00
a5d7bca8c0
Refine zh_CN translation
2017-12-26 00:20:58 +08:00
8a40093399
Refine zh_CN translation
2017-12-25 22:22:46 +08:00
b3d76bba05
Miscellaneous zh_CN translation changes
2017-12-25 17:45:03 +08:00
e5a00d0793
Merge branch 'master' into master
2017-12-24 16:01:39 -05:00
5f0f97edbb
Refine locales/zh_CN.yml
2017-12-24 16:55:10 +08:00
19c46d3b32
Refine Simplified Chinese translation
2017-12-24 12:51:19 +08:00
5b356e6249
Add initial Simplified Chinese translation
2017-12-24 12:22:44 +08:00
69e4c5478d
fixes default lang select bug
2017-12-21 23:26:34 -07:00
5488d5a7fa
Merge pull request #1234 from coralproject/modqueue-enh
...
Modqueue fixes and enhancements
2017-12-21 15:26:09 -05:00
111af0acf8
More refactor
2017-12-21 18:43:39 +01:00
e34f96832a
Refactor
2017-12-21 18:36:15 +01:00
f9e289561e
Refactor
2017-12-21 18:29:18 +01:00
2d6a05433a
Mark single dangling comments, reflow issues and scroll enhancement
2017-12-21 15:55:18 +01:00
e2cb3fdd3d
Merge pull request #1232 from coralproject/expiry-fix
...
Expiry Parsing Bug
2017-12-20 15:48:52 -07:00
2233d993c2
fixed expiry loading
2017-12-20 15:27:55 -07:00
b2cc4bdb12
Merge pull request #1231 from coralproject/subscription-hooks
...
Subscription Connection Plugin Hooks
2017-12-20 10:07:21 -07:00
0a793938d6
Merge branch 'master' into subscription-hooks
2017-12-20 09:51:10 -07:00
b46b392af4
added subscription hooks
2017-12-20 09:31:59 -07:00
998cb8d380
Merge pull request #1227 from coralproject/body-parser
...
Deprecate body-parser
2017-12-20 08:58:10 -07:00
df0ab7c1dc
removed body-parser in favor of express.json()
2017-12-19 15:11:11 -07:00
519464ce57
Merge pull request #1226 from coralproject/handle-empty-queue
...
Fix error when queue is empty
2017-12-19 20:58:34 +01:00
f27de815e6
Minor syntax issue
2017-12-19 20:48:59 +01:00
e8553c5035
Revert debug code :-D
2017-12-19 20:46:59 +01:00
349341400d
Fix error when queue is empty
2017-12-19 20:39:41 +01:00
7b92e58ff3
Merge pull request #1225 from coralproject/portal-dialog
...
Use Portal to put dialogs at the end of the document
2017-12-19 13:48:30 -05:00
f2f7742709
Adapt e2e
2017-12-19 19:40:16 +01:00
689fb4baf0
Remove z-index
2017-12-19 19:26:22 +01:00
650f98a080
Merge branch 'portal-dialog' of ssh://github.com/coralproject/talk into portal-dialog
2017-12-19 19:25:35 +01:00
88d3a53165
Make backdrop work
2017-12-19 19:24:39 +01:00
6e88976294
Merge branch 'master' into portal-dialog
2017-12-19 19:17:50 +01:00
f25cc56ddb
Use Portal to put dialogs to the end of the document
2017-12-19 19:15:45 +01:00
4134b2edb2
Merge pull request #1222 from coralproject/app-plugin
...
Added support for app plugin hook
2017-12-19 19:08:27 +01:00
5b886b6eea
Merge branch 'master' into app-plugin
2017-12-19 18:57:31 +01:00
6c80de2981
Merge pull request #1224 from coralproject/e2e-stability
...
Increase e2e stability
2017-12-19 18:57:17 +01:00
Kim Gardner