Merge branch 'front_activity' into 'beta' (5ba18a2d) · 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

5ba18a2d

Commit 5ba18a2d authored 4 years ago by me5na7qbjqbrp

Downloads
- Plain Diff

Merge branch 'front_activity' into 'beta'

Cards for activity templates

See merge request !100

parents 1712d172 22a0af64

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/activity/templates/activity/activity_detail.html 15 additions, 14 deletions

apps/activity/templates/activity/activity_detail.html
apps/activity/templates/activity/activity_entry.html 139 additions, 123 deletions

apps/activity/templates/activity/activity_entry.html
apps/activity/templates/activity/activity_form.html 19 additions, 9 deletions

apps/activity/templates/activity/activity_form.html
apps/activity/templates/activity/activity_invite.html 0 additions, 15 deletions

apps/activity/templates/activity/activity_invite.html
apps/activity/templates/activity/activity_list.html 38 additions, 29 deletions

apps/activity/templates/activity/activity_list.html
apps/activity/templates/activity/includes/activity_info.html 5 additions, 5 deletions

apps/activity/templates/activity/includes/activity_info.html
apps/activity/views.py 1 addition, 1 deletion

apps/activity/views.py

with 217 additions and 196 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