merge cconflict (1cf97420) · Commits · KAA / TugasBesar3_AngularJSandFirebase · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

TugasBesar3_AngularJSandFirebase
- Activity
- Members
- Labels
- 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.

KAA
TugasBesar3_AngularJSandFirebase
Commits
1cf97420

Commit 1cf97420 authored 8 years ago by

kharisisriyant

Downloads
- Plain Diff

merge cconflict

parents 482b80c2 8c9988f4

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

IdentService/build/web/WEB-INF/classes/org/IdentService/login.class 0 additions, 0 deletions

...ce/build/web/WEB-INF/classes/org/IdentService/login.class
IdentService/src/java/org/IdentService/login.java 1 addition, 24 deletions

IdentService/src/java/org/IdentService/login.java
KAA-JSP/build/web/catalog.jsp 25 additions, 1 deletion

KAA-JSP/build/web/catalog.jsp
KAA-JSP/build/web/login.jsp 3 additions, 1 deletion

KAA-JSP/build/web/login.jsp
KAA-JSP/src/java/org/saleproject/KAA/GetIP.java 39 additions, 0 deletions

KAA-JSP/src/java/org/saleproject/KAA/GetIP.java
KAA-JSP/src/java/org/saleproject/KAA/tokenParser.java 10 additions, 8 deletions

KAA-JSP/src/java/org/saleproject/KAA/tokenParser.java
KAA-JSP/web/catalog.jsp 25 additions, 1 deletion

KAA-JSP/web/catalog.jsp
KAA-JSP/web/login.jsp 3 additions, 1 deletion

KAA-JSP/web/login.jsp

with 106 additions and 36 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