Fakultas Ilmu Komputer UI

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PPI
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6f664aa5

Commit 6f664aa5 authored 2 years ago by Adira Sayidina

Downloads
- Plain Diff

Merge branch 'staging' into 'TASK-17-SSO'

# Conflicts:
#   sso/tests.py
#   sso/views.py
#   templates/loginSSO.html

parents aa6e3a82 0df12433

No related branches found

No related tags found

Loading

Changes 36

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 11 additions, 20 deletions

.gitlab-ci.yml
Dockerfile 18 additions, 0 deletions

Dockerfile
authentication/tests.py 2 additions, 1 deletion

authentication/tests.py
authentication/views.py 7 additions, 6 deletions

authentication/views.py
cloudbuild.yaml 15 additions, 0 deletions

cloudbuild.yaml
pi/filters.py 17 additions, 0 deletions

pi/filters.py
pi/tests.py 130 additions, 10 deletions

pi/tests.py
pi/urls.py 4 additions, 0 deletions

pi/urls.py
pi/views.py 35 additions, 1 deletion

pi/views.py
ppi/settings.py 3 additions, 1 deletion

ppi/settings.py
proceeding/filters.py 17 additions, 0 deletions

proceeding/filters.py
proceeding/tests.py 2 additions, 231 deletions

proceeding/tests.py
requirements.txt 4 additions, 1 deletion

requirements.txt
sm/filters.py 17 additions, 0 deletions

sm/filters.py
sm/tests.py 62 additions, 3 deletions

sm/tests.py
sm/urls.py 4 additions, 0 deletions

sm/urls.py
sm/views.py 25 additions, 1 deletion

sm/views.py
templates/base.html 4 additions, 2 deletions

templates/base.html
templates/homeDosen.html 160 additions, 41 deletions

templates/homeDosen.html
templates/homeDosenCreate.html 1 addition, 1 deletion

templates/homeDosenCreate.html

with 538 additions and 319 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

Excellence In Teamwork