Merge remote-tracking branch 'origin/master' (7cc74e17) · Commits · TSE2019-G1 / componente central · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

componente central
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7cc74e17

Commit 7cc74e17 authored 5 years ago by Federico Sergio Godoy Cammardella

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

parents f24606c4 6a2f993d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java 21 additions, 5 deletions

...fice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java
backoffice/src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java 45 additions, 36 deletions

...src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java
backoffice/src/main/java/uy/edu/fing/tse/jsf/session/SessionBean.java 8 additions, 6 deletions

...rc/main/java/uy/edu/fing/tse/jsf/session/SessionBean.java
backoffice/src/main/webapp/WEB-INF/templates/template.xhtml 2 additions, 3 deletions

backoffice/src/main/webapp/WEB-INF/templates/template.xhtml
backoffice/src/main/webapp/jsf/gestionhechos.xhtml 1 addition, 1 deletion

backoffice/src/main/webapp/jsf/gestionhechos.xhtml
backoffice/src/main/webapp/login.xhtml 5 additions, 2 deletions

backoffice/src/main/webapp/login.xhtml
backoffice/src/main/webapp/register.xhtml 0 additions, 0 deletions

backoffice/src/main/webapp/register.xhtml

with 82 additions and 53 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