03 May, 2016

1 commit


02 May, 2016

10 commits


01 May, 2016

9 commits


30 Apr, 2016

6 commits

  • ROGERIO CASSIMIRO DE SOUZA
     
  • ROGERIO CASSIMIRO DE SOUZA
     
  • 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
     
  • …/cit-grp-ecm into tarefa-4583
    rogerio.costa
     
  • 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

6 commits


28 Apr, 2016

1 commit


27 Apr, 2016

5 commits