Commits · development · Ensalamento / ensalamento-back

16 Apr, 2021 2 commits
- Merge branch 'update_ensalador' into 'development' · f8264c64
  Rafael S Castilho authored Apr 16, 2021
```
update submodule ensalador

See merge request !63
```
  f8264c64
- update submodule ensalador · 0dd41bd5
  Odair M. authored Apr 16, 2021
  
  0dd41bd5
26 Feb, 2021 6 commits
- Merge branch 'fix_emptybase' into 'development' · 5c9a4fe8
  ns17 authored Feb 26, 2021
```
Fix emptybase

See merge request !62
```
  5c9a4fe8
- new fix · 6671b57a
  Rafael S Castilho authored Feb 26, 2021
  
  6671b57a
- atempt to log errors for next time · 23769e4b
  Rafael S Castilho authored Feb 26, 2021
  
  23769e4b
- fixed · b26c3172
  Rafael S Castilho authored Feb 26, 2021
  
  b26c3172
- Merge branch 'pietro' into 'development' · 310c6fe5
  ns17 authored Feb 26, 2021
```
fix delete horarios to department secretary

See merge request !61
```
  310c6fe5
- fix delete horarios to department secretary · 9ff33b6d
  ppc19 authored Feb 26, 2021
  
  9ff33b6d
23 Feb, 2021 2 commits
- Merge branch 'fix_user' into 'development' · 05c767b0
  Rafael S Castilho authored Feb 23, 2021
```
fix 'secretario departamento' user

See merge request !60
```
  05c767b0
- fix 'secretario departamento' user · 4d58615c
  ns17 authored Feb 23, 2021
  
  4d58615c
08 Dec, 2020 2 commits
- Merge branch 'correcao-blocojs' into 'development' · dcc43866
  Rafael S Castilho authored Dec 08, 2020
```
Correcao feita

See merge request !59
```
  dcc43866
- Correcao feita · 8de42e0d
  Gabriel Silva Hermida authored Dec 08, 2020
```
Signed-off-by: Gabriel Silva Hermida <gash18@inf.ufpr.br>
```
  8de42e0d
05 Oct, 2020 1 commit
- Merge branch 'correçao_semestre_updateturma' into 'development' · ecee8c50
  Rafael S Castilho authored Oct 05, 2020
```
Atribuicao de semestre pra compensar a perda durante a funçao

See merge request !57
```
  ecee8c50
30 Sep, 2020 1 commit
- Atribuicao de semestre pra compensar a perda durante a funçao · 2738f948
  Gabriel Silva Hermida authored Sep 30, 2020
```
Signed-off-by: Gabriel Silva Hermida <gash18@inf.ufpr.br>
```
  2738f948
30 Jul, 2020 1 commit
- fixing class junction · 85ef7d1d
  ns17 authored Jul 30, 2020
  
  85ef7d1d
28 Jul, 2020 2 commits
- Merge branch 'filtros_ensalador' into 'development' · 1dd8b400
  Rafael S Castilho authored Jul 28, 2020
```
Filtros ensalador

See merge request !56
```
  1dd8b400
- print removed · 475ddea5
  Gabriel Silva Hermida authored Jul 28, 2020
```
Signed-off-by: Gabriel Silva Hermida <gash18@inf.ufpr.br>
```
  475ddea5
22 Jul, 2020 1 commit
- Merge branch 'mudanças_gabriel' into 'development' · fe0b2b25
  Rafael S Castilho authored Jul 22, 2020
```
Mudanças Gabriel

See merge request !55
```
  fe0b2b25
21 Jul, 2020 1 commit
- Mudanças Gabriel · dc63cd28
  Gabriel Silva Hermida authored May 18, 2020
```
Signed-off-by: Gabriel Silva Hermida <gash18@inf.ufpr.br>
```
  dc63cd28
05 Mar, 2020 2 commits
- Merge branch 'juntar_turma_horario' into 'development' · a17c1abd
  Odair M. authored Mar 05, 2020
```
mudanças na junçaode  turma e horarios

See merge request !53
```
  a17c1abd
- mudanças na junçaode turma e horarios · bffe3b7e
  Odair M. authored Mar 05, 2020
```
Arrumando separação de horários

add relatin before merge turma
```
  bffe3b7e
02 Mar, 2020 2 commits
- Merge branch 'fix-mergeturma' into 'development' · c4fbcba6
  Matheus Horstmann authored Mar 02, 2020
