Commits · 5dff2bc0abf6aae1704bcd62fbcbb77888f2323b · Odair M. / adega

10 Nov, 2018 1 commit
- Merge branch '136-rep-por-freq-na-disciplina' into 'development' · 5dff2bc0
  Bruno Meyer authored Nov 10, 2018
```
Resolve "rep por freq na disciplina"

Closes #136

See merge request adega/adega!38
```
  5dff2bc0
09 Nov, 2018 2 commits
- #136 retornando · 03058dfa
  msrr18 authored Nov 09, 2018
  
  03058dfa
- #136 workaround · 418e903d
  msrr18 authored Nov 09, 2018
  
  418e903d
06 Nov, 2018 1 commit
- #136 terminei e deve funciona, · 110394c1
  msrr18 authored Nov 06, 2018
  
  110394c1
05 Nov, 2018 1 commit
- termineir mas nao funciona · 60334202
  msrr18 authored Nov 05, 2018
  
  60334202
17 Oct, 2018 2 commits
- Merge branch '114-integrar-analises-relacionada-ao-curso-com-o-sistema-web' into 'development' · dbb7507b
  Bruno Meyer authored Oct 17, 2018
```
Resolve "integrar analises relacionada ao curso com o sistema web"

Closes #114

See merge request adega/adega!37
```
  dbb7507b
- Resolve "integrar analises relacionada ao curso com o sistema web" · 147d0490
  Bruno Meyer authored Oct 17, 2018
  
  147d0490
12 Oct, 2018 1 commit

Merge branch '114-integrar-analises-relacionada-ao-curso-com-o-sistema-web' into 'development' · d15afbdd

Bruno Meyer authored Oct 12, 2018

# Conflicts:
#   src/adega/settings.py
#   src/adega/static/adega/js/adega-chart.js
#   src/adega/templates/adega/navbar.html
#   src/adega/templates/base.html
#   src/adega/urls.py
#   src/admission/templates/admission/index.html
#   src/course/templates/course/index.html
#   src/course/views.py
#   src/report_api/views.py
#   src/script/analysis/course_analysis.py
#   src/script/build_cache.py

d15afbdd

11 Oct, 2018 2 commits
- Merge branch '138-3-reprovacoes-distintas' into 'development' · f3e38e49
  Bruno Meyer authored Oct 11, 2018
```
Resolve "3 reprovaçoes distintas" - CEPE

Closes #138

See merge request adega/adega!34
```
  f3e38e49
- Resolve "3 reprovaçoes distintas" - CEPE · f6fbd00f
  msrr18 authored Oct 11, 2018
  
  f6fbd00f
17 Sep, 2018 9 commits
- Merge branch '140-build-cache-disciplina' into 'development' · d3dabffa
  Bruno Meyer authored Sep 17, 2018
```
adega#140: Resolve "Build cache disciplina"

Closes #140

See merge request adega/adega!32
```
  d3dabffa
- adega#140: Resolve "Build cache disciplina" · 12892495
  Odair M. authored Sep 17, 2018
  
  12892495
- Merge branch 'development' of gitlab.c3sl.ufpr.br:adega/adega into development · a1f0ab6f
  jpp18 authored Sep 17, 2018
  
  a1f0ab6f
- build_cache corrigido com as analises da cepe · 35c936e0
  jpp18 authored Sep 17, 2018
  
  35c936e0
- Update README.md · d7ad2839
  msrr18 authored Sep 17, 2018
  
  d7ad2839
- adega#114: Add charts analysis to degree page · d2bda136
  Bruno Meyer authored Sep 17, 2018
  
  d2bda136
- Update README.md · b44aefa2
  msrr18 authored Sep 17, 2018
  
  b44aefa2
- Merge branch '131-3-reprovacoes-na-disciplina' into 'development' · c45dfeb4
  Bruno Meyer authored Sep 17, 2018
```
Resolve "3 reprovações na disciplina" - CEPE9615

Closes #131

See merge request adega/adega!29
```
  c45dfeb4
- Resolve "3 reprovações na disciplina" - CEPE9615 · 36d8190d
  jpp18 authored Sep 17, 2018
  
  36d8190d
04 Sep, 2018 1 commit
- Merge branch 'refatora_disciplina' into 'development' · 641d3c2a
  Bruno Meyer authored Sep 04, 2018
