# Conflicts:
#	build.gradle
#	client/index.html

…velop

Usando configuração com parametros spring.datasource para base de dados e criado documentacao para isso

Feature/audit 11 login da aplicacao

* #6 WIP: Angular seed mesclado

* #6 removed angularseed infraestructure

* route and navigation in angular2

* #6 bootstrap css

* #6 WIP: Search

* #6 Search is functional

* #6 Build of project functional

* #6 removed code from angular1

* #6 client tests pass tslint good

* test pass

sql to create a example entries
keycloak for puc

* #17 Fix

* #17 production true in environment.prod.dist

* build.prod pass

* #8 primeng setup

* include p-calendar in search page

* #8 primeng setup

* #8 primeng setup

* include p-calendar in search page

* include p-calendar in search page

* calendar module import

* #8 search action start with

* include p-calendar in search page

* atualizacao

* AUDIT-VIEW#8 Creating filter by resourceType

* AUDIT-VIEW#8 deleting print

* updating

* export to excel

* optimized search with or without date

* final commit

* final commit

* final commit

* update package.json

* #13 refact: Change some code. Still works

* #13 refact: removed dead code

* #13 refact: moved Worksheet code

* #13 refact: better error handling

* #13 fix remove test message

* fix server integration test

* tests should pass

# Conflicts:
#	client/build.gradle
#	client/package.json
#	client/yarn.lock

* build.prod pass

* #8 primeng setup

* include p-calendar in search page

* #8 primeng setup

* #8 primeng setup

* include p-calendar in search page

* include p-calendar in search page

* calendar module import

* #8 search action start with

* include p-calendar in search page

* #8 basic pagination in memory

* #8 criteria query with count

* #8 Pagination on server

* #8 Pagination on server results per page

* #13 Export current page

* #7 Message in response to error in client

* #12 WIP LoadingBarInterceptor

* update package.json

* fix client test with chrome

* fix broke package.json in merge

* pagination and download working but dirty

* remove create, this project cant update database

* fix client test

* fix wercker build

…develop

# Conflicts:
#	client/src/app/app.module.ts
#	client/yarn.lock

* updating code with search by resource type

* delete print

* description of log selected

# Conflicts:
#	client/src/app/+search/search.component.ts