1
0
mirror of https://github.com/flarum/core.git synced 2025-07-29 20:50:28 +02:00

Update for composer branch

This commit is contained in:
Toby Zerner
2015-10-13 12:29:22 +10:30
parent d76e27559e
commit d333a60aa4
18 changed files with 244 additions and 153 deletions

View File

@@ -5,6 +5,6 @@ gulp({
'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js'
],
modules: {
'embed': 'src/**/*.js'
'flarum/embed': 'src/**/*.js'
}
});

File diff suppressed because one or more lines are too long

View File

@@ -4,7 +4,7 @@ import Composer from 'flarum/components/Composer';
import ModalManager from 'flarum/components/ModalManager';
import AlertManager from 'flarum/components/AlertManager';
import DiscussionPage from 'embed/components/DiscussionPage';
import DiscussionPage from 'flarum/embed/components/DiscussionPage';
app.initializers.add('boot', () => {
override(m, 'route', function(original, root, arg1, arg2, vdom) {