7499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
okbel	ff016e22fe	Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs	2018-01-09 10:42:28 -03:00
okbel	579644c910	Adding doNotStore	2018-01-09 10:34:24 -03:00
Wyatt Johnson	c0f266dfa5	Merge pull request #1256 from coralproject/docs-typo ... Docs typo	2018-01-08 10:56:41 -07:00
Kim Gardner	99d66fef52	Docs typo	2018-01-08 11:27:25 -05:00
Kim Gardner	ad6a663179	Merge pull request #1237 from coralproject/admin-pages ... CSS Customization and i18n fixes	2018-01-05 12:20:46 -05:00
Kim Gardner	5cd6322284	Merge branch 'master' into admin-pages	2018-01-04 17:26:33 -05:00
Kim Gardner	0ab6cc3a0f	Merge pull request #1230 from coralproject/safari-bs-changes ... Safari Browserstack changes	2018-01-04 17:26:05 -05:00
Kim Gardner	c617a3446d	Merge branch 'master' into safari-bs-changes	2018-01-04 17:15:47 -05:00
Kim Gardner	d76fe5350e	Merge pull request #1238 from MEL27/master ... Add initial Simplified Chinese translation	2018-01-04 17:15:23 -05:00
Kim Gardner	927aa54feb	Merge branch 'master' into master	2018-01-04 17:03:10 -05:00
Kim Gardner	fc272ed1e1	Merge branch 'master' into master	2018-01-04 17:02:32 -05:00
Kim Gardner	882251864a	Merge pull request #1246 from coralproject/simplified-chinese-merge-fixes ... Simplified Chinese merge fixes	2018-01-04 17:01:42 -05:00
Kim Gardner	4eaa234dd8	Merge branch 'master' into simplified-chinese-merge-fixes	2018-01-04 16:48:46 -05:00
Kim Gardner	bf1fbfe03f	Fix merge conflicts on master	2018-01-04 16:43:51 -05:00
Kim Gardner	d3f93644db	Merge branch 'master' into master	2018-01-04 16:07:18 -05:00
Kim Gardner	b9412dcb10	Merge branch 'master' into master	2018-01-04 15:55:18 -05:00
Kim Gardner	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
Kiwi	2c87dac897	Merge branch 'master' into admin-pages	2018-01-04 18:42:21 +01:00
Chi Vinh Le	d5bf44ada8	Keep localhost for mongodb and redis	2018-01-04 18:41:31 +01:00
Kim Gardner	f8c1f1e63d	Merge branch 'master' into safari-bs-changes	2018-01-04 11:21:52 -05:00
Kim Gardner	c7176a4660	Merge branch 'master' into feature/zh_tw	2018-01-04 11:21:07 -05:00
Kim Gardner	e2534e7ca8	Merge branch 'master' into master	2018-01-04 11:20:57 -05:00
Wyatt Johnson	270f865ccd	Merge pull request #1245 from jheasly/version_fix ... Up patch version to match tag.	2018-01-04 09:18:28 -07:00
J. Heasly	d7097ff729	Up patch version to match tag.	2018-01-03 17:51:58 -08:00
Wyatt Johnson	94f2b4397e	Merge branch 'master' into feature/zh_tw	2018-01-03 14:57:50 -07:00
Wyatt Johnson	75e89591a8	Merge branch 'master' into safari-bs-changes	2018-01-03 14:54:58 -07:00
Wyatt Johnson	72b2211daa	reduced complexity	2018-01-03 14:43:35 -07:00
Wyatt Johnson	0850b1f982	added some comments	2018-01-03 14:34:50 -07:00
Wyatt Johnson	375fbd3790	resolving code climate issues	2018-01-03 14:32:19 -07:00
Wyatt Johnson	82c84de33f	code review	2018-01-03 14:22:52 -07:00
Wyatt Johnson	57972b3fb9	Merge branch 'master' into admin-pages	2018-01-03 14:08:55 -07:00
Wyatt Johnson	517124cc93	Merge pull request #1236 from coralproject/i18n-bug-fix ... i18n Default Language Fix	2018-01-03 14:08:11 -07:00
liz	bb8a75937a	Fix for typo in plugin	2018-01-03 18:10:25 +08:00
Kiwi	8060d9c22e	Merge branch 'master' into safari-bs-changes	2018-01-03 10:23:01 +01:00
liz	783e485aa5	Add traditional Chinese locales for plugins	2018-01-03 17:21:30 +08:00
liz	6f96bd416c	Traditional Chinese locales	2018-01-03 17:19:11 +08:00
Wyatt Johnson	20e3d9065f	Merge branch 'master' into i18n-bug-fix	2017-12-30 02:56:13 -07:00
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