Merge branch 'develop' into 'login-register' (a419b9dd) · Commits · Gerald Sianturi / IF2250-2022-K02-2-CarbonTrackr · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

IF2250-2022-K02-2-CarbonTrackr
- Activity
- Members
- Labels
- Wiki
- Environments
- Terraform modules

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Gerald Sianturi
IF2250-2022-K02-2-CarbonTrackr
Commits
a419b9dd

Commit a419b9dd authored 3 years ago by

Muhammad Rakha Athaya

Downloads
- Plain Diff

Merge branch 'develop' into 'login-register'

# Conflicts:
#   src/features/db.py

parents e8761294 288e6a46

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitIgnore 7 additions, 1 deletion

.gitIgnore
src/features/WaitingList.py 120 additions, 0 deletions

src/features/WaitingList.py
src/features/__pycache__/db.cpython-39.pyc 0 additions, 0 deletions

src/features/__pycache__/db.cpython-39.pyc
src/features/db.py 8 additions, 4 deletions

src/features/db.py
src/features/input_data.py 116 additions, 0 deletions

src/features/input_data.py
src/features/progress_bar_pallete.py 27 additions, 0 deletions

src/features/progress_bar_pallete.py
src/features/summary_data.py 236 additions, 0 deletions

src/features/summary_data.py
src/features/tips_and_trick.py 90 additions, 0 deletions

src/features/tips_and_trick.py
src/resources/img/lamp.png 0 additions, 0 deletions

src/resources/img/lamp.png
src/resources/img/motorbike.png 0 additions, 0 deletions

src/resources/img/motorbike.png

with 604 additions and 5 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