12 Jun, 2016

6 commits


19 Jan, 2016

2 commits


18 Jan, 2016

2 commits


06 Jan, 2016

2 commits


04 Jan, 2016

4 commits


01 Dec, 2015

3 commits


25 Nov, 2015

4 commits


16 Nov, 2015

1 commit


24 Sep, 2015

1 commit


23 Sep, 2015

2 commits


16 Sep, 2015

1 commit


02 Sep, 2015

1 commit


01 Sep, 2015

1 commit


26 Aug, 2015

1 commit


25 Aug, 2015

2 commits


24 Aug, 2015

1 commit


23 Aug, 2015

1 commit

  • Portabilis/ieducar#146
    
    Conflicts:
    	ieducar/intranet/diaria_grupo_lst.php
    	ieducar/intranet/diaria_lst.php
    	ieducar/intranet/educar_abandono_cad.php
    	ieducar/intranet/educar_abandono_tipo_cad.php
    	ieducar/intranet/educar_abandono_tipo_det.php
    	ieducar/intranet/educar_abandono_tipo_lst.php
    	ieducar/intranet/educar_acervo_assunto_lst.php
    	ieducar/intranet/educar_acervo_autor_lst.php
    	ieducar/intranet/educar_acervo_colecao_det.php
    	ieducar/intranet/educar_acervo_colecao_lst.php
    	ieducar/intranet/educar_acervo_editora_lst.php
    	ieducar/intranet/educar_acervo_idioma_lst.php
    	ieducar/intranet/educar_acervo_lst.php
    	ieducar/intranet/educar_aluno_beneficio_cad.php
    	ieducar/intranet/educar_aluno_lst.php
    	ieducar/intranet/educar_ano_letivo_modulo_cad.php
    	ieducar/intranet/educar_biblioteca_dados_lst.php
    	ieducar/intranet/educar_biblioteca_lst.php
    	ieducar/intranet/educar_calendario_ano_letivo_cad.php
    	ieducar/intranet/educar_calendario_dia_motivo_cad.php
    	ieducar/intranet/educar_cliente_lst.php
    	ieducar/intranet/educar_cliente_tipo_lst.php
    	ieducar/intranet/educar_curso_det.php
    	ieducar/intranet/educar_curso_lst.php
    	ieducar/intranet/educar_deficiencia_cad.php
    	ieducar/intranet/educar_deficiencia_lst.php
    	ieducar/intranet/educar_dispensa_disciplina_cad.php
    	ieducar/intranet/educar_escola_ano_letivo_cad.php
    	ieducar/intranet/educar_escola_cad.php
    	ieducar/intranet/educar_escola_det.php
    	ieducar/intranet/educar_escola_localizacao_cad.php
    	ieducar/intranet/educar_escola_localizacao_det.php
    	ieducar/intranet/educar_escola_localizacao_lst.php
    	ieducar/intranet/educar_escola_lst.php
    	ieducar/intranet/educar_escola_rede_ensino_cad.php
    	ieducar/intranet/educar_escola_rede_ensino_det.php
    	ieducar/intranet/educar_escola_rede_ensino_lst.php
    	ieducar/intranet/educar_escola_serie_cad.php
    	ieducar/intranet/educar_escola_serie_det.php
    	ieducar/intranet/educar_escola_serie_lst.php
    	ieducar/intranet/educar_exemplar_lst.php
    	ieducar/intranet/educar_exemplar_tipo_lst.php
    	ieducar/intranet/educar_exportacao_educacenso.php
    	ieducar/intranet/educar_fonte_lst.php
    	ieducar/intranet/educar_habilitacao_cad.php
    	ieducar/intranet/educar_habilitacao_det.php
    	ieducar/intranet/educar_habilitacao_lst.php
    	ieducar/intranet/educar_infra_comodo_funcao_cad.php
    	ieducar/intranet/educar_infra_comodo_funcao_lst.php
    	ieducar/intranet/educar_infra_predio_cad.php
    	ieducar/intranet/educar_infra_predio_comodo_cad.php
    	ieducar/intranet/educar_infra_predio_comodo_det.php
    	ieducar/intranet/educar_infra_predio_comodo_lst.php
    	ieducar/intranet/educar_infra_predio_det.php
    	ieducar/intranet/educar_infra_predio_lst.php
    	ieducar/intranet/educar_instituicao_cad.php
    	ieducar/intranet/educar_instituicao_det.php
    	ieducar/intranet/educar_instituicao_lst.php
    	ieducar/intranet/educar_material_didatico_cad.php
    	ieducar/intranet/educar_material_didatico_lst.php
    	ieducar/intranet/educar_material_tipo_cad.php
    	ieducar/intranet/educar_material_tipo_lst.php
    	ieducar/intranet/educar_matricula_cad.php
    	ieducar/intranet/educar_matricula_ocorrencia_disciplinar_cad.php
    	ieducar/intranet/educar_matricula_reclassificar_cad.php
    	ieducar/intranet/educar_matricula_turma_cad.php
    	ieducar/intranet/educar_modulo_cad.php
    	ieducar/intranet/educar_modulo_det.php
    	ieducar/intranet/educar_modulo_lst.php
    	ieducar/intranet/educar_motivo_baixa_lst.php
    	ieducar/intranet/educar_motivo_suspensao_lst.php
    	ieducar/intranet/educar_nivel_ensino_cad.php
    	ieducar/intranet/educar_nivel_ensino_det.php
    	ieducar/intranet/educar_nivel_ensino_lst.php
    	ieducar/intranet/educar_pagamento_multa_lst.php
    	ieducar/intranet/educar_raca_cad.php
    	ieducar/intranet/educar_religiao_cad.php
    	ieducar/intranet/educar_reservas_lst.php
    	ieducar/intranet/educar_sequencia_serie_cad.php
    	ieducar/intranet/educar_sequencia_serie_det.php
    	ieducar/intranet/educar_sequencia_serie_lst.php
    	ieducar/intranet/educar_serie_cad.php
    	ieducar/intranet/educar_serie_det.php
    	ieducar/intranet/educar_serie_lst.php
    	ieducar/intranet/educar_servidor_vinculo_turma_det.php
    	ieducar/intranet/educar_servidor_vinculo_turma_lst.php
    	ieducar/intranet/educar_situacao_lst.php
    	ieducar/intranet/educar_tipo_dispensa_cad.php
    	ieducar/intranet/educar_tipo_dispensa_det.php
    	ieducar/intranet/educar_tipo_dispensa_lst.php
    	ieducar/intranet/educar_tipo_ensino_cad.php
    	ieducar/intranet/educar_tipo_ensino_det.php
    	ieducar/intranet/educar_tipo_ensino_lst.php
    	ieducar/intranet/educar_tipo_ocorrencia_disciplinar_cad.php
    	ieducar/intranet/educar_tipo_ocorrencia_disciplinar_det.php
    	ieducar/intranet/educar_tipo_regime_cad.php
    	ieducar/intranet/educar_tipo_regime_det.php
    	ieducar/intranet/educar_tipo_regime_lst.php
    	ieducar/intranet/educar_transferencia_solicitacao_cad.php
    	ieducar/intranet/educar_transferencia_tipo_cad.php
    	ieducar/intranet/educar_turma_cad.php
    	ieducar/intranet/educar_turma_det.php
    	ieducar/intranet/educar_turma_tipo_cad.php
    	ieducar/intranet/funcionario_lst.php
    	ieducar/modules/Cadastro/Views/AlunoController.php
    	ieducar/modules/Portabilis/Assets/Javascripts/Frontend/Process.js
    	ieducar/modules/Portabilis/Assets/Version.php
    	ieducar/modules/Reports/Views/AlunoDeficienciaController.php
    	ieducar/modules/Reports/Views/AlunoEscolaController.php
    	ieducar/modules/Reports/Views/AlunoNotaExameController.php
    	ieducar/modules/Reports/Views/AlunoPorBairroController.php
    	ieducar/modules/Reports/Views/AlunoSemPaiController.php
    	ieducar/modules/Reports/Views/AlunoTurmaController.php
    	ieducar/modules/Reports/Views/AtestadoFrequenciaController.php
    	ieducar/modules/Reports/Views/AtestadoTransferenciaController.php
    	ieducar/modules/Reports/Views/AutorizacaoAlunoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaReciboPagamentoController.php
    	ieducar/modules/Reports/Views/BoletimProfessorController.php
    	ieducar/modules/Reports/Views/CalendarioController.php
    	ieducar/modules/Reports/Views/CarteiraEstudanteController.php
    	ieducar/modules/Reports/Views/CarteiraTransporteController.php
    	ieducar/modules/Reports/Views/DeclaracaoAnuenciaController.php
    	ieducar/modules/Reports/Views/DesempenhoClassesController.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo1Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo2Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseContraCapaController.php
    	ieducar/modules/Reports/Views/EscolaController.php
    	ieducar/modules/Reports/Views/FichaAlunoBrancoController.php
    	ieducar/modules/Reports/Views/FichaIndividualCbalController.php
    	ieducar/modules/Reports/Views/FichaIndividualPAController.php
    	ieducar/modules/Reports/Views/FichaMedicaAlunoController.php
    	ieducar/modules/Reports/Views/GraficoAlunoMatriculadoController.php
    	ieducar/modules/Reports/Views/GraficoAlunoTransporteController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilParecerController.php
    	ieducar/modules/Reports/Views/HoraAlocadoServidorController.php
    	ieducar/modules/Reports/Views/LivroMatriculaController.php
    	ieducar/modules/Reports/Views/MapaConselhoClasseController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoMatriculasController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoUniformeController.php
    	ieducar/modules/Reports/Views/MatriculaEscolaController.php
    	ieducar/modules/Reports/Views/MoradiaAlunoController.php
    	ieducar/modules/Reports/Views/MovimentoAlunosController.php
    	ieducar/modules/Reports/Views/NaoEnturmadosController.php
    	ieducar/modules/Reports/Views/NotasFaltasLancadasController.php
    	ieducar/modules/Reports/Views/OcorrenciaDisciplinarController.php
    	ieducar/modules/Reports/Views/ParecerFinalCbalController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosIniciaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosIniciaisController.php
    	ieducar/modules/Reports/Views/ResultadoFinalController.php
    	ieducar/modules/Reports/Views/ServidoresFaltasAtrasosController.php
    	ieducar/modules/Reports/Views/SinteseCompetenciaHabilidadeCbalController.php
    	ieducar/modules/Reports/Views/TransferidoAbandonoController.php
    	ieducar/modules/Reports/Views/UsuarioAcessoController.php
    	ieducar/modules/Reports/Views/UsuarioTransporteEscolaController.php
    Lucas Schmoeller da Silva
     

