citsmart-grp / cit-grp-contratos

07 Apr, 2016

3 commits

6d0b17cd Merge remote-tracking branch 'origin/tarefa-4235' into cnt-1.0.0-alfa11 ... Browse Code »

# Conflicts:
#	cit-contratos-api/src/main/java/br/com/centralit/api/model/Contrato.java
#	cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha11/01-cit-contratos-1.0.0-ALFA-11-postgres.sql

2016-04-07 13:43:42 -0300

885afe33 Merge remote-tracking branch 'origin/cnt-1.0.0-alfa11' into tarefa-4235 ... Browse Code »

# Conflicts:
#	cit-contratos-api/src/main/java/br/com/centralit/api/model/Contrato.java
#	cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoServiceImpl.java
#	cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java

2016-04-07 12:06:06 -0300

7d01b02f [Redmine #4235] ... Browse Code »
```
Commit final
```
Ciro Junior
2016-04-07 11:26:58 -0300

06 Apr, 2016

10 commits

f3d9dd14 redmine #4345 Alterações nos scripts; Browse Code »

luis.camargo
2016-04-06 18:02:07 -0300
b9565853 Merge branch 'cnt-1.0.0-alfa11' of http://ferramentasgo.centralit.com.br:8080/sc… ... Browse Code »
```
…m/git/cit-grp-contratos into cnt-1.0.0-alfa11
```
luis.camargo
2016-04-06 17:42:47 -0300
487f0974 redmine #4235 Correções nos relatórios; Browse Code »

luis.camargo
2016-04-06 17:42:26 -0300
6e163876 [Redmine Atendimento #4269]Alteração penalidade - ocorrências Browse Code »

erick.sato
2016-04-06 16:35:20 -0300
0f7afd6e [Redmine Atendimento #4269]Correção mask registro sequencial ano Browse Code »

erick.sato
2016-04-06 16:22:31 -0300
763e9bb5 Merge branch 'tarefa-4331' into cnt-1.0.0-alfa11 Browse Code »

erick.sato
2016-04-06 14:53:25 -0300
486ebd32 [Redmine Atendimento #4331]Alteração Aditivo Browse Code »

erick.sato
2016-04-06 14:52:02 -0300
86741157 redmine #4347 Melhoria na pop-up "Recebimento de objeto"; Browse Code »

luis.camargo
2016-04-06 14:42:12 -0300
4902267a Merge branch 'tarefa-4345' into cnt-1.0.0-alfa11 Browse Code »

luis.camargo
2016-04-06 09:52:54 -0300
826872c5 redmine #4346 Correção da construção do menu; Browse Code »

luis.camargo
2016-04-06 09:51:49 -0300

05 Apr, 2016

13 commits

a45a7f92 [Redmine #4235] ... Browse Code »
```
Commit parcial.
```
Ciro Junior
2016-04-05 18:38:35 -0300
ea3e7c3d Merge branch 'tarefa-4214' into cnt-1.0.0-alfa11 Browse Code »

erick.sato
2016-04-05 16:57:06 -0300
d5bbd12b [Redmine Atendimento #4330]Alteração profissional requisitante -> profissional técnico Browse Code »

erick.sato
2016-04-05 16:56:33 -0300
1969d838 Merge branch 'tarefa-4212' into cnt-1.0.0-alfa11 Browse Code »

luis.camargo
2016-04-05 16:48:39 -0300
9f164e15 redmine #4329 Construção da história; Browse Code »

luis.camargo
2016-04-05 16:47:33 -0300
449bc0d5 Merge branch 'tarefa-4210' into cnt-1.0.0-alfa11 Browse Code »

erick.sato
2016-04-05 16:30:28 -0300
b1f4f1f4 [Redmine Atendimento #4327]Alteração Registro Não Conformidade Browse Code »

erick.sato
2016-04-05 16:29:24 -0300
a72ed695 Merge branch 'cnt-1.0.0-alfa11' of http://ferramentasgo.centralit.com.br:8080/sc… ... Browse Code »
```
…m/git/cit-grp-contratos into cnt-1.0.0-alfa11
```
luis.camargo
2016-04-05 15:31:06 -0300
9b33ad7d redmine #4286 Construção Browse Code »

luis.camargo
2016-04-05 15:21:25 -0300
7989ee62 Merge branch 'tarefa-4227' into cnt-1.0.0-alfa11 Browse Code »

erick.sato
2016-04-05 14:50:38 -0300
4dd54e0b [Redmine Atendimento #4281]Geração CSV list view Browse Code »

erick.sato
2016-04-05 14:47:40 -0300
fc775d74 [Redmine Atendimento #4281]Export csv Browse Code »

erick.sato
2016-04-05 11:21:45 -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

10 commits

2e68dbe2 [Redmine Atendimento #4281]Export CSV Browse Code »

erick.sato
2016-04-04 18:17:55 -0300
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

4 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