Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

admin-fe
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

ac1c19a7

Commit ac1c19a7 authored 5 years ago by Maxim Filippov

:new_moon_with_face:

Downloads
- Plain Diff

Merge branch 'master' into feature/disable-settings-reports

parents a71c4c29 eeb68baf

No related branches found

No related tags found

1 merge request!43Add ability to disable settings/reports during compile time

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/permission.js 1 addition, 1 deletion

src/permission.js
src/router/index.js 5 additions, 0 deletions

src/router/index.js
src/services/pleromaAuth.js 15 additions, 0 deletions

src/services/pleromaAuth.js
src/views/errorPage/404.vue 4 additions, 7 deletions

src/views/errorPage/404.vue
src/views/login/index.vue 3 additions, 2 deletions

src/views/login/index.vue
src/views/login/pleroma.vue 26 additions, 0 deletions

src/views/login/pleroma.vue

with 55 additions and 10 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