Commits · 519bb04a1b52f5e06aa2bac72f151f18affb3a25 · Richard Fernando Heise Ferreira / cleaning-portalmec

Nov 20, 2017
- Merge branch 'master' into 'issue/282' · 519bb04a
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  # Conflicts: # app/serializers/user_serializer.rb
  519bb04a
- SCRUM#282: fixing return role_ids from users · dd760fd9
  Clarissa authored 7 years ago
  
  dd760fd9
- Merge branch 'issue/282' into 'master' · 64def090
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  SCRUM#282: fixing return role_ids from users See merge request portalmec/portalmec!461
  64def090
- SCRUM#282: fixing return role_ids from users · 049efa79
  Clarissa authored 7 years ago
  
  049efa79
Nov 14, 2017
- Merge branch 'issue/282' into 'master' · 85a3cd89
  Israel Barreto Sant'Anna authored 7 years ago
  
  SCRUM#282: Updating paginator and return after destroy See merge request portalmec/portalmec!460
  85a3cd89
- SCRUM#282: Updating paginator and return after destroy · 50c6903c
  Clarissa authored 7 years ago
  
  50c6903c
Oct 29, 2017

Merge branch 'issue/282' into 'master' · 2c12352f

Israel Barreto Sant'Anna authored 7 years ago

SCRUM#282: changed scores paginator request and users response on delete

See merge request portalmec/portalmec!459

2c12352f

Oct 26, 2017
- SCRUM#282: changed scores paginator request and users response on delete · 7b68cd35
  Clarissa authored 7 years ago
  
  7b68cd35
Oct 25, 2017
- send emails from contacts and suggestions to MEC · 9f6a16be
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  9f6a16be
Oct 20, 2017
- Merge branch 'issue/281' into 'master' · 71456575
  Israel Barreto Sant'Anna authored 7 years ago
  
  SCRUM#281: changing return on pages through paginator for portalmec-admin See merge request portalmec/portalmec!458
  71456575
- Merge with conflicts · d3724ed6
  Clarissa authored 7 years ago
  
  d3724ed6
- Merge branch 'stable' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/281 · b0993d40
  Clarissa authored 7 years ago
  
  b0993d40
- SCRUM#281: adjusted order to a more clean and fast approach · d0178f2f
  Clarissa authored 7 years ago
  
  d0178f2f
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/281 · e4012553
  Clarissa authored 7 years ago
  
  e4012553
- Merge branch 'master' into stable · 0cbad669
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  0cbad669
- Merge branch 'stable' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · 6eba3618
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  6eba3618
- Fixed feed controller for empty follow · 461cd2ed
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  461cd2ed
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · 8e090a99
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  8e090a99
Oct 19, 2017
- SCRUM#281: changing return on pages through paginator for portalmec-admin · 7d98a31c
  Clarissa authored 7 years ago
  
  7d98a31c
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/281 · 4d77d146
  Clarissa authored 7 years ago
  
  4d77d146
- SCRUM#281: changing return on pages through paginator for portalmec-admin · 1e485ab4
  Clarissa authored 7 years ago
  
  1e485ab4
- Merge branch 'master' into stable · 8dc8233c
  Israel Barreto Sant'Anna authored 7 years ago
  
  8dc8233c
- Merge branch 'fix_activity_draft' into 'master' · b5493c32
  Israel Barreto Sant'Anna authored 7 years ago
  
  Fix activity draft See merge request portalmec/portalmec!457
  b5493c32
- Fixed LO drafts activities privacy · 9a74443a
  Israel Barreto Sant'Anna authored 7 years ago
  
  9a74443a
Oct 18, 2017
- Added privacy to LearningObject · 4e369210
  Israel Barreto Sant'Anna authored 7 years ago
  
  4e369210
Oct 17, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · f2dcb31c
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  f2dcb31c
- Added order by score on learning_object index · 9656aec2
  Israel Barreto Sant'Anna authored 7 years ago
  
  9656aec2
- Removed drafts from learning_objects index · 963b40ea
  Israel Barreto Sant'Anna authored 7 years ago
  
  963b40ea
Oct 05, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · 1d196681
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  1d196681
- Merge branch 'issue/280' into 'master' · 48873f38
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  SCRUM#280: fixed paginator return See merge request !456
  48873f38
- SCRUM#280: fixed paginator return · c53fa48d
  Clarissa authored 7 years ago
  
  c53fa48d
Oct 03, 2017
- Changed tag search parameter from id to name · 19ab3d69
  Israel Barreto Sant'Anna authored 7 years ago
  
  19ab3d69
Sep 25, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · e2ca7b86
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  e2ca7b86
- Merge branch 'update-roles' into 'master' · dc33ade2
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  change update learning_object policy See merge request !455
  dc33ade2
- change update learning_object policy · 4758d2fb
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  4758d2fb
Sep 05, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into stable · f17a0f33
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  f17a0f33
- Merge branch 'followable-owner' into 'master' · c397acee
  Israel Barreto Sant'Anna authored 7 years ago
  
  serialize deeply See merge request !454
  c397acee
- serialize deeply · 027b66d7
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  027b66d7
Aug 30, 2017
- Merge branch 'issue/275' into 'master' · 83c9fa45
  Israel Barreto Sant'Anna authored 7 years ago
  
  Issue/275 See merge request !453
  83c9fa45
Aug 28, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/275 · 070cc735
  Clarissa authored 7 years ago
  
  070cc735