20 Aug, 2015

3 commits

  • portabilis/ieducar#146
    
    Conflicts:
    	ieducar/intranet/educar_acervo_assunto_lst.php
    	ieducar/intranet/educar_acervo_autor_lst.php
    	ieducar/intranet/educar_acervo_colecao_det.php
    	ieducar/intranet/educar_acervo_colecao_lst.php
    	ieducar/intranet/educar_acervo_editora_lst.php
    	ieducar/intranet/educar_acervo_idioma_lst.php
    	ieducar/intranet/educar_acervo_lst.php
    	ieducar/intranet/educar_biblioteca_dados_lst.php
    	ieducar/intranet/educar_biblioteca_lst.php
    	ieducar/intranet/educar_cliente_lst.php
    	ieducar/intranet/educar_cliente_tipo_lst.php
    	ieducar/intranet/educar_exemplar_devolucao_lst.php
    	ieducar/intranet/educar_exemplar_lst.php
    	ieducar/intranet/educar_exemplar_tipo_lst.php
    	ieducar/intranet/educar_fonte_lst.php
    	ieducar/intranet/educar_infra_predio_cad.php
    	ieducar/intranet/educar_instituicao_cad.php
    	ieducar/intranet/educar_motivo_baixa_lst.php
    	ieducar/intranet/educar_motivo_suspensao_lst.php
    	ieducar/intranet/educar_pagamento_multa_lst.php
    	ieducar/intranet/educar_reservas_lst.php
    	ieducar/intranet/educar_situacao_lst.php
    	ieducar/intranet/educar_turma_tipo_cad.php
    	ieducar/modules/Reports/Views/AlunoEscolaController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaReciboPagamentoController.php
    	ieducar/modules/Reports/Views/FichaMedicaAlunoController.php
    Lucas Schmoeller da Silva
     
  • Portabilis/ieducar#146
    Caroline Salib
     
  • Portabilis/ieducar#146
    
    Conflicts:
    	ieducar/intranet/agenda_admin_lst.php
    	ieducar/intranet/agenda_responsavel.php
    	ieducar/intranet/diaria_grupo_lst.php
    	ieducar/intranet/diaria_lst.php
    	ieducar/intranet/educar_abandono_tipo_cad.php
    	ieducar/intranet/educar_abandono_tipo_det.php
    	ieducar/intranet/educar_abandono_tipo_lst.php
    	ieducar/intranet/educar_acervo_autor_lst.php
    	ieducar/intranet/educar_acervo_colecao_det.php
    	ieducar/intranet/educar_acervo_colecao_lst.php
    	ieducar/intranet/educar_acervo_editora_lst.php
    	ieducar/intranet/educar_acervo_idioma_lst.php
    	ieducar/intranet/educar_acervo_lst.php
    	ieducar/intranet/educar_biblioteca_dados_lst.php
    	ieducar/intranet/educar_biblioteca_lst.php
    	ieducar/intranet/educar_cliente_lst.php
    	ieducar/intranet/educar_cliente_tipo_lst.php
    	ieducar/intranet/educar_curso_det.php
    	ieducar/intranet/educar_exemplar_devolucao_lst.php
    	ieducar/intranet/educar_exemplar_lst.php
    	ieducar/intranet/educar_exemplar_tipo_lst.php
    	ieducar/intranet/educar_exportacao_educacenso.php
    	ieducar/intranet/educar_fonte_lst.php
    	ieducar/intranet/educar_motivo_baixa_lst.php
    	ieducar/intranet/educar_motivo_suspensao_lst.php
    	ieducar/intranet/educar_pagamento_multa_lst.php
    	ieducar/intranet/educar_reservas_lst.php
    	ieducar/intranet/educar_situacao_lst.php
    	ieducar/intranet/funcionario_lst.php
    	ieducar/intranet/funcionario_vinculo_lst.php
    	ieducar/intranet/include/clsListagem.inc.php
    	ieducar/intranet/public_bairro_lst.php
    	ieducar/intranet/public_distrito_cad.php
    	ieducar/intranet/public_distrito_det.php
    	ieducar/intranet/public_distrito_lst.php
    	ieducar/intranet/urbano_cep_logradouro_lst.php
    	ieducar/modules/Portabilis/Assets/Version.php
    	ieducar/modules/Reports/Views/AlunoDeficienciaController.php
    	ieducar/modules/Reports/Views/AlunoNotaExameController.php
    	ieducar/modules/Reports/Views/AlunoPorBairroController.php
    	ieducar/modules/Reports/Views/AlunoSemPaiController.php
    	ieducar/modules/Reports/Views/AlunoTurmaController.php
    	ieducar/modules/Reports/Views/AtestadoFrequenciaController.php
    	ieducar/modules/Reports/Views/AtestadoTransferenciaController.php
    	ieducar/modules/Reports/Views/AutorizacaoAlunoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaReciboPagamentoController.php
    	ieducar/modules/Reports/Views/BoletimProfessorController.php
    	ieducar/modules/Reports/Views/CalendarioController.php
    	ieducar/modules/Reports/Views/CarteiraEstudanteController.php
    	ieducar/modules/Reports/Views/CarteiraTransporteController.php
    	ieducar/modules/Reports/Views/DeclaracaoAnuenciaController.php
    	ieducar/modules/Reports/Views/DesempenhoClassesController.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo1Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo2Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseContraCapaController.php
    	ieducar/modules/Reports/Views/EscolaController.php
    	ieducar/modules/Reports/Views/FichaAlunoBrancoController.php
    	ieducar/modules/Reports/Views/FichaIndividualCbalController.php
    	ieducar/modules/Reports/Views/FichaIndividualPAController.php
    	ieducar/modules/Reports/Views/GraficoAlunoMatriculadoController.php
    	ieducar/modules/Reports/Views/GraficoAlunoTransporteController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilParecerController.php
    	ieducar/modules/Reports/Views/HoraAlocadoServidorController.php
    	ieducar/modules/Reports/Views/LivroMatriculaController.php
    	ieducar/modules/Reports/Views/MapaConselhoClasseController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoMatriculasController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoUniformeController.php
    	ieducar/modules/Reports/Views/MatriculaEscolaController.php
    	ieducar/modules/Reports/Views/MoradiaAlunoController.php
    	ieducar/modules/Reports/Views/MovimentoAlunosController.php
    	ieducar/modules/Reports/Views/NaoEnturmadosController.php
    	ieducar/modules/Reports/Views/NotasFaltasLancadasController.php
    	ieducar/modules/Reports/Views/OcorrenciaDisciplinarController.php
    	ieducar/modules/Reports/Views/ParecerFinalCbalController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosIniciaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosIniciaisController.php
    	ieducar/modules/Reports/Views/RelatorioRotaController.php
    	ieducar/modules/Reports/Views/ResultadoFinalController.php
    	ieducar/modules/Reports/Views/ServidoresFaltasAtrasosController.php
    	ieducar/modules/Reports/Views/SinteseCompetenciaHabilidadeCbalController.php
    	ieducar/modules/Reports/Views/TransferidoAbandonoController.php
    	ieducar/modules/Reports/Views/TransporteCarteiraController.php
    	ieducar/modules/Reports/Views/UsuarioAcessoController.php
    	ieducar/modules/Reports/Views/UsuarioTransporteEscolaController.php
    	ieducar/modules/Reports/Views/UsuariosTransporteEmpresaController.php
    Lucas Schmoeller da Silva
     

18 Aug, 2015

1 commit


11 Aug, 2015

1 commit