Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4f964181

Commit 4f964181 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'wyatt777/pleroma-fe-issue-353' into 'develop'

Allow remove of banner, avatar images issue #353 v2

See merge request pleroma/pleroma-fe!1156

parents 7206fee4 eea002e6

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/components/settings_modal/tabs/profile_tab.js 53 additions, 8 deletions

src/components/settings_modal/tabs/profile_tab.js
src/components/settings_modal/tabs/profile_tab.scss 34 additions, 5 deletions

src/components/settings_modal/tabs/profile_tab.scss
src/components/settings_modal/tabs/profile_tab.vue 37 additions, 14 deletions

src/components/settings_modal/tabs/profile_tab.vue
src/components/user_avatar/user_avatar.js 5 additions, 11 deletions

src/components/user_avatar/user_avatar.js
src/components/user_avatar/user_avatar.vue 1 addition, 1 deletion

src/components/user_avatar/user_avatar.vue
src/components/who_to_follow_panel/who_to_follow_panel.js 9 additions, 8 deletions

src/components/who_to_follow_panel/who_to_follow_panel.js
src/i18n/en.json 6 additions, 2 deletions

src/i18n/en.json
src/modules/instance.js 2 additions, 0 deletions

src/modules/instance.js
src/services/api/api.service.js 5 additions, 27 deletions

src/services/api/api.service.js

with 153 additions and 76 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment