Merge branch 'alias' into 'master' (7303fb99) · Commits · BDE / nk20 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nk20
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7303fb99

Commit 7303fb99 authored 5 years ago by Pierre-antoine Comby

Downloads
- Plain Diff

Merge branch 'alias' into 'master'

Alias

See merge request !31

parents 0193a4d8 ab8888a0

No related branches found

No related tags found

Loading

Pipeline #7837 passed with warnings with stages

in 4 minutes and 2 seconds

Changes 12
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
apps/member/urls.py 3 additions, 1 deletion

apps/member/urls.py
apps/member/views.py 111 additions, 10 deletions

apps/member/views.py
apps/note/forms.py 29 additions, 1 deletion

apps/note/forms.py
apps/note/models/notes.py 7 additions, 11 deletions

apps/note/models/notes.py
apps/note/tables.py 21 additions, 2 deletions

apps/note/tables.py
media/pic/default.png 0 additions, 0 deletions

media/pic/default.png
note_kfet/settings/base.py 8 additions, 0 deletions

note_kfet/settings/base.py
note_kfet/urls.py 7 additions, 1 deletion

note_kfet/urls.py
templates/member/profile_alias.html 19 additions, 0 deletions

templates/member/profile_alias.html
templates/member/profile_detail.html 14 additions, 5 deletions

templates/member/profile_detail.html
templates/member/profile_picture_update.html 97 additions, 0 deletions

templates/member/profile_picture_update.html

with 317 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