Commits · master · adega / adega

14 Aug, 2020 6 commits

Merge branch 'development' into 'master' · c953810c
bhmeyer authored Aug 14, 2020
```
Deployment: Merge 'Development' into 'master'

See merge request !141
```
c953810c
Merge branch '229-correcao-de-bugs' into 'development' · bac41484
bhmeyer authored Aug 14, 2020
```
Resolve "Correção de bugs"

Closes #229

See merge request !140
```
bac41484

: Fix bugs · d7a749e5

BrunoMeyer authored Aug 13, 2020

- Change url ``/adega/admin`` to ``/admin``
- Fix bug when downloading .zip files with utf-8 when nginx container is enabled
- Remove hardcoded ``csv_data_file.csv`` from json_to_csv module
- Rename ``makefile`` to ``Makefile``

d7a749e5

Merge branch 'development' into 'master' · 4b43d1ee
bhmeyer authored Aug 13, 2020
```
Deployment: Merge 'Development' into 'master'

See merge request !139
```
4b43d1ee
Merge branch '229-correcao-de-bugs' into 'development' · 0678075b
bhmeyer authored Aug 13, 2020
```
Resolve "Correção de bugs"

Closes #229

See merge request !138
```
0678075b

: Fix bugs · 37fa29a7

BrunoMeyer authored Aug 13, 2020

- Change url ``/adega/admin`` to ``/admin``
- Fix bug when downloading .zip files with utf-8 when nginx container is enabled
- Remove hardcoded ``csv_data_file.csv`` from json_to_csv module
- Rename ``makefile`` to ``Makefile``

37fa29a7

13 Aug, 2020 3 commits
- Merge branch 'development' into 'master' · 5877de38
  bhmeyer authored Aug 13, 2020
```
Deploy: Merge 'Development' into 'master'

See merge request !137
```
  5877de38
- Merge branch '218-criar-modulo-da-interface-que-converta-adega-para-weka' into 'development' · 85800cec
  bhmeyer authored Aug 13, 2020
```
Resolve "Criar módulo da interface que converta Adega para WEKA"

Closes #218

See merge request !135
```
  85800cec
- #218:Criado um arquivo que atualmente tem duas funções, uma pra listar os... · c9aaa50b
  bhmeyer authored Aug 13, 2020
```
#218:Criado um arquivo que atualmente tem duas funções, uma pra listar os jsons de um path e uma pra criar cabeçalhos das planilhas csvs (ainda não completo)
```
  c9aaa50b
20 May, 2020 3 commits
- Merge branch 'development' into 'master' · 1b2a6176
  bhmeyer authored May 20, 2020
```
Development

See merge request !132
```
  1b2a6176
- Merge branch '228-correcao-de-bugs' into 'development' · 8f2d8500
  bhmeyer authored May 20, 2020
```
Update "Correção de bugs"

See merge request !131
```
  8f2d8500
- Update "Correção de bugs" · 292e0649
  bhmeyer authored May 20, 2020
  
  292e0649
14 May, 2020 5 commits
- Merge branch 'development' into 'master' · 88119b42
  bhmeyer authored May 14, 2020
```
Merge Development into Master

See merge request !130
```
  88119b42
- Merge branch '227-atualizar-instrucoes-de-upload-de-relatorio' into 'development' · 6e504f1d
  bhmeyer authored May 14, 2020
```
Resolve "Atualizar instruções de upload de relatório"

Closes #227

See merge request !129
```
  6e504f1d
- #227: Update submission upload page · a4f14075
  Bruno Meyer authored May 09, 2020
```
Change submission instructions and move some descriptions to https://gitlab.c3sl.ufpr.br/adega/conversor-de-dados-adega project
```
  a4f14075
- Merge branch '225-desconsiderar-alunos-que-ja-venceram-as-fases' into 'development' · cc8e12e0
  bhmeyer authored May 14, 2020
```
Resolve "Desconsiderar alunos que já venceram as fases"

Closes #225

See merge request !126
```
  cc8e12e0
- Resolve "Desconsiderar alunos que já venceram as fases" · c65c8d11
  bhmeyer authored May 14, 2020
  
  c65c8d11
25 Feb, 2020 3 commits
- Merge branch 'development' into 'master' · 387d0f55
  bhmeyer authored Feb 24, 2020
```
Merge "development" into "master"

See merge request !124
```
  387d0f55
- Merge branch '223-bugs-causados-por-merges' into 'development' · 0dc23ff9
  bhmeyer authored Feb 24, 2020
