Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android (d3883cbb) · Commits · IF3111-2018-07 / android · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

android
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

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.

IF3111-2018-07
android
Commits
d3883cbb

Commit d3883cbb authored 7 years ago by

unknown

Downloads
- Plain Diff

Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android

parents 9857e040 c77845a6

Branches

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.idea/modules.xml 1 addition, 2 deletions

.idea/modules.xml
app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java 80 additions, 3 deletions

...c/main/java/com/example/leo/fitnessdiy/LoginActivity.java
app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java 21 additions, 25 deletions

...c/main/java/com/example/leo/fitnessdiy/PlankActivity.java
app/src/main/java/com/example/leo/fitnessdiy/Utilities/NetworkUtils.java 5 additions, 0 deletions

...va/com/example/leo/fitnessdiy/Utilities/NetworkUtils.java
app/src/main/java/com/example/leo/fitnessdiy/model/Users.java 25 additions, 0 deletions

...src/main/java/com/example/leo/fitnessdiy/model/Users.java
app/src/main/res/layout/activity_plank.xml 1 addition, 1 deletion

app/src/main/res/layout/activity_plank.xml

with 133 additions and 31 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