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

026ab7c1

Commit 026ab7c1 authored 8 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

parents 91791759 be5fe039

Branches

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/App.scss 6 additions, 1 deletion

src/App.scss
src/App.vue 7 additions, 5 deletions

src/App.vue
src/_variables.scss 1 addition, 0 deletions

src/_variables.scss
src/assets/nsfw.jpg 0 additions, 0 deletions

src/assets/nsfw.jpg
src/assets/nsfw.png 0 additions, 0 deletions

src/assets/nsfw.png
src/components/attachment/attachment.js 11 additions, 5 deletions

src/components/attachment/attachment.js
src/components/attachment/attachment.vue 15 additions, 4 deletions

src/components/attachment/attachment.vue
src/components/status/status.js 9 additions, 1 deletion

src/components/status/status.js
src/components/status/status.vue 14 additions, 2 deletions

src/components/status/status.vue
src/components/timeline/timeline.vue 0 additions, 7 deletions

src/components/timeline/timeline.vue
src/components/user_profile/user_profile.vue 0 additions, 7 deletions

src/components/user_profile/user_profile.vue
src/modules/statuses.js 11 additions, 0 deletions

src/modules/statuses.js
src/services/api/api.service.js 9 additions, 0 deletions

src/services/api/api.service.js
test/unit/specs/modules/statuses.spec.js 5 additions, 0 deletions

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

with 88 additions and 32 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