Commit Graph

3341 Commits

Author SHA1 Message Date
Riley Davis b34cd2d4c1 Merge branch 'master' into premod-load-collapse 2017-04-19 09:50:30 -06:00
Riley Davis bd0852bf68 Merge pull request #506 from coralproject/fix-load-more-premod
Fix load more in premod queue
2017-04-19 09:48:40 -06:00
Chi Vinh Le f724353cf0 Fix collapsing UI 2017-04-19 16:38:02 +07:00
Chi Vinh Le 7698bdf930 Fix load more in premod queue 2017-04-19 16:35:53 +07:00
Kiwi 1750510d34 Merge pull request #504 from coralproject/valid-notification-actions
Return a value for notification actions
2017-04-19 16:12:40 +07:00
Chi Vinh Le 4ce4c74fd9 Return a value for notification actions 2017-04-19 01:09:59 +07:00
Belén Curcio bfacc8f2f7 Merge pull request #479 from coralproject/plugin_examples
Hooks and Context for Comment Plugins And Off-Topic Plugin
2017-04-18 13:52:30 -03:00
Belén Curcio ad15b38a5d Merge branch 'master' into plugin_examples 2017-04-18 13:46:44 -03:00
Wyatt Johnson fd6282077f Adjusted test to conform to new form 2017-04-17 16:05:44 -06:00
Gabriela Rodríguez Berón 7526d64bc0 Merge pull request #493 from coralproject/143520971-stream-settings
Configure stream settings
2017-04-17 12:45:34 -07:00
Gabriela Rodríguez Berón 04a4918fd5 Update ConfigureStreamContainer.js 2017-04-17 12:35:29 -07:00
Gabriela Rodríguez Berón 371e3b951d Merge branch 'master' into 143520971-stream-settings 2017-04-17 12:25:40 -07:00
gaba f66e12be18 Merge branch 'master' into 143520971-stream-settings 2017-04-17 12:07:19 -07:00
gaba fb010bfa67 Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor. 2017-04-17 11:51:24 -07:00
Belen Curcio e729a673a3 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-17 14:17:42 -03:00
Wyatt Johnson 404301bd43 Merge pull request #501 from coralproject/docs-update
Added note for production based deploy
2017-04-14 15:22:45 -06:00
Wyatt Johnson 8c478d1c13 Merge branch 'master' into docs-update 2017-04-14 15:18:44 -06:00
Wyatt Johnson bee27da725 Added note for production based deploy 2017-04-14 15:16:42 -06:00
David Erwin a873034288 Merge pull request #498 from coralproject/docs-update
Docs update
2017-04-14 17:16:26 -04:00
Wyatt Johnson 8164fa7813 Merge branch 'master' into docs-update 2017-04-14 15:07:02 -06:00
David Erwin d1bc747009 Merge pull request #500 from coralproject/username-profanity-fix
Username Profanity Fix
2017-04-14 17:05:27 -04:00
Wyatt Johnson e028e30afd Added line about SSL certificates 2017-04-14 15:04:35 -06:00
Wyatt Johnson d4fc8a474d Should resolve bug relating to usernames being set as "undefined" 2017-04-14 14:57:13 -06:00
Wyatt Johnson a19fe02782 Added setup/usage docs 2017-04-14 14:49:23 -06:00
Gabriela Rodríguez Berón 81e040397e Merge branch 'master' into docs-update 2017-04-14 12:09:45 -07:00
Gabriela Rodríguez Berón 99b0f8f2ad Merge pull request #497 from coralproject/docs-metrics
EXTRA-SHORT: A note on the from/to parameters.
2017-04-14 11:29:08 -07:00
Wyatt Johnson cb652dbb86 Merge branch 'master' into docs-update 2017-04-14 12:23:43 -06:00
gaba fa944927e4 A note on the from/to parameters. 2017-04-14 10:41:46 -07:00
Gabriela Rodríguez Berón fb6ba37366 Merge branch 'master' into docs-metrics 2017-04-14 10:40:28 -07:00
gaba 9cf31e0bfa A note on the from/to parameters. 2017-04-14 10:37:05 -07:00
Wyatt Johnson 061e775227 Spell checks + doc updates 2017-04-14 10:26:06 -06:00
Kim Gardner 258321201b Merge pull request #496 from coralproject/add_translations
Add translations
2017-04-13 20:15:07 -04:00
Kim Gardner 71e1c01552 Merge branch 'master' into add_translations 2017-04-13 20:10:19 -04:00
Kim Gardner 1fc0bf6ec1 Merge pull request #494 from coralproject/git-client-ignore
ignore node_modules in plugins
2017-04-13 20:09:52 -04:00
Kim Gardner e58cf8e933 Merge branch 'master' into git-client-ignore 2017-04-13 20:05:13 -04:00
Kim Gardner 7e34bc1d13 Merge pull request #477 from gobengo/ignore
Ignore User
2017-04-13 20:05:02 -04:00
Kim Gardner 193ed8c863 Merge branch 'master' into ignore 2017-04-13 20:00:59 -04:00
Wyatt Johnson 642a9b87ca Merge branch 'master' into git-client-ignore 2017-04-13 17:33:49 -06:00
gaba d9c8882d8f More translations in the configuration. 2017-04-13 16:19:21 -07:00
gaba 902071c0fe Adds title of most flagged in dashboard. 2017-04-13 16:11:25 -07:00
Riley Davis 018e88f7cf Merge pull request #495 from coralproject/143357607-close-stream
Bug on closing the stream
2017-04-13 15:28:43 -06:00
gaba c395bc8849 Adds closedAt to state... and check that closedTimeout settings exists for the Asset. 2017-04-13 14:21:45 -07:00
Riley Davis bd782b98ab Merge branch 'master' into 143520971-stream-settings 2017-04-13 15:17:45 -06:00
Riley Davis d5552df41f ignore node_modules in plugins 2017-04-13 14:46:11 -06:00
Wyatt Johnson 7aa262e97f Added new cluster style deployment docs 2017-04-13 13:46:37 -06:00
gaba fa72a661ad Going back to previous setting state as I do not want it to re-render. 2017-04-13 12:43:24 -07:00
Wyatt Johnson 90db03bc29 rearranged docs 2017-04-13 13:40:13 -06:00
Wyatt Johnson 7bcd336f51 Merge pull request #492 from coralproject/plugins-install-fix
Ignore lifecycle hooks during plugin install
2017-04-13 12:56:45 -06:00
gaba 9dae72dd8a Good catch. Use setState. 2017-04-13 11:44:08 -07:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00