citsmart-grp / cit-grp-contratos

05 Apr, 2016

2 commits

9b33ad7d redmine #4286 Construção Browse Code »

luis.camargo
2016-04-05 15:21:25 -0300

ecbb947a Merge branch 'tarefa-4209' into cnt-1.0.0-alfa11 ... Browse Code »

# Conflicts:
#	cit-contratos-api/src/main/java/br/com/centralit/api/model/TermoReferenciaPenalidade.java
#	cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EventoPenalidadeController.js

2016-04-05 09:14:05 -0300

04 Apr, 2016

9 commits

aeb2bf11 redmine #4270 Construção das regra de edição do pop-up "Aplicar penalidades"; Browse Code »

luis.camargo
2016-04-04 17:41:18 -0300
acb3c733 Merge branch 'tarefa-4222' into ctr-pj-0001-sprint11 Browse Code »

erick.sato
2016-04-04 16:54:03 -0300
16134ac9 [Redmine Atendimento #4269]Correção mapeamento edit contratos Browse Code »

erick.sato
2016-04-04 16:53:31 -0300
2589354e Merge branch 'tarefa-4222' into ctr-pj-0001-sprint11 Browse Code »

erick.sato
2016-04-04 15:30:23 -0300
aed984a1 [Redmine Atendimento #4269]Script add column contrato termo referencia Browse Code »

erick.sato
2016-04-04 15:22:29 -0300
a71c4938 [Redmine Atendimento #4269]Registro de Termo de Referência em contrato / Alteraç… ... Browse Code »
```
…ão em modais (Penalidade / Registro Não Conformidade)
```
erick.sato
2016-04-04 15:21:57 -0300
a8d0db66 Merge remote-tracking branch 'origin/tarefa-4271' into ctr-pj-0001-sprint11 Browse Code »

Ciro Junior
2016-04-04 14:42:03 -0300

1353586c [Redmine #4271] ... Browse Code »

Alterando funcionalidade de recebimento de objeto para permitir edicao de campos conforme solicitado na atividade.

2016-04-04 14:40:42 -0300

1cc00df2 Merge branch 'ctr-pj-0001-sprint10' Browse Code »

gabriel.damasceno
2016-04-04 11:16:08 -0300

01 Apr, 2016

29 commits

25394903 Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
luis.camargo
2016-04-01 17:29:23 -0300
f70c649d redmine #4115 Correções Browse Code »

luis.camargo
2016-04-01 17:29:07 -0300
5411d6d3 Corrigindo field removido. Browse Code »

Ciro Junior
2016-04-01 17:27:30 -0300
45278ab6 Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
luis.camargo
2016-04-01 17:22:29 -0300
d1a8034f redmine #4115 Correções; Browse Code »

luis.camargo
2016-04-01 17:22:17 -0300
513cb757 Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
erick.sato
2016-04-01 17:07:21 -0300
71e1b88c [Redmine Atendimento #4206]Script Browse Code »

erick.sato
2016-04-01 17:07:10 -0300
263117d3 Removendo linha dos campos liberacao pagamento. Browse Code »

Ciro Junior
2016-04-01 16:50:58 -0300
8740ea83 [Redmine Atendimento #4206]Datas emissão Browse Code »

erick.sato
2016-04-01 16:29:18 -0300
00613adf Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
erick.sato
2016-04-01 16:19:55 -0300
ec038ef1 [Redmine Atendimento #4206]Labels Browse Code »

erick.sato
2016-04-01 16:19:47 -0300
6ce28402 [Redmine #4115] ... Browse Code »
```
Corrigindo jasper e logica de validacao do forumulario.
```
Ciro Junior
2016-04-01 16:17:39 -0300
904009df Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
luis.camargo
2016-04-01 15:47:23 -0300
545c0fbc redmine #4115 Correções Browse Code »

luis.camargo
2016-04-01 15:47:09 -0300
f3026af6 Corrigindo regra de validacao de invalidade do formulario Browse Code »

Ciro Junior
2016-04-01 15:36:51 -0300
bc2ba16a Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… ... Browse Code »
```
…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
```
erick.sato
2016-04-01 15:26:50 -0300
19f3d977 [Redmine Atendimento #4206]Jasper consula termo Browse Code »

erick.sato
2016-04-01 15:26:39 -0300
0715a46c Adicionando recurso ao git ignore Browse Code »

Ciro Junior
2016-04-01 15:01:17 -0300

0ef7aca7 Merge branch 'tarefa-4155' into ctr-pj-0001-sprint10 ... Browse Code »

# Conflicts:
#	cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoLiberacaoPagamentoServiceImpl.java
#	cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java
#	cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql

2016-04-01 14:48:43 -0300

de0413c9 [Redmine Atendimento #4206]Alteração geração código por ano e contrato Browse Code »

erick.sato
2016-04-01 14:36:39 -0300
ff38e281 [Redmine Atendimento #4206]Evento rescisão / repactuação Browse Code »

erick.sato
2016-04-01 13:48:58 -0300
fd331afd Resolução de conflito no merge; Browse Code »

luis.camargo
2016-04-01 11:40:42 -0300
46666e8c [Redmine Atendimento #4206]Liberação pagamento mask Browse Code »

erick.sato
2016-04-01 11:39:53 -0300

48ca806d Merge branch 'tarefa-4115' into ctr-pj-0001-sprint10 ... Browse Code »

# Conflicts:
#	cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java
#	cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha10/01-cit-contratos-1.0.0-ALFA-10-postgres.sql
#	cit-contratos-web/src/main/java/br/com/centralit/controller/ContratoEventoController.java

2016-04-01 11:31:22 -0300

7ab4bdc5 [Redmine Atendimento #4206]Apostilamento máscara Browse Code »

erick.sato
2016-04-01 11:09:04 -0300

4ec0e239 Merge branch 'tarefa-4115' of http://ferramentasgo.centralit.com.br:8080/scm/git… ... Browse Code »

…/cit-grp-contratos into tarefa-4115

# Conflicts:
#	cit-contratos-web/src/main/java/br/com/centralit/controller/ContratoEventoController.java
#	cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js

2016-04-01 11:00:17 -0300

3e4408a1 [Redmine Atendimento #4206]Máscara aditivo Browse Code »

erick.sato
2016-04-01 10:50:07 -0300
7549ab1c [Redmine #4159] ... Browse Code »
```
Removido campo liberacao de pagamento da relacao com recebimento de objeto.
```
Ciro Junior
2016-04-01 10:46:29 -0300
69ad431c [Redmine Atendimento #4206]Encerramento contrato - máscara Browse Code »

erick.sato
2016-04-01 10:35:00 -0300