Commits · development · Ensalamento / ensalamento-back

20 Oct, 2022 4 commits
- Merge branch 'todo_list' into 'development' · 499714ac
  mvrp21 authored Oct 20, 2022
```
aha

See merge request !134
```
  499714ac
- aha · eec1bd6b
  mvrp21 authored Oct 20, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  eec1bd6b
- Merge branch 'todo_list' into 'development' · 43c00ff6
  vgm18 authored Oct 20, 2022
```
Bug fix

See merge request !133
```
  43c00ff6
- Merge branch 'development' into 'todo_list' · fe7ce2ea
  vgm18 authored Oct 20, 2022
```
# Conflicts:
#   common/models/usuario.js
```
  fe7ce2ea
10 Oct, 2022 11 commits
- Merge branch 'small_fix3' into 'development' · 32b49498
  vgm18 authored Oct 10, 2022
```
Corrigindo execute poli

See merge request !132
```
  32b49498
- Corrigindo execute poli · cdf4fc7f
  vgm18 authored Oct 10, 2022
  
  cdf4fc7f
- Fix · 4a3b22c3
  mvrp21 authored Oct 10, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  4a3b22c3
- Change password minimum length to 2 · a2dad945
  mvrp21 authored Oct 10, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  a2dad945
- Merge branch 'small_fix_2' into 'development' · 01bbf1ea
  vgm18 authored Oct 10, 2022
```
Removed curso 24A from execute poli

See merge request !131
```
  01bbf1ea
- Removed curso 24A from execute poli · c7619576
  vgm18 authored Oct 10, 2022
  
  c7619576
- AAA · 8bb6b09e
  mvrp21 authored Oct 10, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  8bb6b09e
- Merge branch 'small_fixes' into 'development' · 8ec4cce4
  vgm18 authored Oct 10, 2022
```
added blocos in execute poli

See merge request !130
```
  8ec4cce4
- Revert "Merge branch 'todo_list' into 'development'" · eb4eeaa8
  vgm18 authored Oct 10, 2022
```
This reverts merge request !129
```
  eb4eeaa8
- added blocos in execute poli · e1c518db
  vgm18 authored Oct 10, 2022
  
  e1c518db
- Merge branch 'todo_list' into 'development' · a19f3058
  vgm18 authored Oct 10, 2022
```
Fix loopback password changing logic

See merge request !129
```
  a19f3058
08 Oct, 2022 2 commits
- Fix password not changed case · 4aa36ca9
  mvrp21 authored Oct 08, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  4aa36ca9
- Add minimal password validation · d7ad545e
  mvrp21 authored Oct 08, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  d7ad545e
07 Oct, 2022 3 commits
- Fix loopback password changing logic · 21d50649
  mvrp21 authored Oct 07, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  21d50649
- Merge branch 'teste' into 'development' · 70a5a40b
  vgm18 authored Oct 07, 2022
```
Fixed save ensalamento

See merge request !128
```
  70a5a40b
- Removed console.log · dc688276
  vgm18 authored Oct 07, 2022
  
  dc688276
06 Oct, 2022 1 commit
- teste · f9249734
  mvrp21 authored Oct 06, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  f9249734
05 Oct, 2022 4 commits
- Merge branch 'fix_vinicius' into 'development' · 5a17e2ff
  vgm18 authored Oct 05, 2022
```
fixed alffrombloco acl

See merge request !127
```
  5a17e2ff
- fixed alffrombloco acl · 1cd1f0a6
  vgm18 authored Oct 05, 2022
  
  1cd1f0a6
- Merge branch 'import_hotfix' into 'development' · d48624d0
  mvrp21 authored Oct 05, 2022
```
Multiple cursos per row

See merge request !126
```
  d48624d0
- Multiple cursos per row · 03d83595
  mvrp21 authored Oct 05, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  03d83595
03 Oct, 2022 8 commits
- Merge branch 'quality-of-life' into 'development' · 9710cddb
  mvrp21 authored Oct 03, 2022
```
Fix tests; Fix blocoCod not set on horario creation; Remove setSala

See merge request !125
```
  9710cddb
- Merge branch 'development' into 'quality-of-life' · e2f2f0f4
  mvrp21 authored Oct 03, 2022
```
# Conflicts:
#   common/models/horario.js
```
  e2f2f0f4
- Fix bloco search · 85b2fd61
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  85b2fd61
- Fix HorarioTurma on horario (and turma) merge · 1262cca0
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  1262cca0
- Fix HorarioTurma on horario merge · aeb730bb
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  aeb730bb
- (re)Fix tests · 99422ee5
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  99422ee5
- Remove setSala · de69fc21
  mvrp21 authored Oct 03, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  de69fc21
- Merge branch 'fix_sem_sala' into 'development' · 5e653533
  vgm18 authored Oct 03, 2022
```
Fixed sem sala case in setSala

See merge request !124
```
  5e653533
30 Sep, 2022 6 commits
- Fixed sem sala case in setSala · 6d173c97
  vgm18 authored Sep 30, 2022
  
  6d173c97
- Fix blocoCod not set on horario creation · c48be3b8
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c48be3b8
- Fix tests · c0df5872
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  c0df5872
- Merge branch 'import-rework' into 'development' · 1b6a1fe4
  mvrp21 authored Sep 30, 2022
```
Add import logic

See merge request !123
```
  1b6a1fe4
- Merge branch 'fix_vinicius' into 'import-rework' · 4363d114
  mvrp21 authored Sep 30, 2022
```
Fixed setSala

See merge request !122
```
  4363d114
- Better Turma merging codigo handling · 7059492e
  mvrp21 authored Sep 30, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  7059492e
29 Sep, 2022 1 commit
- Add time taken log · cca612ba
  mvrp21 authored Sep 29, 2022
```
Signed-off-by: mvrp21 <mvrp21@inf.ufpr.br>
```
  cca612ba