Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue-dcz'... (481580f9) · Commits · IPIPAN / ValUnifer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

ValUnifer
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Redmine
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

481580f9

Commit 481580f9 authored 2 years ago by

dcz

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue-dcz'...

Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue-dcz' into unified-frame-edit-view-vue-dcz

parents 4f76e784 f898e20b

Branches

Tags

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

entries/static/entries/js/components/Entries.js 10 additions, 0 deletions

entries/static/entries/js/components/Entries.js
entries/static/entries/js/components/UnificationComponent.js 10 additions, 0 deletions

entries/static/entries/js/components/UnificationComponent.js
entries/static/entries/js/components/UnificationRightPane.js 0 additions, 1 deletion

entries/static/entries/js/components/UnificationRightPane.js
entries/static/entries/js/entries.js 0 additions, 12 deletions

entries/static/entries/js/entries.js
entries/static/entries/js/entries_index.js 3 additions, 3 deletions

entries/static/entries/js/entries_index.js
entries/static/entries/js/unification_entries_list.js 37 additions, 2 deletions

entries/static/entries/js/unification_entries_list.js
entries/static/entries/js/unification_index.js 3 additions, 3 deletions

entries/static/entries/js/unification_index.js
users/forms.py 1 addition, 1 deletion

users/forms.py
users/models.py 1 addition, 0 deletions

users/models.py
users/templates/notes.html 4 additions, 1 deletion

users/templates/notes.html
users/urls.py 1 addition, 0 deletions

users/urls.py
users/views.py 9 additions, 0 deletions

users/views.py

with 79 additions and 23 deletions

0% 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