11 May, 2016

5 commits


10 May, 2016

1 commit


09 May, 2016

3 commits


08 May, 2016

1 commit


06 May, 2016

12 commits


05 May, 2016

10 commits


04 May, 2016

5 commits


03 May, 2016

3 commits

  • gabriel.damasceno
     
  • rogerio.costa
     
  • # Conflicts:
    #	cit-core/src/main/java/br/com/centralit/framework/json/Views.java
    #	cit-core/src/main/java/br/com/centralit/framework/model/Grupo.java
    #	cit-core/src/main/java/br/com/centralit/framework/model/arquitetura/PersistentObjectAudit.java
    #	cit-portal-api/src/main/java/br/com/centralit/api/dao/GrupoDao.java
    #	cit-portal-api/src/main/java/br/com/centralit/api/dao/impl/GrupoDaoHibernate.java
    #	cit-portal-api/src/main/java/br/com/centralit/api/service/impl/GrupoServiceImpl.java
    #	cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
    #	cit-portal-web/src/main/webapp/assets/js/angular/custom/controller/AppController.js
    #	cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js
    #	cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
    gabriel.damasceno