Download as
Browse Code »

Commit f5dd1ddb32a7f31ec252edddda946cd033b68e13

Authored by Carlos Purificação
2 parents c1e52b1d f9734ec5
Exists in master and in 30 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Merge branch 'people-block'

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
src/app/main/main.component.ts
  Diff comments   View file @f5dd1dd
@@ -8,7 +8,7 @@ import {BoxesComponent} from "../layout/boxes/boxes.component"; @@ -8,7 +8,7 @@ import {BoxesComponent} from "../layout/boxes/boxes.component";
8 import {BlockComponent} from "../layout/blocks/block.component"; 8 import {BlockComponent} from "../layout/blocks/block.component";
9 import {EnvironmentComponent} from "../environment/environment.component"; 9 import {EnvironmentComponent} from "../environment/environment.component";
10 import {EnvironmentHomeComponent} from "../environment/environment-home.component"; 10 import {EnvironmentHomeComponent} from "../environment/environment-home.component";
11 - 11 +import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component"
12 import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component"; 12 import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component";
13 import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component"; 13 import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
14 import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component"; 14 import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
@@ -81,7 +81,7 @@ export class EnvironmentContent { @@ -81,7 +81,7 @@ export class EnvironmentContent {
81 template: '<div ng-view></div>', 81 template: '<div ng-view></div>',
82 directives: [ 82 directives: [
83 ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent, 83 ArticleBlogComponent, ArticleViewComponent, BoxesComponent, BlockComponent,
84 - EnvironmentComponent, 84 + EnvironmentComponent, PeopleBlockComponent,
85 LinkListBlockComponent, CommunitiesBlockComponent, 85 LinkListBlockComponent, CommunitiesBlockComponent,
86 MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent, 86 MainBlockComponent, RecentDocumentsBlockComponent, Navbar, ProfileImageBlockComponent,
87 MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent 87 MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent