Commits · 609768e757618ddd4b5c53fac29762ee1fe4d860 · Richard Fernando Heise Ferreira / cleaning-portalmec

Apr 17, 2017
- #218: Merge problems · 609768e7
  Clarissa authored 7 years ago
  
  609768e7
- Merge conflicts · 22498dad
  Clarissa authored 7 years ago
  
  22498dad
- #218: Split changes · e869ae86
  Clarissa authored 7 years ago
  
  e869ae86
Apr 12, 2017
- #218: Copying old descriptions · 63e9270f
  Clarissa authored 7 years ago
  
  63e9270f
Mar 29, 2017
- statistics test fixed · 6c62ab06
  Eduardo Machado authored 7 years ago
  
  6c62ab06
Mar 27, 2017
- 97: statistic tests fixed · e0ff8a88
  Eduardo Machado authored 8 years ago
  
  e0ff8a88
Mar 21, 2017
- #97: statistcs tests created. · 6738137e
  Eduardo Machado authored 8 years ago
  
  6738137e
Mar 13, 2017
- paginate collection index · ed215d0d
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  ed215d0d
- Merge branch 'rspec' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 060039da
  Israel Barreto Sant'Anna authored 8 years ago
  
  060039da
- Merge branch 'master' into rspec · b3f8adf7
  Israel Barreto Sant'Anna authored 8 years ago
  
  b3f8adf7
- Merge branch 'rspec' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 949d46b8
  bfs15 authored 8 years ago
  
  949d46b8
- Merge branch 'download-error-status' into 'master' · 66982d53
  Israel Barreto Sant'Anna authored 8 years ago
  
  Added error status to download if it cant find the link See merge request !388
  66982d53
- create role teacher to authenticate · c4f2eaef
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  c4f2eaef
- Added error status to download if it cant find the link · ee21f9f1
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  ee21f9f1
Mar 10, 2017
- changed TODO message · f4617a78
  bfs15 authored 8 years ago
  
  f4617a78
- Added education, roles_ids, subjects to Updating a user test · a63c7d43
  bfs15 authored 8 years ago
  
  a63c7d43
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · c08c4bee
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  c08c4bee
- Merge branch 'download_statistics' into 'master' · a6a02074
  Israel Barreto Sant'Anna authored 8 years ago
  
  Added download by month query to statistics controller See merge request !387
  a6a02074
- Added download by month query to statistics controller · 4d2accab
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  4d2accab
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 9d09a36c
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  9d09a36c
- Merge branch '197/cover' into 'master' · da55200a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  #197: Cover photo added to user attributes. See merge request !379
  da55200a
- solve merge conflicts · c79c074e
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  c79c074e
Mar 09, 2017
- restore Gemfile.lock · 04c81f9a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  04c81f9a
- fix collection test · 366cd76e
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  366cd76e
- Merge branch '212-user-update-policy-role-ids' into 'master' · 1a2ff12f
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  Fixed user update policy and role_ids update permissions Closes SCRUM#212 and SCRUM#213 See merge request !383
  1a2ff12f
- Restored Gemfile.lock · 5223b92d
  bfs15 authored 8 years ago
  
  5223b92d
- Merge branch 'master' into 212-user-update-policy-role-ids · 634eaac2
  bfs15 authored 8 years ago
  
  634eaac2
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 4a5619bc
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  4a5619bc
Mar 08, 2017
- Merge branch '201-add-fields-to-user' into 'master' · 6e922079
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  201 add fields to user Closes SCRUM#201 See merge request !384
  6e922079
- fix user serializer fields · 0feb293b
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  0feb293b
- Fixed user update policy and role_ids update permissions · 255c88aa
  bfs15 authored 8 years ago
  
  (closes portalmec/SCRUM#212, closes portalmec/SCRUM#213)
  255c88aa
- Merge branch 'master' into 201-add-fields-to-user · d1a9e688
  bfs15 authored 8 years ago
  
  (closes portalmec/SCRUM#201)
  d1a9e688
- user now subjectable · 1e38d046
  bfs15 authored 8 years ago
  
  1e38d046
- fix conflicts · ad4c2475
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  ad4c2475
- removing a bookmark acceptance test · 33c5501a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  33c5501a
- Merge branch 'rspec' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · 4dc33357
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  4dc33357
- merging · cb7172c6
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  cb7172c6
- Merge branch 'download_link' into 'master' · 484f555c
  Israel Barreto Sant'Anna authored 8 years ago
  
  Download link See merge request !382
  484f555c
- Merge branch 'master' into download_link · f53012c3
  Israel Barreto Sant'Anna authored 8 years ago
  
  f53012c3
- Removed default_location from learning object serializer · 3dca9752
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  3dca9752