Commit Graph

7515 Commits

Author SHA1 Message Date
Kim Gardner 737b77a6ac Merge pull request #1269 from larrylizhao/feature/pluginTranslation
Translations refinement for plugins
2018-01-11 09:36:35 -05:00
liz 6e813e9663 Translations refinement for plugins 2018-01-11 17:16:26 +08:00
Kim Gardner bf76f0453b Merge pull request #1261 from coralproject/losowsky-patch-1
Small grammar fixes
2018-01-09 17:04:01 -05:00
Kim Gardner 00677148b9 Merge branch 'master' into losowsky-patch-1 2018-01-09 16:53:15 -05:00
Wyatt Johnson 7bdfb55a1c Merge pull request #1260 from coralproject/embed-events
Embed events
2018-01-09 14:53:04 -07:00
Andrew Losowsky c43051c6dd Small grammar fixes 2018-01-09 16:20:32 -05:00
Wyatt Johnson 20453dfddd refactor to cleanup 2018-01-09 14:13:02 -07:00
Wyatt Johnson 20f9bba845 Merge branch 'master' into embed-events 2018-01-09 11:25:22 -07:00
Wyatt Johnson 25e29cb79a extracted asset url 2018-01-09 11:01:10 -07:00
Wyatt Johnson 7f25f46ac0 extracted more funcs 2018-01-09 10:51:43 -07:00
Wyatt Johnson d3c1286d1a extracted events from opts 2018-01-09 10:47:58 -07:00
Kim Gardner abc6cf6366 Merge pull request #1258 from coralproject/toxic-update
Adding doNotStore param to our Toxic Comments Plugin
2018-01-09 11:51:59 -05:00
Kim Gardner eb33eb72d1 Merge branch 'master' into toxic-update 2018-01-09 11:44:44 -05:00
Kim Gardner 1a39635c0e Merge pull request #1257 from larrylizhao/feature/RefineTranslation
Feature/refine translation
2018-01-09 11:43:23 -05:00
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
liz 37d1f3361c Translation update to make it more appropriate. 2018-01-09 16:54:13 +08:00
liz 6e8b28cc8a Translation for hide off topic comments 2018-01-09 14:03:09 +08: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