01 May, 2016

1 commit


30 Apr, 2016

2 commits

  • Conflicts:
    	cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/UnidadeProcessoDaoHibernate.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/HipoteseLegal.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/InteressadoProcesso.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/model/TipoProcesso.java
    	cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
    	cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
    	cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js
    	cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/UnidadeProcessoRepository.js
    rogerio.costa
     
  • # Conflicts:
    #	cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/UnidadeProcessoDaoHibernate.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/framework/json/ViewsEcm.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/model/NivelAcessoTipoProcesso.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
    #	cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
    #	cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
    #	cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ClassificarDocumentoProcessoController.js
    #	cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ClassificarDocumentoProcessoListController.js
    #	cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js
    #	cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeAcaoProcesso.html
    #	cit-ecm-web/src/main/webapp/html/gerenciarProcesso/includeDocumentosProcesso.html
    #	cit-ecm-web/src/main/webapp/html/processo/processoEdit.html
    maycon.silva
     

29 Apr, 2016

2 commits


27 Apr, 2016

5 commits


26 Apr, 2016

11 commits


25 Apr, 2016

4 commits


23 Apr, 2016

1 commit


22 Apr, 2016

7 commits


20 Apr, 2016

4 commits


19 Apr, 2016

3 commits