```
adiciona relacao bidirecional entre turma e turmas na uniao de duas turmas

See merge request !52
```
  c4fbcba6
- adiciona relacao bidirecional entre turma e turmas na uniao de duas turmas · fdd7a4db
  Odair M. authored Mar 02, 2020
  
  fdd7a4db
21 Feb, 2020 2 commits
- Merge branch 'incrementa_reserva' into 'development' · 438ae482
  Rafael S Castilho authored Feb 21, 2020
```
adiciona relacao entre reserva e dono da sala

See merge request !51
```
  438ae482
- adiciona relacao entre reserva e dono da sala · 0c4167de
  Odair M. authored Feb 21, 2020
  
  0c4167de
14 Feb, 2020 2 commits
- Merge branch '40-atualiza-pesquisa-de-disciplina' into 'development' · a46eaf0e
  Rafael S Castilho authored Feb 14, 2020
```
Resolve "Atualiza pesquisa de disciplina"

Closes #40

See merge request !50
```
  a46eaf0e
- atualiza base antiga para incluir flag equivanled · 90407e34
  Odair M. authored Feb 14, 2020
```
divisao de horario e de turmas

t
```
  90407e34
11 Feb, 2020 2 commits
- Merge branch '43-atualiza-a-base-de-dados' into 'development' · 7504ca69
  Odair M. authored Feb 11, 2020
```
adiciona informações de humanas e biologica

Closes #43

See merge request !49
```
  7504ca69
- adiciona informações de humanas e biologica · d92eeebb
  Odair M. authored Feb 11, 2020
```
adiciona informação de bloco de setor
```
  d92eeebb
05 Feb, 2020 4 commits
- Merge branch '14-inserir-constraint-unique-em-equivalenciadisciplina' into 'development' · b9839399
  Matheus Horstmann authored Feb 05, 2020
```
Closes #14 resolve o problema de possível registro duplicados

Closes #14

See merge request !48
```
  b9839399
- Closes #14 resolve o problema de possível registro duplicados · 46a64d23
  Odair M. authored Feb 05, 2020
  
  46a64d23
- Merge branch '39-concluir-reserva-de-sala' into 'development' · 8eaef2de
  Matheus Horstmann authored Feb 05, 2020
```
Resolve "Concluir reserva de sala"

Closes #39

See merge request !47
```
  8eaef2de
- especifica o modelo · 75c275a7
  Odair M. authored Feb 05, 2020
```
metodo de reserva sala semi concluido, sistema de enviar email

metodo aprova ok

sistema de email

adiciona pesquisa por reserva
```
  75c275a7
04 Feb, 2020 2 commits

Merge branch '42-atualiza-o-schema-do-bancos-de-dados' into 'development' · c894b6c3

Matheus Horstmann authored Feb 04, 2020

atualiza script de upload para não adicionar turmas que não possua todos os campos na planilha

Closes #42

See merge request !46

c894b6c3

atualiza script de upload para não adicionar turmas que não possua todos os campos na planilha · 5f608b0e

Odair M. authored Feb 04, 2020

atualiza relação de secretario e usuario, troca embledOne por belongsTo.

Adiciona pesquisa por bloco

atualiza metodo de desensala, para remover a relação de bloco

5f608b0e

31 Jan, 2020 1 commit
- Merge branch 'pesquisaPorSala' into 'development' · 01bacd41
  Odair M. authored Jan 31, 2020
```
pesquisa de turmas por codigo de sala

See merge request !43
```
  01bacd41
30 Jan, 2020 4 commits
- Merge branch 'development' into 'pesquisaPorSala' · e14458f3
  Matheus Horstmann authored Jan 30, 2020
```
# Conflicts:
#   ensalamento-entrypoint.sh
```
  e14458f3
- Merge branch 'refatora-backend' into 'development' · f5d0f2a9
  Matheus Horstmann authored Jan 30, 2020
```
Refatora backend

See merge request !45
```
  f5d0f2a9
- Refatora backend · 260a3ac5
  Odair M. authored Jan 30, 2020
  
  260a3ac5
- Merge branch 'development' of gitlab.c3sl.ufpr.br:ensalamento/ensalamento-back into development · af9e1d76
  Rafael S Castilho authored Jan 30, 2020
  
  af9e1d76