From 10c1c4c09d16b34a9478c2273aabd37b9da20ac5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 28 Mar 2015 19:10:52 +1030 Subject: [PATCH] Move forum ember app into a subdir, preparing for admin app to exist alongside --- framework/core/ember/.ember-cli | 3 --- framework/core/ember/{ => forum}/.bowerrc | 0 framework/core/ember/{ => forum}/.editorconfig | 0 framework/core/ember/{ => forum}/.gitignore | 0 framework/core/ember/{ => forum}/.jshintrc | 0 framework/core/ember/{ => forum}/.travis.yml | 0 framework/core/ember/{ => forum}/Brocfile.js | 0 .../core/ember/{ => forum}/app/adapters/application.js | 0 framework/core/ember/{ => forum}/app/app.js | 0 .../core/ember/{ => forum}/app/authenticators/flarum.js | 0 .../core/ember/{ => forum}/app/authorizers/flarum.js | 0 .../{ => forum}/app/components/application/back-button.js | 0 .../app/components/application/forum-statistic.js | 0 .../application/notification-discussion-renamed.js | 0 .../app/components/application/notification-item.js | 0 .../app/components/application/notification.js | 0 .../{ => forum}/app/components/application/powered-by.js | 0 .../app/components/application/user-dropdown.js | 0 .../app/components/application/user-notifications.js | 0 .../{ => forum}/app/components/composer/composer-body.js | 0 .../app/components/composer/composer-discussion.js | 0 .../{ => forum}/app/components/composer/composer-edit.js | 0 .../{ => forum}/app/components/composer/composer-reply.js | 0 .../{ => forum}/app/components/discussion/post-comment.js | 0 .../app/components/discussion/post-discussion-renamed.js | 0 .../app/components/discussion/post-header/edited.js | 0 .../app/components/discussion/post-header/meta.js | 0 .../app/components/discussion/post-header/toggle.js | 0 .../app/components/discussion/post-header/user.js | 0 .../app/components/discussion/stream-content.js | 0 .../{ => forum}/app/components/discussion/stream-item.js | 0 .../app/components/discussion/stream-scrubber.js | 0 .../app/components/index/discussion-listing.js | 0 .../{ => forum}/app/components/index/welcome-hero.js | 0 .../ember/{ => forum}/app/components/ui/action-button.js | 0 .../ember/{ => forum}/app/components/ui/alert-message.js | 0 .../ember/{ => forum}/app/components/ui/badge-button.js | 0 .../{ => forum}/app/components/ui/dropdown-button.js | 0 .../{ => forum}/app/components/ui/dropdown-select.js | 0 .../ember/{ => forum}/app/components/ui/dropdown-split.js | 0 .../core/ember/{ => forum}/app/components/ui/field-set.js | 0 .../core/ember/{ => forum}/app/components/ui/item-list.js | 0 .../{ => forum}/app/components/ui/loading-indicator.js | 0 .../core/ember/{ => forum}/app/components/ui/nav-item.js | 0 .../ember/{ => forum}/app/components/ui/search-input.js | 0 .../ember/{ => forum}/app/components/ui/select-input.js | 0 .../ember/{ => forum}/app/components/ui/separator-item.js | 0 .../ember/{ => forum}/app/components/ui/switch-input.js | 0 .../ember/{ => forum}/app/components/ui/text-editor.js | 0 .../ember/{ => forum}/app/components/ui/text-input.js | 0 .../ember/{ => forum}/app/components/ui/yesno-input.js | 0 .../{ => forum}/app/components/user/activity-item.js | 0 .../{ => forum}/app/components/user/activity-post.js | 0 .../{ => forum}/app/components/user/avatar-editor.js | 0 .../{ => forum}/app/components/user/notification-grid.js | 0 .../ember/{ => forum}/app/components/user/user-bio.js | 0 .../ember/{ => forum}/app/components/user/user-card.js | 0 framework/core/ember/{ => forum}/app/controllers/.gitkeep | 0 .../core/ember/{ => forum}/app/controllers/alerts.js | 0 .../core/ember/{ => forum}/app/controllers/application.js | 0 .../core/ember/{ => forum}/app/controllers/composer.js | 0 .../core/ember/{ => forum}/app/controllers/discussion.js | 0 framework/core/ember/{ => forum}/app/controllers/index.js | 0 .../core/ember/{ => forum}/app/controllers/index/index.js | 0 framework/core/ember/{ => forum}/app/controllers/login.js | 0 .../core/ember/{ => forum}/app/controllers/signup.js | 0 framework/core/ember/{ => forum}/app/controllers/user.js | 0 .../ember/{ => forum}/app/controllers/user/activity.js | 0 framework/core/ember/{ => forum}/app/helpers/.gitkeep | 0 .../ember/{ => forum}/app/helpers/abbreviate-number.js | 0 framework/core/ember/{ => forum}/app/helpers/fa-icon.js | 0 framework/core/ember/{ => forum}/app/helpers/full-time.js | 0 .../core/ember/{ => forum}/app/helpers/highlight-words.js | 0 .../core/ember/{ => forum}/app/helpers/human-time.js | 0 .../core/ember/{ => forum}/app/helpers/user-avatar.js | 0 framework/core/ember/{ => forum}/app/helpers/user-name.js | 0 framework/core/ember/{ => forum}/app/index.html | 0 .../ember/{ => forum}/app/initializers/authentication.js | 0 .../ember/{ => forum}/app/initializers/find-query-one.js | 0 .../{ => forum}/app/initializers/human-time-updater.js | 0 .../{ => forum}/app/initializers/inject-components.js | 0 .../ember/{ => forum}/app/initializers/preload-data.js | 0 .../ember/{ => forum}/app/mixins/add-css-class-to-body.js | 0 framework/core/ember/{ => forum}/app/mixins/fade-in.js | 0 .../core/ember/{ => forum}/app/mixins/has-item-lists.js | 0 .../core/ember/{ => forum}/app/mixins/modal-controller.js | 0 framework/core/ember/{ => forum}/app/mixins/modal-view.js | 0 framework/core/ember/{ => forum}/app/mixins/paneable.js | 0 .../core/ember/{ => forum}/app/mixins/pushes-history.js | 0 .../core/ember/{ => forum}/app/mixins/use-composer.js | 0 framework/core/ember/{ => forum}/app/models/.gitkeep | 0 framework/core/ember/{ => forum}/app/models/activity.js | 0 .../ember/{ => forum}/app/models/discussion-result.js | 0 framework/core/ember/{ => forum}/app/models/discussion.js | 0 framework/core/ember/{ => forum}/app/models/group.js | 0 .../core/ember/{ => forum}/app/models/notification.js | 0 .../core/ember/{ => forum}/app/models/post-result.js | 0 .../core/ember/{ => forum}/app/models/post-stream.js | 0 framework/core/ember/{ => forum}/app/models/post.js | 0 framework/core/ember/{ => forum}/app/models/subject.js | 0 framework/core/ember/{ => forum}/app/models/user.js | 0 framework/core/ember/{ => forum}/app/router.js | 0 framework/core/ember/{ => forum}/app/routes/.gitkeep | 0 .../core/ember/{ => forum}/app/routes/application.js | 0 framework/core/ember/{ => forum}/app/routes/discussion.js | 0 framework/core/ember/{ => forum}/app/routes/index.js | 0 .../core/ember/{ => forum}/app/routes/index/index.js | 0 framework/core/ember/{ => forum}/app/routes/user.js | 0 .../core/ember/{ => forum}/app/routes/user/activity.js | 0 .../core/ember/{ => forum}/app/routes/user/settings.js | 0 .../core/ember/{ => forum}/app/serializers/application.js | 0 framework/core/ember/{ => forum}/app/serializers/post.js | 0 framework/core/ember/{ => forum}/app/styles/.gitkeep | 0 framework/core/ember/{ => forum}/app/styles/app.less | 0 .../ember/{ => forum}/app/styles/bootstrap/bootstrap.less | 0 .../ember/{ => forum}/app/styles/bootstrap/variables.less | 0 framework/core/ember/{ => forum}/app/styles/config.less | 0 .../core/ember/{ => forum}/app/styles/flarum/alerts.less | 0 .../core/ember/{ => forum}/app/styles/flarum/avatars.less | 0 .../core/ember/{ => forum}/app/styles/flarum/badges.less | 0 .../core/ember/{ => forum}/app/styles/flarum/buttons.less | 0 .../ember/{ => forum}/app/styles/flarum/components.less | 0 .../ember/{ => forum}/app/styles/flarum/composer.less | 0 .../ember/{ => forum}/app/styles/flarum/discussion.less | 0 .../ember/{ => forum}/app/styles/flarum/dropdowns.less | 0 .../core/ember/{ => forum}/app/styles/flarum/forms.less | 0 .../core/ember/{ => forum}/app/styles/flarum/hero.less | 0 .../core/ember/{ => forum}/app/styles/flarum/index.less | 0 .../core/ember/{ => forum}/app/styles/flarum/layout.less | 0 .../core/ember/{ => forum}/app/styles/flarum/login.less | 0 .../core/ember/{ => forum}/app/styles/flarum/modals.less | 0 .../{ => forum}/app/styles/flarum/notifications.less | 0 .../ember/{ => forum}/app/styles/flarum/settings.less | 0 .../core/ember/{ => forum}/app/styles/flarum/signup.less | 0 .../core/ember/{ => forum}/app/styles/flarum/user.less | 0 framework/core/ember/{ => forum}/app/templates/.gitkeep | 0 framework/core/ember/{ => forum}/app/templates/alerts.hbs | 0 .../core/ember/{ => forum}/app/templates/application.hbs | 0 .../ember/{ => forum}/app/templates/components/.gitkeep | 0 .../app/templates/components/application/back-button.hbs | 0 .../application/notification-discussion-renamed.hbs | 0 .../components/application/notification-item.hbs | 0 .../templates/components/application/user-dropdown.hbs | 0 .../components/application/user-notifications.hbs | 0 .../app/templates/components/composer/composer-body.hbs | 0 .../app/templates/components/discussion/post-comment.hbs | 0 .../app/templates/components/discussion/post-controls.hbs | 0 .../components/discussion/post-discussion-renamed.hbs | 0 .../templates/components/discussion/post-header/meta.hbs | 0 .../templates/components/discussion/stream-content.hbs | 0 .../templates/components/discussion/stream-scrubber.hbs | 0 .../components/index/discussion-info/terminal-post.hbs | 0 .../app/templates/components/index/discussion-listing.hbs | 0 .../app/templates/components/index/welcome-hero.hbs | 0 .../app/templates/components/ui/alert-message.hbs | 0 .../app/templates/components/ui/dropdown-button.hbs | 0 .../app/templates/components/ui/dropdown-select.hbs | 0 .../app/templates/components/ui/dropdown-split.hbs | 0 .../{ => forum}/app/templates/components/ui/field-set.hbs | 0 .../{ => forum}/app/templates/components/ui/item-list.hbs | 0 .../app/templates/components/ui/search-input.hbs | 0 .../app/templates/components/ui/switch-input.hbs | 0 .../app/templates/components/ui/text-editor.hbs | 0 .../app/templates/components/ui/yesno-input.hbs | 0 .../app/templates/components/user/activity-item.hbs | 0 .../app/templates/components/user/activity-join.hbs | 0 .../app/templates/components/user/activity-post.hbs | 0 .../app/templates/components/user/avatar-editor.hbs | 0 .../app/templates/components/user/notification-grid.hbs | 0 .../app/templates/components/user/user-bio.hbs | 0 .../app/templates/components/user/user-card.hbs | 0 .../core/ember/{ => forum}/app/templates/composer.hbs | 0 .../core/ember/{ => forum}/app/templates/discussion.hbs | 0 framework/core/ember/{ => forum}/app/templates/error.hbs | 0 framework/core/ember/{ => forum}/app/templates/index.hbs | 0 .../core/ember/{ => forum}/app/templates/loading.hbs | 0 framework/core/ember/{ => forum}/app/templates/login.hbs | 0 framework/core/ember/{ => forum}/app/templates/signup.hbs | 0 framework/core/ember/{ => forum}/app/templates/user.hbs | 0 .../ember/{ => forum}/app/templates/user/activity.hbs | 0 .../ember/{ => forum}/app/templates/user/settings.hbs | 0 framework/core/ember/{ => forum}/app/utils/.gitkeep | 0 framework/core/ember/{ => forum}/app/utils/human-time.js | 0 .../core/ember/{ => forum}/app/utils/string-to-color.js | 0 .../core/ember/{ => forum}/app/utils/tagged-array.js | 0 framework/core/ember/{ => forum}/app/views/.gitkeep | 0 framework/core/ember/{ => forum}/app/views/application.js | 0 framework/core/ember/{ => forum}/app/views/composer.js | 0 framework/core/ember/{ => forum}/app/views/discussion.js | 0 framework/core/ember/{ => forum}/app/views/index.js | 0 framework/core/ember/{ => forum}/app/views/index/index.js | 0 framework/core/ember/{ => forum}/app/views/login.js | 0 framework/core/ember/{ => forum}/app/views/signup.js | 0 framework/core/ember/{ => forum}/app/views/user.js | 0 .../core/ember/{ => forum}/app/views/user/activity.js | 0 .../core/ember/{ => forum}/app/views/user/settings.js | 0 framework/core/ember/{ => forum}/bower.json | 1 - framework/core/ember/{ => forum}/config/environment.js | 0 framework/core/ember/{ => forum}/package.json | 0 framework/core/ember/{ => forum}/public/crossdomain.xml | 0 framework/core/ember/{ => forum}/public/robots.txt | 0 framework/core/ember/{ => forum}/testem.json | 0 framework/core/ember/{ => forum}/tests/.jshintrc | 0 .../core/ember/{ => forum}/tests/helpers/resolver.js | 0 .../core/ember/{ => forum}/tests/helpers/start-app.js | 0 framework/core/ember/{ => forum}/tests/index.html | 0 .../ember/{ => forum}/tests/integration/index-test.js | 0 framework/core/ember/{ => forum}/tests/test-helper.js | 0 framework/core/ember/{ => forum}/tests/unit/.gitkeep | 0 framework/core/src/Web/WebServiceProvider.php | 8 ++++---- 210 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 framework/core/ember/.ember-cli rename framework/core/ember/{ => forum}/.bowerrc (100%) rename framework/core/ember/{ => forum}/.editorconfig (100%) rename framework/core/ember/{ => forum}/.gitignore (100%) rename framework/core/ember/{ => forum}/.jshintrc (100%) rename framework/core/ember/{ => forum}/.travis.yml (100%) rename framework/core/ember/{ => forum}/Brocfile.js (100%) rename framework/core/ember/{ => forum}/app/adapters/application.js (100%) rename framework/core/ember/{ => forum}/app/app.js (100%) rename framework/core/ember/{ => forum}/app/authenticators/flarum.js (100%) rename framework/core/ember/{ => forum}/app/authorizers/flarum.js (100%) rename framework/core/ember/{ => forum}/app/components/application/back-button.js (100%) rename framework/core/ember/{ => forum}/app/components/application/forum-statistic.js (100%) rename framework/core/ember/{ => forum}/app/components/application/notification-discussion-renamed.js (100%) rename framework/core/ember/{ => forum}/app/components/application/notification-item.js (100%) rename framework/core/ember/{ => forum}/app/components/application/notification.js (100%) rename framework/core/ember/{ => forum}/app/components/application/powered-by.js (100%) rename framework/core/ember/{ => forum}/app/components/application/user-dropdown.js (100%) rename framework/core/ember/{ => forum}/app/components/application/user-notifications.js (100%) rename framework/core/ember/{ => forum}/app/components/composer/composer-body.js (100%) rename framework/core/ember/{ => forum}/app/components/composer/composer-discussion.js (100%) rename framework/core/ember/{ => forum}/app/components/composer/composer-edit.js (100%) rename framework/core/ember/{ => forum}/app/components/composer/composer-reply.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-comment.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-discussion-renamed.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-header/edited.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-header/meta.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-header/toggle.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/post-header/user.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/stream-content.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/stream-item.js (100%) rename framework/core/ember/{ => forum}/app/components/discussion/stream-scrubber.js (100%) rename framework/core/ember/{ => forum}/app/components/index/discussion-listing.js (100%) rename framework/core/ember/{ => forum}/app/components/index/welcome-hero.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/action-button.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/alert-message.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/badge-button.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/dropdown-button.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/dropdown-select.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/dropdown-split.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/field-set.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/item-list.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/loading-indicator.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/nav-item.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/search-input.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/select-input.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/separator-item.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/switch-input.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/text-editor.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/text-input.js (100%) rename framework/core/ember/{ => forum}/app/components/ui/yesno-input.js (100%) rename framework/core/ember/{ => forum}/app/components/user/activity-item.js (100%) rename framework/core/ember/{ => forum}/app/components/user/activity-post.js (100%) rename framework/core/ember/{ => forum}/app/components/user/avatar-editor.js (100%) rename framework/core/ember/{ => forum}/app/components/user/notification-grid.js (100%) rename framework/core/ember/{ => forum}/app/components/user/user-bio.js (100%) rename framework/core/ember/{ => forum}/app/components/user/user-card.js (100%) rename framework/core/ember/{ => forum}/app/controllers/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/controllers/alerts.js (100%) rename framework/core/ember/{ => forum}/app/controllers/application.js (100%) rename framework/core/ember/{ => forum}/app/controllers/composer.js (100%) rename framework/core/ember/{ => forum}/app/controllers/discussion.js (100%) rename framework/core/ember/{ => forum}/app/controllers/index.js (100%) rename framework/core/ember/{ => forum}/app/controllers/index/index.js (100%) rename framework/core/ember/{ => forum}/app/controllers/login.js (100%) rename framework/core/ember/{ => forum}/app/controllers/signup.js (100%) rename framework/core/ember/{ => forum}/app/controllers/user.js (100%) rename framework/core/ember/{ => forum}/app/controllers/user/activity.js (100%) rename framework/core/ember/{ => forum}/app/helpers/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/helpers/abbreviate-number.js (100%) rename framework/core/ember/{ => forum}/app/helpers/fa-icon.js (100%) rename framework/core/ember/{ => forum}/app/helpers/full-time.js (100%) rename framework/core/ember/{ => forum}/app/helpers/highlight-words.js (100%) rename framework/core/ember/{ => forum}/app/helpers/human-time.js (100%) rename framework/core/ember/{ => forum}/app/helpers/user-avatar.js (100%) rename framework/core/ember/{ => forum}/app/helpers/user-name.js (100%) rename framework/core/ember/{ => forum}/app/index.html (100%) rename framework/core/ember/{ => forum}/app/initializers/authentication.js (100%) rename framework/core/ember/{ => forum}/app/initializers/find-query-one.js (100%) rename framework/core/ember/{ => forum}/app/initializers/human-time-updater.js (100%) rename framework/core/ember/{ => forum}/app/initializers/inject-components.js (100%) rename framework/core/ember/{ => forum}/app/initializers/preload-data.js (100%) rename framework/core/ember/{ => forum}/app/mixins/add-css-class-to-body.js (100%) rename framework/core/ember/{ => forum}/app/mixins/fade-in.js (100%) rename framework/core/ember/{ => forum}/app/mixins/has-item-lists.js (100%) rename framework/core/ember/{ => forum}/app/mixins/modal-controller.js (100%) rename framework/core/ember/{ => forum}/app/mixins/modal-view.js (100%) rename framework/core/ember/{ => forum}/app/mixins/paneable.js (100%) rename framework/core/ember/{ => forum}/app/mixins/pushes-history.js (100%) rename framework/core/ember/{ => forum}/app/mixins/use-composer.js (100%) rename framework/core/ember/{ => forum}/app/models/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/models/activity.js (100%) rename framework/core/ember/{ => forum}/app/models/discussion-result.js (100%) rename framework/core/ember/{ => forum}/app/models/discussion.js (100%) rename framework/core/ember/{ => forum}/app/models/group.js (100%) rename framework/core/ember/{ => forum}/app/models/notification.js (100%) rename framework/core/ember/{ => forum}/app/models/post-result.js (100%) rename framework/core/ember/{ => forum}/app/models/post-stream.js (100%) rename framework/core/ember/{ => forum}/app/models/post.js (100%) rename framework/core/ember/{ => forum}/app/models/subject.js (100%) rename framework/core/ember/{ => forum}/app/models/user.js (100%) rename framework/core/ember/{ => forum}/app/router.js (100%) rename framework/core/ember/{ => forum}/app/routes/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/routes/application.js (100%) rename framework/core/ember/{ => forum}/app/routes/discussion.js (100%) rename framework/core/ember/{ => forum}/app/routes/index.js (100%) rename framework/core/ember/{ => forum}/app/routes/index/index.js (100%) rename framework/core/ember/{ => forum}/app/routes/user.js (100%) rename framework/core/ember/{ => forum}/app/routes/user/activity.js (100%) rename framework/core/ember/{ => forum}/app/routes/user/settings.js (100%) rename framework/core/ember/{ => forum}/app/serializers/application.js (100%) rename framework/core/ember/{ => forum}/app/serializers/post.js (100%) rename framework/core/ember/{ => forum}/app/styles/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/styles/app.less (100%) rename framework/core/ember/{ => forum}/app/styles/bootstrap/bootstrap.less (100%) rename framework/core/ember/{ => forum}/app/styles/bootstrap/variables.less (100%) rename framework/core/ember/{ => forum}/app/styles/config.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/alerts.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/avatars.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/badges.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/buttons.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/components.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/composer.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/discussion.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/dropdowns.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/forms.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/hero.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/index.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/layout.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/login.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/modals.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/notifications.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/settings.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/signup.less (100%) rename framework/core/ember/{ => forum}/app/styles/flarum/user.less (100%) rename framework/core/ember/{ => forum}/app/templates/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/templates/alerts.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/application.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/templates/components/application/back-button.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/application/notification-discussion-renamed.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/application/notification-item.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/application/user-dropdown.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/application/user-notifications.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/composer/composer-body.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/post-comment.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/post-controls.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/post-discussion-renamed.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/post-header/meta.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/stream-content.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/discussion/stream-scrubber.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/index/discussion-info/terminal-post.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/index/discussion-listing.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/index/welcome-hero.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/alert-message.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/dropdown-button.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/dropdown-select.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/dropdown-split.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/field-set.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/item-list.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/search-input.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/switch-input.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/text-editor.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/ui/yesno-input.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/activity-item.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/activity-join.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/activity-post.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/avatar-editor.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/notification-grid.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/user-bio.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/components/user/user-card.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/composer.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/discussion.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/error.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/index.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/loading.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/login.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/signup.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/user.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/user/activity.hbs (100%) rename framework/core/ember/{ => forum}/app/templates/user/settings.hbs (100%) rename framework/core/ember/{ => forum}/app/utils/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/utils/human-time.js (100%) rename framework/core/ember/{ => forum}/app/utils/string-to-color.js (100%) rename framework/core/ember/{ => forum}/app/utils/tagged-array.js (100%) rename framework/core/ember/{ => forum}/app/views/.gitkeep (100%) rename framework/core/ember/{ => forum}/app/views/application.js (100%) rename framework/core/ember/{ => forum}/app/views/composer.js (100%) rename framework/core/ember/{ => forum}/app/views/discussion.js (100%) rename framework/core/ember/{ => forum}/app/views/index.js (100%) rename framework/core/ember/{ => forum}/app/views/index/index.js (100%) rename framework/core/ember/{ => forum}/app/views/login.js (100%) rename framework/core/ember/{ => forum}/app/views/signup.js (100%) rename framework/core/ember/{ => forum}/app/views/user.js (100%) rename framework/core/ember/{ => forum}/app/views/user/activity.js (100%) rename framework/core/ember/{ => forum}/app/views/user/settings.js (100%) rename framework/core/ember/{ => forum}/bower.json (97%) rename framework/core/ember/{ => forum}/config/environment.js (100%) rename framework/core/ember/{ => forum}/package.json (100%) rename framework/core/ember/{ => forum}/public/crossdomain.xml (100%) rename framework/core/ember/{ => forum}/public/robots.txt (100%) rename framework/core/ember/{ => forum}/testem.json (100%) rename framework/core/ember/{ => forum}/tests/.jshintrc (100%) rename framework/core/ember/{ => forum}/tests/helpers/resolver.js (100%) rename framework/core/ember/{ => forum}/tests/helpers/start-app.js (100%) rename framework/core/ember/{ => forum}/tests/index.html (100%) rename framework/core/ember/{ => forum}/tests/integration/index-test.js (100%) rename framework/core/ember/{ => forum}/tests/test-helper.js (100%) rename framework/core/ember/{ => forum}/tests/unit/.gitkeep (100%) diff --git a/framework/core/ember/.ember-cli b/framework/core/ember/.ember-cli deleted file mode 100644 index 69595d2a5..000000000 --- a/framework/core/ember/.ember-cli +++ /dev/null @@ -1,3 +0,0 @@ -{ - "output-path": "../public" -} diff --git a/framework/core/ember/.bowerrc b/framework/core/ember/forum/.bowerrc similarity index 100% rename from framework/core/ember/.bowerrc rename to framework/core/ember/forum/.bowerrc diff --git a/framework/core/ember/.editorconfig b/framework/core/ember/forum/.editorconfig similarity index 100% rename from framework/core/ember/.editorconfig rename to framework/core/ember/forum/.editorconfig diff --git a/framework/core/ember/.gitignore b/framework/core/ember/forum/.gitignore similarity index 100% rename from framework/core/ember/.gitignore rename to framework/core/ember/forum/.gitignore diff --git a/framework/core/ember/.jshintrc b/framework/core/ember/forum/.jshintrc similarity index 100% rename from framework/core/ember/.jshintrc rename to framework/core/ember/forum/.jshintrc diff --git a/framework/core/ember/.travis.yml b/framework/core/ember/forum/.travis.yml similarity index 100% rename from framework/core/ember/.travis.yml rename to framework/core/ember/forum/.travis.yml diff --git a/framework/core/ember/Brocfile.js b/framework/core/ember/forum/Brocfile.js similarity index 100% rename from framework/core/ember/Brocfile.js rename to framework/core/ember/forum/Brocfile.js diff --git a/framework/core/ember/app/adapters/application.js b/framework/core/ember/forum/app/adapters/application.js similarity index 100% rename from framework/core/ember/app/adapters/application.js rename to framework/core/ember/forum/app/adapters/application.js diff --git a/framework/core/ember/app/app.js b/framework/core/ember/forum/app/app.js similarity index 100% rename from framework/core/ember/app/app.js rename to framework/core/ember/forum/app/app.js diff --git a/framework/core/ember/app/authenticators/flarum.js b/framework/core/ember/forum/app/authenticators/flarum.js similarity index 100% rename from framework/core/ember/app/authenticators/flarum.js rename to framework/core/ember/forum/app/authenticators/flarum.js diff --git a/framework/core/ember/app/authorizers/flarum.js b/framework/core/ember/forum/app/authorizers/flarum.js similarity index 100% rename from framework/core/ember/app/authorizers/flarum.js rename to framework/core/ember/forum/app/authorizers/flarum.js diff --git a/framework/core/ember/app/components/application/back-button.js b/framework/core/ember/forum/app/components/application/back-button.js similarity index 100% rename from framework/core/ember/app/components/application/back-button.js rename to framework/core/ember/forum/app/components/application/back-button.js diff --git a/framework/core/ember/app/components/application/forum-statistic.js b/framework/core/ember/forum/app/components/application/forum-statistic.js similarity index 100% rename from framework/core/ember/app/components/application/forum-statistic.js rename to framework/core/ember/forum/app/components/application/forum-statistic.js diff --git a/framework/core/ember/app/components/application/notification-discussion-renamed.js b/framework/core/ember/forum/app/components/application/notification-discussion-renamed.js similarity index 100% rename from framework/core/ember/app/components/application/notification-discussion-renamed.js rename to framework/core/ember/forum/app/components/application/notification-discussion-renamed.js diff --git a/framework/core/ember/app/components/application/notification-item.js b/framework/core/ember/forum/app/components/application/notification-item.js similarity index 100% rename from framework/core/ember/app/components/application/notification-item.js rename to framework/core/ember/forum/app/components/application/notification-item.js diff --git a/framework/core/ember/app/components/application/notification.js b/framework/core/ember/forum/app/components/application/notification.js similarity index 100% rename from framework/core/ember/app/components/application/notification.js rename to framework/core/ember/forum/app/components/application/notification.js diff --git a/framework/core/ember/app/components/application/powered-by.js b/framework/core/ember/forum/app/components/application/powered-by.js similarity index 100% rename from framework/core/ember/app/components/application/powered-by.js rename to framework/core/ember/forum/app/components/application/powered-by.js diff --git a/framework/core/ember/app/components/application/user-dropdown.js b/framework/core/ember/forum/app/components/application/user-dropdown.js similarity index 100% rename from framework/core/ember/app/components/application/user-dropdown.js rename to framework/core/ember/forum/app/components/application/user-dropdown.js diff --git a/framework/core/ember/app/components/application/user-notifications.js b/framework/core/ember/forum/app/components/application/user-notifications.js similarity index 100% rename from framework/core/ember/app/components/application/user-notifications.js rename to framework/core/ember/forum/app/components/application/user-notifications.js diff --git a/framework/core/ember/app/components/composer/composer-body.js b/framework/core/ember/forum/app/components/composer/composer-body.js similarity index 100% rename from framework/core/ember/app/components/composer/composer-body.js rename to framework/core/ember/forum/app/components/composer/composer-body.js diff --git a/framework/core/ember/app/components/composer/composer-discussion.js b/framework/core/ember/forum/app/components/composer/composer-discussion.js similarity index 100% rename from framework/core/ember/app/components/composer/composer-discussion.js rename to framework/core/ember/forum/app/components/composer/composer-discussion.js diff --git a/framework/core/ember/app/components/composer/composer-edit.js b/framework/core/ember/forum/app/components/composer/composer-edit.js similarity index 100% rename from framework/core/ember/app/components/composer/composer-edit.js rename to framework/core/ember/forum/app/components/composer/composer-edit.js diff --git a/framework/core/ember/app/components/composer/composer-reply.js b/framework/core/ember/forum/app/components/composer/composer-reply.js similarity index 100% rename from framework/core/ember/app/components/composer/composer-reply.js rename to framework/core/ember/forum/app/components/composer/composer-reply.js diff --git a/framework/core/ember/app/components/discussion/post-comment.js b/framework/core/ember/forum/app/components/discussion/post-comment.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-comment.js rename to framework/core/ember/forum/app/components/discussion/post-comment.js diff --git a/framework/core/ember/app/components/discussion/post-discussion-renamed.js b/framework/core/ember/forum/app/components/discussion/post-discussion-renamed.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-discussion-renamed.js rename to framework/core/ember/forum/app/components/discussion/post-discussion-renamed.js diff --git a/framework/core/ember/app/components/discussion/post-header/edited.js b/framework/core/ember/forum/app/components/discussion/post-header/edited.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-header/edited.js rename to framework/core/ember/forum/app/components/discussion/post-header/edited.js diff --git a/framework/core/ember/app/components/discussion/post-header/meta.js b/framework/core/ember/forum/app/components/discussion/post-header/meta.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-header/meta.js rename to framework/core/ember/forum/app/components/discussion/post-header/meta.js diff --git a/framework/core/ember/app/components/discussion/post-header/toggle.js b/framework/core/ember/forum/app/components/discussion/post-header/toggle.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-header/toggle.js rename to framework/core/ember/forum/app/components/discussion/post-header/toggle.js diff --git a/framework/core/ember/app/components/discussion/post-header/user.js b/framework/core/ember/forum/app/components/discussion/post-header/user.js similarity index 100% rename from framework/core/ember/app/components/discussion/post-header/user.js rename to framework/core/ember/forum/app/components/discussion/post-header/user.js diff --git a/framework/core/ember/app/components/discussion/stream-content.js b/framework/core/ember/forum/app/components/discussion/stream-content.js similarity index 100% rename from framework/core/ember/app/components/discussion/stream-content.js rename to framework/core/ember/forum/app/components/discussion/stream-content.js diff --git a/framework/core/ember/app/components/discussion/stream-item.js b/framework/core/ember/forum/app/components/discussion/stream-item.js similarity index 100% rename from framework/core/ember/app/components/discussion/stream-item.js rename to framework/core/ember/forum/app/components/discussion/stream-item.js diff --git a/framework/core/ember/app/components/discussion/stream-scrubber.js b/framework/core/ember/forum/app/components/discussion/stream-scrubber.js similarity index 100% rename from framework/core/ember/app/components/discussion/stream-scrubber.js rename to framework/core/ember/forum/app/components/discussion/stream-scrubber.js diff --git a/framework/core/ember/app/components/index/discussion-listing.js b/framework/core/ember/forum/app/components/index/discussion-listing.js similarity index 100% rename from framework/core/ember/app/components/index/discussion-listing.js rename to framework/core/ember/forum/app/components/index/discussion-listing.js diff --git a/framework/core/ember/app/components/index/welcome-hero.js b/framework/core/ember/forum/app/components/index/welcome-hero.js similarity index 100% rename from framework/core/ember/app/components/index/welcome-hero.js rename to framework/core/ember/forum/app/components/index/welcome-hero.js diff --git a/framework/core/ember/app/components/ui/action-button.js b/framework/core/ember/forum/app/components/ui/action-button.js similarity index 100% rename from framework/core/ember/app/components/ui/action-button.js rename to framework/core/ember/forum/app/components/ui/action-button.js diff --git a/framework/core/ember/app/components/ui/alert-message.js b/framework/core/ember/forum/app/components/ui/alert-message.js similarity index 100% rename from framework/core/ember/app/components/ui/alert-message.js rename to framework/core/ember/forum/app/components/ui/alert-message.js diff --git a/framework/core/ember/app/components/ui/badge-button.js b/framework/core/ember/forum/app/components/ui/badge-button.js similarity index 100% rename from framework/core/ember/app/components/ui/badge-button.js rename to framework/core/ember/forum/app/components/ui/badge-button.js diff --git a/framework/core/ember/app/components/ui/dropdown-button.js b/framework/core/ember/forum/app/components/ui/dropdown-button.js similarity index 100% rename from framework/core/ember/app/components/ui/dropdown-button.js rename to framework/core/ember/forum/app/components/ui/dropdown-button.js diff --git a/framework/core/ember/app/components/ui/dropdown-select.js b/framework/core/ember/forum/app/components/ui/dropdown-select.js similarity index 100% rename from framework/core/ember/app/components/ui/dropdown-select.js rename to framework/core/ember/forum/app/components/ui/dropdown-select.js diff --git a/framework/core/ember/app/components/ui/dropdown-split.js b/framework/core/ember/forum/app/components/ui/dropdown-split.js similarity index 100% rename from framework/core/ember/app/components/ui/dropdown-split.js rename to framework/core/ember/forum/app/components/ui/dropdown-split.js diff --git a/framework/core/ember/app/components/ui/field-set.js b/framework/core/ember/forum/app/components/ui/field-set.js similarity index 100% rename from framework/core/ember/app/components/ui/field-set.js rename to framework/core/ember/forum/app/components/ui/field-set.js diff --git a/framework/core/ember/app/components/ui/item-list.js b/framework/core/ember/forum/app/components/ui/item-list.js similarity index 100% rename from framework/core/ember/app/components/ui/item-list.js rename to framework/core/ember/forum/app/components/ui/item-list.js diff --git a/framework/core/ember/app/components/ui/loading-indicator.js b/framework/core/ember/forum/app/components/ui/loading-indicator.js similarity index 100% rename from framework/core/ember/app/components/ui/loading-indicator.js rename to framework/core/ember/forum/app/components/ui/loading-indicator.js diff --git a/framework/core/ember/app/components/ui/nav-item.js b/framework/core/ember/forum/app/components/ui/nav-item.js similarity index 100% rename from framework/core/ember/app/components/ui/nav-item.js rename to framework/core/ember/forum/app/components/ui/nav-item.js diff --git a/framework/core/ember/app/components/ui/search-input.js b/framework/core/ember/forum/app/components/ui/search-input.js similarity index 100% rename from framework/core/ember/app/components/ui/search-input.js rename to framework/core/ember/forum/app/components/ui/search-input.js diff --git a/framework/core/ember/app/components/ui/select-input.js b/framework/core/ember/forum/app/components/ui/select-input.js similarity index 100% rename from framework/core/ember/app/components/ui/select-input.js rename to framework/core/ember/forum/app/components/ui/select-input.js diff --git a/framework/core/ember/app/components/ui/separator-item.js b/framework/core/ember/forum/app/components/ui/separator-item.js similarity index 100% rename from framework/core/ember/app/components/ui/separator-item.js rename to framework/core/ember/forum/app/components/ui/separator-item.js diff --git a/framework/core/ember/app/components/ui/switch-input.js b/framework/core/ember/forum/app/components/ui/switch-input.js similarity index 100% rename from framework/core/ember/app/components/ui/switch-input.js rename to framework/core/ember/forum/app/components/ui/switch-input.js diff --git a/framework/core/ember/app/components/ui/text-editor.js b/framework/core/ember/forum/app/components/ui/text-editor.js similarity index 100% rename from framework/core/ember/app/components/ui/text-editor.js rename to framework/core/ember/forum/app/components/ui/text-editor.js diff --git a/framework/core/ember/app/components/ui/text-input.js b/framework/core/ember/forum/app/components/ui/text-input.js similarity index 100% rename from framework/core/ember/app/components/ui/text-input.js rename to framework/core/ember/forum/app/components/ui/text-input.js diff --git a/framework/core/ember/app/components/ui/yesno-input.js b/framework/core/ember/forum/app/components/ui/yesno-input.js similarity index 100% rename from framework/core/ember/app/components/ui/yesno-input.js rename to framework/core/ember/forum/app/components/ui/yesno-input.js diff --git a/framework/core/ember/app/components/user/activity-item.js b/framework/core/ember/forum/app/components/user/activity-item.js similarity index 100% rename from framework/core/ember/app/components/user/activity-item.js rename to framework/core/ember/forum/app/components/user/activity-item.js diff --git a/framework/core/ember/app/components/user/activity-post.js b/framework/core/ember/forum/app/components/user/activity-post.js similarity index 100% rename from framework/core/ember/app/components/user/activity-post.js rename to framework/core/ember/forum/app/components/user/activity-post.js diff --git a/framework/core/ember/app/components/user/avatar-editor.js b/framework/core/ember/forum/app/components/user/avatar-editor.js similarity index 100% rename from framework/core/ember/app/components/user/avatar-editor.js rename to framework/core/ember/forum/app/components/user/avatar-editor.js diff --git a/framework/core/ember/app/components/user/notification-grid.js b/framework/core/ember/forum/app/components/user/notification-grid.js similarity index 100% rename from framework/core/ember/app/components/user/notification-grid.js rename to framework/core/ember/forum/app/components/user/notification-grid.js diff --git a/framework/core/ember/app/components/user/user-bio.js b/framework/core/ember/forum/app/components/user/user-bio.js similarity index 100% rename from framework/core/ember/app/components/user/user-bio.js rename to framework/core/ember/forum/app/components/user/user-bio.js diff --git a/framework/core/ember/app/components/user/user-card.js b/framework/core/ember/forum/app/components/user/user-card.js similarity index 100% rename from framework/core/ember/app/components/user/user-card.js rename to framework/core/ember/forum/app/components/user/user-card.js diff --git a/framework/core/ember/app/controllers/.gitkeep b/framework/core/ember/forum/app/controllers/.gitkeep similarity index 100% rename from framework/core/ember/app/controllers/.gitkeep rename to framework/core/ember/forum/app/controllers/.gitkeep diff --git a/framework/core/ember/app/controllers/alerts.js b/framework/core/ember/forum/app/controllers/alerts.js similarity index 100% rename from framework/core/ember/app/controllers/alerts.js rename to framework/core/ember/forum/app/controllers/alerts.js diff --git a/framework/core/ember/app/controllers/application.js b/framework/core/ember/forum/app/controllers/application.js similarity index 100% rename from framework/core/ember/app/controllers/application.js rename to framework/core/ember/forum/app/controllers/application.js diff --git a/framework/core/ember/app/controllers/composer.js b/framework/core/ember/forum/app/controllers/composer.js similarity index 100% rename from framework/core/ember/app/controllers/composer.js rename to framework/core/ember/forum/app/controllers/composer.js diff --git a/framework/core/ember/app/controllers/discussion.js b/framework/core/ember/forum/app/controllers/discussion.js similarity index 100% rename from framework/core/ember/app/controllers/discussion.js rename to framework/core/ember/forum/app/controllers/discussion.js diff --git a/framework/core/ember/app/controllers/index.js b/framework/core/ember/forum/app/controllers/index.js similarity index 100% rename from framework/core/ember/app/controllers/index.js rename to framework/core/ember/forum/app/controllers/index.js diff --git a/framework/core/ember/app/controllers/index/index.js b/framework/core/ember/forum/app/controllers/index/index.js similarity index 100% rename from framework/core/ember/app/controllers/index/index.js rename to framework/core/ember/forum/app/controllers/index/index.js diff --git a/framework/core/ember/app/controllers/login.js b/framework/core/ember/forum/app/controllers/login.js similarity index 100% rename from framework/core/ember/app/controllers/login.js rename to framework/core/ember/forum/app/controllers/login.js diff --git a/framework/core/ember/app/controllers/signup.js b/framework/core/ember/forum/app/controllers/signup.js similarity index 100% rename from framework/core/ember/app/controllers/signup.js rename to framework/core/ember/forum/app/controllers/signup.js diff --git a/framework/core/ember/app/controllers/user.js b/framework/core/ember/forum/app/controllers/user.js similarity index 100% rename from framework/core/ember/app/controllers/user.js rename to framework/core/ember/forum/app/controllers/user.js diff --git a/framework/core/ember/app/controllers/user/activity.js b/framework/core/ember/forum/app/controllers/user/activity.js similarity index 100% rename from framework/core/ember/app/controllers/user/activity.js rename to framework/core/ember/forum/app/controllers/user/activity.js diff --git a/framework/core/ember/app/helpers/.gitkeep b/framework/core/ember/forum/app/helpers/.gitkeep similarity index 100% rename from framework/core/ember/app/helpers/.gitkeep rename to framework/core/ember/forum/app/helpers/.gitkeep diff --git a/framework/core/ember/app/helpers/abbreviate-number.js b/framework/core/ember/forum/app/helpers/abbreviate-number.js similarity index 100% rename from framework/core/ember/app/helpers/abbreviate-number.js rename to framework/core/ember/forum/app/helpers/abbreviate-number.js diff --git a/framework/core/ember/app/helpers/fa-icon.js b/framework/core/ember/forum/app/helpers/fa-icon.js similarity index 100% rename from framework/core/ember/app/helpers/fa-icon.js rename to framework/core/ember/forum/app/helpers/fa-icon.js diff --git a/framework/core/ember/app/helpers/full-time.js b/framework/core/ember/forum/app/helpers/full-time.js similarity index 100% rename from framework/core/ember/app/helpers/full-time.js rename to framework/core/ember/forum/app/helpers/full-time.js diff --git a/framework/core/ember/app/helpers/highlight-words.js b/framework/core/ember/forum/app/helpers/highlight-words.js similarity index 100% rename from framework/core/ember/app/helpers/highlight-words.js rename to framework/core/ember/forum/app/helpers/highlight-words.js diff --git a/framework/core/ember/app/helpers/human-time.js b/framework/core/ember/forum/app/helpers/human-time.js similarity index 100% rename from framework/core/ember/app/helpers/human-time.js rename to framework/core/ember/forum/app/helpers/human-time.js diff --git a/framework/core/ember/app/helpers/user-avatar.js b/framework/core/ember/forum/app/helpers/user-avatar.js similarity index 100% rename from framework/core/ember/app/helpers/user-avatar.js rename to framework/core/ember/forum/app/helpers/user-avatar.js diff --git a/framework/core/ember/app/helpers/user-name.js b/framework/core/ember/forum/app/helpers/user-name.js similarity index 100% rename from framework/core/ember/app/helpers/user-name.js rename to framework/core/ember/forum/app/helpers/user-name.js diff --git a/framework/core/ember/app/index.html b/framework/core/ember/forum/app/index.html similarity index 100% rename from framework/core/ember/app/index.html rename to framework/core/ember/forum/app/index.html diff --git a/framework/core/ember/app/initializers/authentication.js b/framework/core/ember/forum/app/initializers/authentication.js similarity index 100% rename from framework/core/ember/app/initializers/authentication.js rename to framework/core/ember/forum/app/initializers/authentication.js diff --git a/framework/core/ember/app/initializers/find-query-one.js b/framework/core/ember/forum/app/initializers/find-query-one.js similarity index 100% rename from framework/core/ember/app/initializers/find-query-one.js rename to framework/core/ember/forum/app/initializers/find-query-one.js diff --git a/framework/core/ember/app/initializers/human-time-updater.js b/framework/core/ember/forum/app/initializers/human-time-updater.js similarity index 100% rename from framework/core/ember/app/initializers/human-time-updater.js rename to framework/core/ember/forum/app/initializers/human-time-updater.js diff --git a/framework/core/ember/app/initializers/inject-components.js b/framework/core/ember/forum/app/initializers/inject-components.js similarity index 100% rename from framework/core/ember/app/initializers/inject-components.js rename to framework/core/ember/forum/app/initializers/inject-components.js diff --git a/framework/core/ember/app/initializers/preload-data.js b/framework/core/ember/forum/app/initializers/preload-data.js similarity index 100% rename from framework/core/ember/app/initializers/preload-data.js rename to framework/core/ember/forum/app/initializers/preload-data.js diff --git a/framework/core/ember/app/mixins/add-css-class-to-body.js b/framework/core/ember/forum/app/mixins/add-css-class-to-body.js similarity index 100% rename from framework/core/ember/app/mixins/add-css-class-to-body.js rename to framework/core/ember/forum/app/mixins/add-css-class-to-body.js diff --git a/framework/core/ember/app/mixins/fade-in.js b/framework/core/ember/forum/app/mixins/fade-in.js similarity index 100% rename from framework/core/ember/app/mixins/fade-in.js rename to framework/core/ember/forum/app/mixins/fade-in.js diff --git a/framework/core/ember/app/mixins/has-item-lists.js b/framework/core/ember/forum/app/mixins/has-item-lists.js similarity index 100% rename from framework/core/ember/app/mixins/has-item-lists.js rename to framework/core/ember/forum/app/mixins/has-item-lists.js diff --git a/framework/core/ember/app/mixins/modal-controller.js b/framework/core/ember/forum/app/mixins/modal-controller.js similarity index 100% rename from framework/core/ember/app/mixins/modal-controller.js rename to framework/core/ember/forum/app/mixins/modal-controller.js diff --git a/framework/core/ember/app/mixins/modal-view.js b/framework/core/ember/forum/app/mixins/modal-view.js similarity index 100% rename from framework/core/ember/app/mixins/modal-view.js rename to framework/core/ember/forum/app/mixins/modal-view.js diff --git a/framework/core/ember/app/mixins/paneable.js b/framework/core/ember/forum/app/mixins/paneable.js similarity index 100% rename from framework/core/ember/app/mixins/paneable.js rename to framework/core/ember/forum/app/mixins/paneable.js diff --git a/framework/core/ember/app/mixins/pushes-history.js b/framework/core/ember/forum/app/mixins/pushes-history.js similarity index 100% rename from framework/core/ember/app/mixins/pushes-history.js rename to framework/core/ember/forum/app/mixins/pushes-history.js diff --git a/framework/core/ember/app/mixins/use-composer.js b/framework/core/ember/forum/app/mixins/use-composer.js similarity index 100% rename from framework/core/ember/app/mixins/use-composer.js rename to framework/core/ember/forum/app/mixins/use-composer.js diff --git a/framework/core/ember/app/models/.gitkeep b/framework/core/ember/forum/app/models/.gitkeep similarity index 100% rename from framework/core/ember/app/models/.gitkeep rename to framework/core/ember/forum/app/models/.gitkeep diff --git a/framework/core/ember/app/models/activity.js b/framework/core/ember/forum/app/models/activity.js similarity index 100% rename from framework/core/ember/app/models/activity.js rename to framework/core/ember/forum/app/models/activity.js diff --git a/framework/core/ember/app/models/discussion-result.js b/framework/core/ember/forum/app/models/discussion-result.js similarity index 100% rename from framework/core/ember/app/models/discussion-result.js rename to framework/core/ember/forum/app/models/discussion-result.js diff --git a/framework/core/ember/app/models/discussion.js b/framework/core/ember/forum/app/models/discussion.js similarity index 100% rename from framework/core/ember/app/models/discussion.js rename to framework/core/ember/forum/app/models/discussion.js diff --git a/framework/core/ember/app/models/group.js b/framework/core/ember/forum/app/models/group.js similarity index 100% rename from framework/core/ember/app/models/group.js rename to framework/core/ember/forum/app/models/group.js diff --git a/framework/core/ember/app/models/notification.js b/framework/core/ember/forum/app/models/notification.js similarity index 100% rename from framework/core/ember/app/models/notification.js rename to framework/core/ember/forum/app/models/notification.js diff --git a/framework/core/ember/app/models/post-result.js b/framework/core/ember/forum/app/models/post-result.js similarity index 100% rename from framework/core/ember/app/models/post-result.js rename to framework/core/ember/forum/app/models/post-result.js diff --git a/framework/core/ember/app/models/post-stream.js b/framework/core/ember/forum/app/models/post-stream.js similarity index 100% rename from framework/core/ember/app/models/post-stream.js rename to framework/core/ember/forum/app/models/post-stream.js diff --git a/framework/core/ember/app/models/post.js b/framework/core/ember/forum/app/models/post.js similarity index 100% rename from framework/core/ember/app/models/post.js rename to framework/core/ember/forum/app/models/post.js diff --git a/framework/core/ember/app/models/subject.js b/framework/core/ember/forum/app/models/subject.js similarity index 100% rename from framework/core/ember/app/models/subject.js rename to framework/core/ember/forum/app/models/subject.js diff --git a/framework/core/ember/app/models/user.js b/framework/core/ember/forum/app/models/user.js similarity index 100% rename from framework/core/ember/app/models/user.js rename to framework/core/ember/forum/app/models/user.js diff --git a/framework/core/ember/app/router.js b/framework/core/ember/forum/app/router.js similarity index 100% rename from framework/core/ember/app/router.js rename to framework/core/ember/forum/app/router.js diff --git a/framework/core/ember/app/routes/.gitkeep b/framework/core/ember/forum/app/routes/.gitkeep similarity index 100% rename from framework/core/ember/app/routes/.gitkeep rename to framework/core/ember/forum/app/routes/.gitkeep diff --git a/framework/core/ember/app/routes/application.js b/framework/core/ember/forum/app/routes/application.js similarity index 100% rename from framework/core/ember/app/routes/application.js rename to framework/core/ember/forum/app/routes/application.js diff --git a/framework/core/ember/app/routes/discussion.js b/framework/core/ember/forum/app/routes/discussion.js similarity index 100% rename from framework/core/ember/app/routes/discussion.js rename to framework/core/ember/forum/app/routes/discussion.js diff --git a/framework/core/ember/app/routes/index.js b/framework/core/ember/forum/app/routes/index.js similarity index 100% rename from framework/core/ember/app/routes/index.js rename to framework/core/ember/forum/app/routes/index.js diff --git a/framework/core/ember/app/routes/index/index.js b/framework/core/ember/forum/app/routes/index/index.js similarity index 100% rename from framework/core/ember/app/routes/index/index.js rename to framework/core/ember/forum/app/routes/index/index.js diff --git a/framework/core/ember/app/routes/user.js b/framework/core/ember/forum/app/routes/user.js similarity index 100% rename from framework/core/ember/app/routes/user.js rename to framework/core/ember/forum/app/routes/user.js diff --git a/framework/core/ember/app/routes/user/activity.js b/framework/core/ember/forum/app/routes/user/activity.js similarity index 100% rename from framework/core/ember/app/routes/user/activity.js rename to framework/core/ember/forum/app/routes/user/activity.js diff --git a/framework/core/ember/app/routes/user/settings.js b/framework/core/ember/forum/app/routes/user/settings.js similarity index 100% rename from framework/core/ember/app/routes/user/settings.js rename to framework/core/ember/forum/app/routes/user/settings.js diff --git a/framework/core/ember/app/serializers/application.js b/framework/core/ember/forum/app/serializers/application.js similarity index 100% rename from framework/core/ember/app/serializers/application.js rename to framework/core/ember/forum/app/serializers/application.js diff --git a/framework/core/ember/app/serializers/post.js b/framework/core/ember/forum/app/serializers/post.js similarity index 100% rename from framework/core/ember/app/serializers/post.js rename to framework/core/ember/forum/app/serializers/post.js diff --git a/framework/core/ember/app/styles/.gitkeep b/framework/core/ember/forum/app/styles/.gitkeep similarity index 100% rename from framework/core/ember/app/styles/.gitkeep rename to framework/core/ember/forum/app/styles/.gitkeep diff --git a/framework/core/ember/app/styles/app.less b/framework/core/ember/forum/app/styles/app.less similarity index 100% rename from framework/core/ember/app/styles/app.less rename to framework/core/ember/forum/app/styles/app.less diff --git a/framework/core/ember/app/styles/bootstrap/bootstrap.less b/framework/core/ember/forum/app/styles/bootstrap/bootstrap.less similarity index 100% rename from framework/core/ember/app/styles/bootstrap/bootstrap.less rename to framework/core/ember/forum/app/styles/bootstrap/bootstrap.less diff --git a/framework/core/ember/app/styles/bootstrap/variables.less b/framework/core/ember/forum/app/styles/bootstrap/variables.less similarity index 100% rename from framework/core/ember/app/styles/bootstrap/variables.less rename to framework/core/ember/forum/app/styles/bootstrap/variables.less diff --git a/framework/core/ember/app/styles/config.less b/framework/core/ember/forum/app/styles/config.less similarity index 100% rename from framework/core/ember/app/styles/config.less rename to framework/core/ember/forum/app/styles/config.less diff --git a/framework/core/ember/app/styles/flarum/alerts.less b/framework/core/ember/forum/app/styles/flarum/alerts.less similarity index 100% rename from framework/core/ember/app/styles/flarum/alerts.less rename to framework/core/ember/forum/app/styles/flarum/alerts.less diff --git a/framework/core/ember/app/styles/flarum/avatars.less b/framework/core/ember/forum/app/styles/flarum/avatars.less similarity index 100% rename from framework/core/ember/app/styles/flarum/avatars.less rename to framework/core/ember/forum/app/styles/flarum/avatars.less diff --git a/framework/core/ember/app/styles/flarum/badges.less b/framework/core/ember/forum/app/styles/flarum/badges.less similarity index 100% rename from framework/core/ember/app/styles/flarum/badges.less rename to framework/core/ember/forum/app/styles/flarum/badges.less diff --git a/framework/core/ember/app/styles/flarum/buttons.less b/framework/core/ember/forum/app/styles/flarum/buttons.less similarity index 100% rename from framework/core/ember/app/styles/flarum/buttons.less rename to framework/core/ember/forum/app/styles/flarum/buttons.less diff --git a/framework/core/ember/app/styles/flarum/components.less b/framework/core/ember/forum/app/styles/flarum/components.less similarity index 100% rename from framework/core/ember/app/styles/flarum/components.less rename to framework/core/ember/forum/app/styles/flarum/components.less diff --git a/framework/core/ember/app/styles/flarum/composer.less b/framework/core/ember/forum/app/styles/flarum/composer.less similarity index 100% rename from framework/core/ember/app/styles/flarum/composer.less rename to framework/core/ember/forum/app/styles/flarum/composer.less diff --git a/framework/core/ember/app/styles/flarum/discussion.less b/framework/core/ember/forum/app/styles/flarum/discussion.less similarity index 100% rename from framework/core/ember/app/styles/flarum/discussion.less rename to framework/core/ember/forum/app/styles/flarum/discussion.less diff --git a/framework/core/ember/app/styles/flarum/dropdowns.less b/framework/core/ember/forum/app/styles/flarum/dropdowns.less similarity index 100% rename from framework/core/ember/app/styles/flarum/dropdowns.less rename to framework/core/ember/forum/app/styles/flarum/dropdowns.less diff --git a/framework/core/ember/app/styles/flarum/forms.less b/framework/core/ember/forum/app/styles/flarum/forms.less similarity index 100% rename from framework/core/ember/app/styles/flarum/forms.less rename to framework/core/ember/forum/app/styles/flarum/forms.less diff --git a/framework/core/ember/app/styles/flarum/hero.less b/framework/core/ember/forum/app/styles/flarum/hero.less similarity index 100% rename from framework/core/ember/app/styles/flarum/hero.less rename to framework/core/ember/forum/app/styles/flarum/hero.less diff --git a/framework/core/ember/app/styles/flarum/index.less b/framework/core/ember/forum/app/styles/flarum/index.less similarity index 100% rename from framework/core/ember/app/styles/flarum/index.less rename to framework/core/ember/forum/app/styles/flarum/index.less diff --git a/framework/core/ember/app/styles/flarum/layout.less b/framework/core/ember/forum/app/styles/flarum/layout.less similarity index 100% rename from framework/core/ember/app/styles/flarum/layout.less rename to framework/core/ember/forum/app/styles/flarum/layout.less diff --git a/framework/core/ember/app/styles/flarum/login.less b/framework/core/ember/forum/app/styles/flarum/login.less similarity index 100% rename from framework/core/ember/app/styles/flarum/login.less rename to framework/core/ember/forum/app/styles/flarum/login.less diff --git a/framework/core/ember/app/styles/flarum/modals.less b/framework/core/ember/forum/app/styles/flarum/modals.less similarity index 100% rename from framework/core/ember/app/styles/flarum/modals.less rename to framework/core/ember/forum/app/styles/flarum/modals.less diff --git a/framework/core/ember/app/styles/flarum/notifications.less b/framework/core/ember/forum/app/styles/flarum/notifications.less similarity index 100% rename from framework/core/ember/app/styles/flarum/notifications.less rename to framework/core/ember/forum/app/styles/flarum/notifications.less diff --git a/framework/core/ember/app/styles/flarum/settings.less b/framework/core/ember/forum/app/styles/flarum/settings.less similarity index 100% rename from framework/core/ember/app/styles/flarum/settings.less rename to framework/core/ember/forum/app/styles/flarum/settings.less diff --git a/framework/core/ember/app/styles/flarum/signup.less b/framework/core/ember/forum/app/styles/flarum/signup.less similarity index 100% rename from framework/core/ember/app/styles/flarum/signup.less rename to framework/core/ember/forum/app/styles/flarum/signup.less diff --git a/framework/core/ember/app/styles/flarum/user.less b/framework/core/ember/forum/app/styles/flarum/user.less similarity index 100% rename from framework/core/ember/app/styles/flarum/user.less rename to framework/core/ember/forum/app/styles/flarum/user.less diff --git a/framework/core/ember/app/templates/.gitkeep b/framework/core/ember/forum/app/templates/.gitkeep similarity index 100% rename from framework/core/ember/app/templates/.gitkeep rename to framework/core/ember/forum/app/templates/.gitkeep diff --git a/framework/core/ember/app/templates/alerts.hbs b/framework/core/ember/forum/app/templates/alerts.hbs similarity index 100% rename from framework/core/ember/app/templates/alerts.hbs rename to framework/core/ember/forum/app/templates/alerts.hbs diff --git a/framework/core/ember/app/templates/application.hbs b/framework/core/ember/forum/app/templates/application.hbs similarity index 100% rename from framework/core/ember/app/templates/application.hbs rename to framework/core/ember/forum/app/templates/application.hbs diff --git a/framework/core/ember/app/templates/components/.gitkeep b/framework/core/ember/forum/app/templates/components/.gitkeep similarity index 100% rename from framework/core/ember/app/templates/components/.gitkeep rename to framework/core/ember/forum/app/templates/components/.gitkeep diff --git a/framework/core/ember/app/templates/components/application/back-button.hbs b/framework/core/ember/forum/app/templates/components/application/back-button.hbs similarity index 100% rename from framework/core/ember/app/templates/components/application/back-button.hbs rename to framework/core/ember/forum/app/templates/components/application/back-button.hbs diff --git a/framework/core/ember/app/templates/components/application/notification-discussion-renamed.hbs b/framework/core/ember/forum/app/templates/components/application/notification-discussion-renamed.hbs similarity index 100% rename from framework/core/ember/app/templates/components/application/notification-discussion-renamed.hbs rename to framework/core/ember/forum/app/templates/components/application/notification-discussion-renamed.hbs diff --git a/framework/core/ember/app/templates/components/application/notification-item.hbs b/framework/core/ember/forum/app/templates/components/application/notification-item.hbs similarity index 100% rename from framework/core/ember/app/templates/components/application/notification-item.hbs rename to framework/core/ember/forum/app/templates/components/application/notification-item.hbs diff --git a/framework/core/ember/app/templates/components/application/user-dropdown.hbs b/framework/core/ember/forum/app/templates/components/application/user-dropdown.hbs similarity index 100% rename from framework/core/ember/app/templates/components/application/user-dropdown.hbs rename to framework/core/ember/forum/app/templates/components/application/user-dropdown.hbs diff --git a/framework/core/ember/app/templates/components/application/user-notifications.hbs b/framework/core/ember/forum/app/templates/components/application/user-notifications.hbs similarity index 100% rename from framework/core/ember/app/templates/components/application/user-notifications.hbs rename to framework/core/ember/forum/app/templates/components/application/user-notifications.hbs diff --git a/framework/core/ember/app/templates/components/composer/composer-body.hbs b/framework/core/ember/forum/app/templates/components/composer/composer-body.hbs similarity index 100% rename from framework/core/ember/app/templates/components/composer/composer-body.hbs rename to framework/core/ember/forum/app/templates/components/composer/composer-body.hbs diff --git a/framework/core/ember/app/templates/components/discussion/post-comment.hbs b/framework/core/ember/forum/app/templates/components/discussion/post-comment.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/post-comment.hbs rename to framework/core/ember/forum/app/templates/components/discussion/post-comment.hbs diff --git a/framework/core/ember/app/templates/components/discussion/post-controls.hbs b/framework/core/ember/forum/app/templates/components/discussion/post-controls.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/post-controls.hbs rename to framework/core/ember/forum/app/templates/components/discussion/post-controls.hbs diff --git a/framework/core/ember/app/templates/components/discussion/post-discussion-renamed.hbs b/framework/core/ember/forum/app/templates/components/discussion/post-discussion-renamed.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/post-discussion-renamed.hbs rename to framework/core/ember/forum/app/templates/components/discussion/post-discussion-renamed.hbs diff --git a/framework/core/ember/app/templates/components/discussion/post-header/meta.hbs b/framework/core/ember/forum/app/templates/components/discussion/post-header/meta.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/post-header/meta.hbs rename to framework/core/ember/forum/app/templates/components/discussion/post-header/meta.hbs diff --git a/framework/core/ember/app/templates/components/discussion/stream-content.hbs b/framework/core/ember/forum/app/templates/components/discussion/stream-content.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/stream-content.hbs rename to framework/core/ember/forum/app/templates/components/discussion/stream-content.hbs diff --git a/framework/core/ember/app/templates/components/discussion/stream-scrubber.hbs b/framework/core/ember/forum/app/templates/components/discussion/stream-scrubber.hbs similarity index 100% rename from framework/core/ember/app/templates/components/discussion/stream-scrubber.hbs rename to framework/core/ember/forum/app/templates/components/discussion/stream-scrubber.hbs diff --git a/framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs b/framework/core/ember/forum/app/templates/components/index/discussion-info/terminal-post.hbs similarity index 100% rename from framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs rename to framework/core/ember/forum/app/templates/components/index/discussion-info/terminal-post.hbs diff --git a/framework/core/ember/app/templates/components/index/discussion-listing.hbs b/framework/core/ember/forum/app/templates/components/index/discussion-listing.hbs similarity index 100% rename from framework/core/ember/app/templates/components/index/discussion-listing.hbs rename to framework/core/ember/forum/app/templates/components/index/discussion-listing.hbs diff --git a/framework/core/ember/app/templates/components/index/welcome-hero.hbs b/framework/core/ember/forum/app/templates/components/index/welcome-hero.hbs similarity index 100% rename from framework/core/ember/app/templates/components/index/welcome-hero.hbs rename to framework/core/ember/forum/app/templates/components/index/welcome-hero.hbs diff --git a/framework/core/ember/app/templates/components/ui/alert-message.hbs b/framework/core/ember/forum/app/templates/components/ui/alert-message.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/alert-message.hbs rename to framework/core/ember/forum/app/templates/components/ui/alert-message.hbs diff --git a/framework/core/ember/app/templates/components/ui/dropdown-button.hbs b/framework/core/ember/forum/app/templates/components/ui/dropdown-button.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/dropdown-button.hbs rename to framework/core/ember/forum/app/templates/components/ui/dropdown-button.hbs diff --git a/framework/core/ember/app/templates/components/ui/dropdown-select.hbs b/framework/core/ember/forum/app/templates/components/ui/dropdown-select.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/dropdown-select.hbs rename to framework/core/ember/forum/app/templates/components/ui/dropdown-select.hbs diff --git a/framework/core/ember/app/templates/components/ui/dropdown-split.hbs b/framework/core/ember/forum/app/templates/components/ui/dropdown-split.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/dropdown-split.hbs rename to framework/core/ember/forum/app/templates/components/ui/dropdown-split.hbs diff --git a/framework/core/ember/app/templates/components/ui/field-set.hbs b/framework/core/ember/forum/app/templates/components/ui/field-set.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/field-set.hbs rename to framework/core/ember/forum/app/templates/components/ui/field-set.hbs diff --git a/framework/core/ember/app/templates/components/ui/item-list.hbs b/framework/core/ember/forum/app/templates/components/ui/item-list.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/item-list.hbs rename to framework/core/ember/forum/app/templates/components/ui/item-list.hbs diff --git a/framework/core/ember/app/templates/components/ui/search-input.hbs b/framework/core/ember/forum/app/templates/components/ui/search-input.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/search-input.hbs rename to framework/core/ember/forum/app/templates/components/ui/search-input.hbs diff --git a/framework/core/ember/app/templates/components/ui/switch-input.hbs b/framework/core/ember/forum/app/templates/components/ui/switch-input.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/switch-input.hbs rename to framework/core/ember/forum/app/templates/components/ui/switch-input.hbs diff --git a/framework/core/ember/app/templates/components/ui/text-editor.hbs b/framework/core/ember/forum/app/templates/components/ui/text-editor.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/text-editor.hbs rename to framework/core/ember/forum/app/templates/components/ui/text-editor.hbs diff --git a/framework/core/ember/app/templates/components/ui/yesno-input.hbs b/framework/core/ember/forum/app/templates/components/ui/yesno-input.hbs similarity index 100% rename from framework/core/ember/app/templates/components/ui/yesno-input.hbs rename to framework/core/ember/forum/app/templates/components/ui/yesno-input.hbs diff --git a/framework/core/ember/app/templates/components/user/activity-item.hbs b/framework/core/ember/forum/app/templates/components/user/activity-item.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/activity-item.hbs rename to framework/core/ember/forum/app/templates/components/user/activity-item.hbs diff --git a/framework/core/ember/app/templates/components/user/activity-join.hbs b/framework/core/ember/forum/app/templates/components/user/activity-join.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/activity-join.hbs rename to framework/core/ember/forum/app/templates/components/user/activity-join.hbs diff --git a/framework/core/ember/app/templates/components/user/activity-post.hbs b/framework/core/ember/forum/app/templates/components/user/activity-post.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/activity-post.hbs rename to framework/core/ember/forum/app/templates/components/user/activity-post.hbs diff --git a/framework/core/ember/app/templates/components/user/avatar-editor.hbs b/framework/core/ember/forum/app/templates/components/user/avatar-editor.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/avatar-editor.hbs rename to framework/core/ember/forum/app/templates/components/user/avatar-editor.hbs diff --git a/framework/core/ember/app/templates/components/user/notification-grid.hbs b/framework/core/ember/forum/app/templates/components/user/notification-grid.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/notification-grid.hbs rename to framework/core/ember/forum/app/templates/components/user/notification-grid.hbs diff --git a/framework/core/ember/app/templates/components/user/user-bio.hbs b/framework/core/ember/forum/app/templates/components/user/user-bio.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/user-bio.hbs rename to framework/core/ember/forum/app/templates/components/user/user-bio.hbs diff --git a/framework/core/ember/app/templates/components/user/user-card.hbs b/framework/core/ember/forum/app/templates/components/user/user-card.hbs similarity index 100% rename from framework/core/ember/app/templates/components/user/user-card.hbs rename to framework/core/ember/forum/app/templates/components/user/user-card.hbs diff --git a/framework/core/ember/app/templates/composer.hbs b/framework/core/ember/forum/app/templates/composer.hbs similarity index 100% rename from framework/core/ember/app/templates/composer.hbs rename to framework/core/ember/forum/app/templates/composer.hbs diff --git a/framework/core/ember/app/templates/discussion.hbs b/framework/core/ember/forum/app/templates/discussion.hbs similarity index 100% rename from framework/core/ember/app/templates/discussion.hbs rename to framework/core/ember/forum/app/templates/discussion.hbs diff --git a/framework/core/ember/app/templates/error.hbs b/framework/core/ember/forum/app/templates/error.hbs similarity index 100% rename from framework/core/ember/app/templates/error.hbs rename to framework/core/ember/forum/app/templates/error.hbs diff --git a/framework/core/ember/app/templates/index.hbs b/framework/core/ember/forum/app/templates/index.hbs similarity index 100% rename from framework/core/ember/app/templates/index.hbs rename to framework/core/ember/forum/app/templates/index.hbs diff --git a/framework/core/ember/app/templates/loading.hbs b/framework/core/ember/forum/app/templates/loading.hbs similarity index 100% rename from framework/core/ember/app/templates/loading.hbs rename to framework/core/ember/forum/app/templates/loading.hbs diff --git a/framework/core/ember/app/templates/login.hbs b/framework/core/ember/forum/app/templates/login.hbs similarity index 100% rename from framework/core/ember/app/templates/login.hbs rename to framework/core/ember/forum/app/templates/login.hbs diff --git a/framework/core/ember/app/templates/signup.hbs b/framework/core/ember/forum/app/templates/signup.hbs similarity index 100% rename from framework/core/ember/app/templates/signup.hbs rename to framework/core/ember/forum/app/templates/signup.hbs diff --git a/framework/core/ember/app/templates/user.hbs b/framework/core/ember/forum/app/templates/user.hbs similarity index 100% rename from framework/core/ember/app/templates/user.hbs rename to framework/core/ember/forum/app/templates/user.hbs diff --git a/framework/core/ember/app/templates/user/activity.hbs b/framework/core/ember/forum/app/templates/user/activity.hbs similarity index 100% rename from framework/core/ember/app/templates/user/activity.hbs rename to framework/core/ember/forum/app/templates/user/activity.hbs diff --git a/framework/core/ember/app/templates/user/settings.hbs b/framework/core/ember/forum/app/templates/user/settings.hbs similarity index 100% rename from framework/core/ember/app/templates/user/settings.hbs rename to framework/core/ember/forum/app/templates/user/settings.hbs diff --git a/framework/core/ember/app/utils/.gitkeep b/framework/core/ember/forum/app/utils/.gitkeep similarity index 100% rename from framework/core/ember/app/utils/.gitkeep rename to framework/core/ember/forum/app/utils/.gitkeep diff --git a/framework/core/ember/app/utils/human-time.js b/framework/core/ember/forum/app/utils/human-time.js similarity index 100% rename from framework/core/ember/app/utils/human-time.js rename to framework/core/ember/forum/app/utils/human-time.js diff --git a/framework/core/ember/app/utils/string-to-color.js b/framework/core/ember/forum/app/utils/string-to-color.js similarity index 100% rename from framework/core/ember/app/utils/string-to-color.js rename to framework/core/ember/forum/app/utils/string-to-color.js diff --git a/framework/core/ember/app/utils/tagged-array.js b/framework/core/ember/forum/app/utils/tagged-array.js similarity index 100% rename from framework/core/ember/app/utils/tagged-array.js rename to framework/core/ember/forum/app/utils/tagged-array.js diff --git a/framework/core/ember/app/views/.gitkeep b/framework/core/ember/forum/app/views/.gitkeep similarity index 100% rename from framework/core/ember/app/views/.gitkeep rename to framework/core/ember/forum/app/views/.gitkeep diff --git a/framework/core/ember/app/views/application.js b/framework/core/ember/forum/app/views/application.js similarity index 100% rename from framework/core/ember/app/views/application.js rename to framework/core/ember/forum/app/views/application.js diff --git a/framework/core/ember/app/views/composer.js b/framework/core/ember/forum/app/views/composer.js similarity index 100% rename from framework/core/ember/app/views/composer.js rename to framework/core/ember/forum/app/views/composer.js diff --git a/framework/core/ember/app/views/discussion.js b/framework/core/ember/forum/app/views/discussion.js similarity index 100% rename from framework/core/ember/app/views/discussion.js rename to framework/core/ember/forum/app/views/discussion.js diff --git a/framework/core/ember/app/views/index.js b/framework/core/ember/forum/app/views/index.js similarity index 100% rename from framework/core/ember/app/views/index.js rename to framework/core/ember/forum/app/views/index.js diff --git a/framework/core/ember/app/views/index/index.js b/framework/core/ember/forum/app/views/index/index.js similarity index 100% rename from framework/core/ember/app/views/index/index.js rename to framework/core/ember/forum/app/views/index/index.js diff --git a/framework/core/ember/app/views/login.js b/framework/core/ember/forum/app/views/login.js similarity index 100% rename from framework/core/ember/app/views/login.js rename to framework/core/ember/forum/app/views/login.js diff --git a/framework/core/ember/app/views/signup.js b/framework/core/ember/forum/app/views/signup.js similarity index 100% rename from framework/core/ember/app/views/signup.js rename to framework/core/ember/forum/app/views/signup.js diff --git a/framework/core/ember/app/views/user.js b/framework/core/ember/forum/app/views/user.js similarity index 100% rename from framework/core/ember/app/views/user.js rename to framework/core/ember/forum/app/views/user.js diff --git a/framework/core/ember/app/views/user/activity.js b/framework/core/ember/forum/app/views/user/activity.js similarity index 100% rename from framework/core/ember/app/views/user/activity.js rename to framework/core/ember/forum/app/views/user/activity.js diff --git a/framework/core/ember/app/views/user/settings.js b/framework/core/ember/forum/app/views/user/settings.js similarity index 100% rename from framework/core/ember/app/views/user/settings.js rename to framework/core/ember/forum/app/views/user/settings.js diff --git a/framework/core/ember/bower.json b/framework/core/ember/forum/bower.json similarity index 97% rename from framework/core/ember/bower.json rename to framework/core/ember/forum/bower.json index 55ad66498..3f9526370 100644 --- a/framework/core/ember/bower.json +++ b/framework/core/ember/forum/bower.json @@ -15,7 +15,6 @@ "bootstrap": "~3.3.2", "font-awesome": "~4", "spin.js": "~2.0.1", - "pace": "~0.7.1", "moment": "~2.8.4", "ember-simple-auth": "0.7.2", "jquery.hotkeys": "jeresig/jquery.hotkeys#0.2.0", diff --git a/framework/core/ember/config/environment.js b/framework/core/ember/forum/config/environment.js similarity index 100% rename from framework/core/ember/config/environment.js rename to framework/core/ember/forum/config/environment.js diff --git a/framework/core/ember/package.json b/framework/core/ember/forum/package.json similarity index 100% rename from framework/core/ember/package.json rename to framework/core/ember/forum/package.json diff --git a/framework/core/ember/public/crossdomain.xml b/framework/core/ember/forum/public/crossdomain.xml similarity index 100% rename from framework/core/ember/public/crossdomain.xml rename to framework/core/ember/forum/public/crossdomain.xml diff --git a/framework/core/ember/public/robots.txt b/framework/core/ember/forum/public/robots.txt similarity index 100% rename from framework/core/ember/public/robots.txt rename to framework/core/ember/forum/public/robots.txt diff --git a/framework/core/ember/testem.json b/framework/core/ember/forum/testem.json similarity index 100% rename from framework/core/ember/testem.json rename to framework/core/ember/forum/testem.json diff --git a/framework/core/ember/tests/.jshintrc b/framework/core/ember/forum/tests/.jshintrc similarity index 100% rename from framework/core/ember/tests/.jshintrc rename to framework/core/ember/forum/tests/.jshintrc diff --git a/framework/core/ember/tests/helpers/resolver.js b/framework/core/ember/forum/tests/helpers/resolver.js similarity index 100% rename from framework/core/ember/tests/helpers/resolver.js rename to framework/core/ember/forum/tests/helpers/resolver.js diff --git a/framework/core/ember/tests/helpers/start-app.js b/framework/core/ember/forum/tests/helpers/start-app.js similarity index 100% rename from framework/core/ember/tests/helpers/start-app.js rename to framework/core/ember/forum/tests/helpers/start-app.js diff --git a/framework/core/ember/tests/index.html b/framework/core/ember/forum/tests/index.html similarity index 100% rename from framework/core/ember/tests/index.html rename to framework/core/ember/forum/tests/index.html diff --git a/framework/core/ember/tests/integration/index-test.js b/framework/core/ember/forum/tests/integration/index-test.js similarity index 100% rename from framework/core/ember/tests/integration/index-test.js rename to framework/core/ember/forum/tests/integration/index-test.js diff --git a/framework/core/ember/tests/test-helper.js b/framework/core/ember/forum/tests/test-helper.js similarity index 100% rename from framework/core/ember/tests/test-helper.js rename to framework/core/ember/forum/tests/test-helper.js diff --git a/framework/core/ember/tests/unit/.gitkeep b/framework/core/ember/forum/tests/unit/.gitkeep similarity index 100% rename from framework/core/ember/tests/unit/.gitkeep rename to framework/core/ember/forum/tests/unit/.gitkeep diff --git a/framework/core/src/Web/WebServiceProvider.php b/framework/core/src/Web/WebServiceProvider.php index a4a03ca20..32af6b2f7 100644 --- a/framework/core/src/Web/WebServiceProvider.php +++ b/framework/core/src/Web/WebServiceProvider.php @@ -17,15 +17,15 @@ class WebServiceProvider extends ServiceProvider $assetManager = $this->app['flarum.web.assetManager']; $assetManager->add([ - __DIR__.'/../../public/assets/flarum.css', - __DIR__.'/../../public/assets/vendor.js', - __DIR__.'/../../public/assets/flarum.js' + __DIR__.'/../../ember/forum/dist/assets/flarum.css', + __DIR__.'/../../ember/forum/dist/assets/vendor.js', + __DIR__.'/../../ember/forum/dist/assets/flarum.js' ]); include __DIR__.'/routes.php'; $this->publishes([ - __DIR__.'/../../public/font-awesome' => public_path('font-awesome') + __DIR__.'/../../ember/forum/dist/font-awesome' => public_path('font-awesome') ]); }