Merge branch 'master' into featured-comments

Conflicts:
	client/coral-embed-stream/src/components/Stream.js
This commit is contained in:
Chi Vinh Le
2017-07-20 01:30:22 +07:00
22 changed files with 320 additions and 77 deletions
+7 -1
View File
@@ -1,3 +1,9 @@
export {t, timeago} from 'coral-framework/services/i18n';
export {can} from 'coral-framework/services/perms';
export {isSlotEmpty} from 'coral-framework/helpers/plugins';
import {isSlotEmpty as ise} from 'coral-framework/helpers/plugins';
// @TODO: Deprecated.
export function isSlotEmpty(...args) {
console.warn('A plugin is using `isSlotEmpty` which has been deprecated, please port to the new API using the `IfSlotIsEmpty` and `IfSlotIsNotEmpty` components.');
return ise(...args);
}