```
Resolve "Bugs causados por merges"

Closes #223

See merge request !123
```
  0dc23ff9
- Resolve "Bugs causados por merges" · 97ad5f61
  bhmeyer authored Feb 24, 2020
  
  97ad5f61
19 Feb, 2020 3 commits
- Merge branch 'development' into 'master' · 02bd1866
  Luis Floriano authored Feb 19, 2020
```
Development

See merge request !122
```
  02bd1866
- Merge branch '217-criar-a-interface-de-dados' into 'development' · b7677242
  Luis Floriano authored Feb 19, 2020
```
Resolve "Criar a interface de dados"

Closes #217

See merge request !108
```
  b7677242
- #217: Apply code refactor to analysis · 7c98971a
  ppa19 authored Feb 19, 2020
```
#217: Apply code refactor to analysis
```
  7c98971a
05 Feb, 2020 3 commits
- Merge branch 'development' into 'master' · 28bdb09e
  bhmeyer authored Feb 05, 2020
```
Deploy: Update libraries

See merge request !121
```
  28bdb09e
- Merge branch '222-atualizar-as-bibliotecas' into 'development' · 8e122fed
  bhmeyer authored Feb 05, 2020
```
Resolve "Atualizar as bibliotecas"

Closes #222

See merge request !120
```
  8e122fed
- Resolve "Atualizar as bibliotecas" · e4332807
  bhmeyer authored Feb 05, 2020
  
  e4332807
04 Feb, 2020 3 commits
- Merge branch 'development' into 'master' · f5c8469a
  bhmeyer authored Feb 03, 2020
```
Development

See merge request !119
```
  f5c8469a
- Merge branch '180-incrementar-sistema-de-grade-curricular' into 'development' · 28cc421c
  bhmeyer authored Feb 03, 2020
```
Resolve "Incrementar sistema de grade curricular"

See merge request !118
```
  28cc421c
- Resolve "Incrementar sistema de grade curricular" · a76b3d7b
  bhmeyer authored Feb 03, 2020
  
  a76b3d7b
12 Dec, 2019 3 commits
- Merge branch 'development' into 'master' · ab5b04be
  bhmeyer authored Dec 12, 2019
```
Deploy

See merge request !117
```
  ab5b04be
- Merge branch '180-incrementar-sistema-de-grade-curricular' into 'development' · e4b2c3ef
  bhmeyer authored Dec 12, 2019
```
Resolve "Incrementar sistema de grade curricular"

Closes #180

See merge request !116
```
  e4b2c3ef
- Resolve "Incrementar sistema de grade curricular" · 10268f98
  bhmeyer authored Dec 12, 2019
  
  10268f98
12 Nov, 2019 3 commits
- Merge branch 'development' into 'master' · a9b9a467
  Luis Floriano authored Nov 12, 2019
```
Development

See merge request !115
```
  a9b9a467
- Merge branch '219-fazer-heatmap-para-grade' into 'development' · e4f535e4
  Luis Floriano authored Nov 12, 2019
```
Resolve "Fazer heatmap para grade"

Closes #219

See merge request !114
```
  e4f535e4
- Resolve "Fazer heatmap para grade" · 83816d27
  msrr18 authored Nov 12, 2019
  
  83816d27
05 Nov, 2019 2 commits
- Merge branch '200-identificar-provaveis-formandos' into 'development' · 35e144b2
  tsv19 authored Nov 05, 2019
```
Resolve "Identificar prováveis formandos"

Closes #200

See merge request !112
```
  35e144b2
- Resolve "Identificar prováveis formandos" · 17f12751
  Ana Paula Sodré authored Nov 05, 2019
  
  17f12751
21 Oct, 2019 2 commits
- Merge branch '215-bug-acesso-anonimo-a-pagina-de-comparacao-de-disciplina' into 'development' · 4d612607
  ppa19 authored Oct 21, 2019
```
Resolve "Bug: Acesso anônimo à página de comparação de disciplina"

Closes #215

See merge request !110
```
  4d612607
- Resolve "Bug: Acesso anônimo à página de comparação de disciplina" · 7fed6c7c
  Odair M. authored Oct 21, 2019
  
  7fed6c7c
01 Oct, 2019 1 commit

Merge branch '220-fixar-as-versoes-dos-plugins' into 'development' · 614d76c9

bhmeyer authored Oct 01, 2019

Closes #220: fixa versão de todas as dependencias com base na versão...

Closes #220

See merge request !109

614d76c9