```
Refatora disciplina

See merge request adega/adega!28
```
  641d3c2a
31 Aug, 2018 1 commit
- analises course e metodo rates de Analysis com valor default para Nan · e7c26a1d
  Odair M. authored Aug 30, 2018
  
  e7c26a1d
27 Aug, 2018 1 commit
- analises orientada a objetos e classe Analysis · e2f79af8
  Odair M. authored Aug 27, 2018
  
  e2f79af8
17 Aug, 2018 1 commit
- adega#127: Fix url student bug · 37718477
  Odair M. authored Jul 03, 2018
  
  37718477
13 Aug, 2018 1 commit
- Merge branch '47-ira-semestre' into 'development' · 7c3fdc5b
  Odair M. authored Aug 13, 2018
```
Resolve "Ira semestre"

Closes #47

See merge request adega/adega!27
```
  7c3fdc5b
27 Jul, 2018 1 commit
- adega#47: Add admission_class_ira_per_semester function on admission_analysis.py · 8c18ad0e
  maria ruy authored Jul 26, 2018
  
  8c18ad0e
09 Jul, 2018 1 commit
- Merge branch '129-fix-bugs' into 'development' · 16bacd46
  Bruno Meyer authored Jul 08, 2018
```
Resolve "fix bugs"

Closes #129

See merge request adega/adega!25
```
  16bacd46
08 Jul, 2018 2 commits
- adega#129: try fix pipeline error · e0332ed4
  Odair M. authored Jul 08, 2018
  
  e0332ed4
- adega#129: fix warning when exec django commands · db13fc1c
  Odair M. authored Jul 08, 2018
  
  db13fc1c
02 Jul, 2018 2 commits
- Merge branch '125-corrigir-o-css-e-outras-funcionalidades-das-paginas' into... · e460ead9
  Bruno Meyer authored Jul 02, 2018
```
Merge branch '125-corrigir-o-css-e-outras-funcionalidades-das-paginas' into '115-integrar-as-analises-alunos-com-o-sistema-web'

Resolve "Corrigir o CSS  e outras funcionalidades das páginas"

See merge request adega/adega!23
```
  e460ead9
- adega#125 adega#126: Fix CSS problems in tables listing & Add course name to courses list analysis · 2941bcc5
  bhm15 authored Jul 02, 2018
  
  2941bcc5
29 Jun, 2018 3 commits
- adega#115: Add new charts and courses historic to Student page · 43a2d41c
  bhm15 authored Jun 29, 2018
  
  43a2d41c
- adega#122 adega#115: Add student info into analysis and Semestral IRA chart... · d2339754
  bhm15 authored Jun 29, 2018
```
adega#122 adega#115: Add student info into analysis and Semestral IRA chart into Student page & Saving json with utf8
```
  d2339754
- adega#115: Create class StudentAnalysis & Create student app · 9993aae7
  bhm15 authored Jun 28, 2018
  
  9993aae7
28 Jun, 2018 1 commit
- adega#23: Saving list with real names & Fix identation with spaces in build_cache · e5ee20d2
  bhm15 authored Jun 27, 2018
  
  e5ee20d2
26 Jun, 2018 5 commits
- Merge branch '116-integrar-as-analises-de-turma-ingresso-com-o-sistema-web' into 'development' · 632b08ce
  msrr18 authored Jun 26, 2018
```
Resolve "integrar as analises de turma ingresso e disciplinas com o sistema web" (não fechar a branch)

See merge request adega/adega!22
```
  632b08ce
- Resolve "integrar as analises de turma ingresso e disciplinas com o sistema... · fd84995b
  Bruno Meyer authored Jun 26, 2018
```
Resolve "integrar as analises de turma ingresso e disciplinas com o sistema web" (não fechar a branch)
```
  fd84995b
- adega#113 adega#116: Creating initial pages to course and admission · ca0c2340
  bhm15 authored Jun 26, 2018
  
  ca0c2340
- adega#121: Fix docker bugs · 2ef4beba
  bhm15 authored Jun 26, 2018
  
  2ef4beba
- Merge with development · a1494df5
  bhm15 authored Jun 26, 2018
  
  a1494df5
25 Jun, 2018 1 commit
- Merge branch 'degree_app' into 'development' · 86b61d76
  Bruno Meyer authored Jun 25, 2018
```
Degree app

See merge request adega/adega!21
```
  86b61d76