Download as
Browse Code »

Commit 98db105ecac86aaa2da9464d718018b905aa9724

Authored by Carlos Purificação
2 parents 5368292d ca9bc2c8
Exists in master and in 34 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, 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 'profile-image-migration' into ngforward

Showing 2 changed files with 1 additions and 2 deletions   Show diff stats
src/app/components/auth/auth_controller.ts
  Diff comments   View file @98db105
... ... @@ -3,7 +3,7 @@ import {AuthService} from "./auth_service";
3 3  
4 4 export class AuthController {
5 5  
6   - static $inject = ["noosfero", "$log", "$stateParams", "AuthService"];
  6 + static $inject = ["$log", "$stateParams", "AuthService"];
7 7  
8 8 constructor(
9 9 private noosfero: any,
... ...
src/app/profile/profile.component.ts
  Diff comments   View file @98db105
... ... @@ -6,7 +6,6 @@ import {ContentViewer} from "../content-viewer/content-viewer.component";
6 6 import {ContentViewerActions} from "../content-viewer/content-viewer-actions.component";
7 7 import {NoosferoActivities} from "../components/noosfero-activities/activities.component";
8 8 import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
9   -import {NoosferoService} from "../components/noosfero/noosfero.service";
10 9  
11 10 import * as noosferoModels from "./../models/interfaces";
12 11  
... ...