Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

c658f57a

Commit c658f57a authored 4 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'iss-149/profile-fields-setting' into 'develop'

Profile fields setting

See merge request pleroma/pleroma-fe!997

parents 8150899a ea0a12f6

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/boot/after_store.js 2 additions, 0 deletions

src/boot/after_store.js
src/components/emoji_input/emoji_input.js 1 addition, 0 deletions

src/components/emoji_input/emoji_input.js
src/components/settings_modal/tabs/profile_tab.js 27 additions, 0 deletions

src/components/settings_modal/tabs/profile_tab.js
src/components/settings_modal/tabs/profile_tab.scss 17 additions, 0 deletions

src/components/settings_modal/tabs/profile_tab.scss
src/components/settings_modal/tabs/profile_tab.vue 48 additions, 0 deletions

src/components/settings_modal/tabs/profile_tab.vue
src/i18n/en.json 6 additions, 0 deletions

src/i18n/en.json
src/modules/users.js 10 additions, 3 deletions

src/modules/users.js
test/unit/specs/modules/users.spec.js 36 additions, 0 deletions

test/unit/specs/modules/users.spec.js

with 147 additions and 3 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