Commits · c7aa03ac4c216f103b00ac220cf9dec78336b6dd · Richard Fernando Heise Ferreira / cleaning-portalmec

Dec 21, 2017
- Merge branch 'issue/282' into 'master' · c7aa03ac
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  SCRUM#282: Change on return after login - roles See merge request portalmec/portalmec!469
  c7aa03ac
Dec 11, 2017
- SCRUM#282: Change on return after login - roles · 625b13aa
  Clarissa authored 7 years ago
  
  625b13aa
Dec 05, 2017
- remove foreign key from learning_object attachments · 24481fa3
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  24481fa3
- delete attachment from learning_object.attachments · c60bcca5
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  c60bcca5
- Merge branch 'fix-attachments' into 'master' · f133b6a6
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  update default attachment when delete attachment See merge request portalmec/portalmec!468
  f133b6a6
- update default attachment when delete attachment · 25eb870f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  25eb870f
Dec 04, 2017
- Merge branch 'issue/282' into 'master' · a0b975a2
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  SCRUM#282: add role_ids to user return on login See merge request portalmec/portalmec!467
  a0b975a2
- SCRUM#282: add role_ids to user return on login · 7726d33c
  Clarissa authored 7 years ago
  
  7726d33c
Dec 01, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 80f4a7cb
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  80f4a7cb
- change download link to return link when link is not blank · 48aab44c
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  48aab44c
Nov 29, 2017

Merge branch 'issue/283' into 'master' · 66d32638

Marcela Ribeiro de Oliveira authored 7 years ago

SCRUM#283: created and updated policies for scores and languages

See merge request portalmec/portalmec!466

66d32638

Nov 28, 2017
- Added some commentary important for getting the right IP in production · f41dfab9
  Israel Barreto Sant'Anna authored 7 years ago
  
  f41dfab9
- change default from in contacts mailer · af792d9f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  af792d9f
- SCRUM#283: created and updated policies for scores and languages · 9773e359
  Clarissa authored 7 years ago
  
  9773e359
Nov 22, 2017
- Added .avi to video converter · 312c72bc
  Israel Barreto Sant'Anna authored 7 years ago
  
  312c72bc
- Merge branch 'update-docs' into 'master' · 5bb0f3a5
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Update docs See merge request portalmec/portalmec!465
  5bb0f3a5
- sign_in test · c6acec7f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  c6acec7f
- fix /activities/me route · 65d8da02
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  65d8da02
- add users followers docs · 11537b84
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  11537b84
- small fix · cd794c6e
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  cd794c6e
- Merge branch 'issue/282' into 'master' · ce457dae
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Issue/282 See merge request portalmec/portalmec!464
  ce457dae
Nov 21, 2017
- Update user_serializer.rb; remove puts · 4edadf81
  Clarissa authored 7 years ago
  
  4edadf81
Nov 20, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/282 · 6cbbe40f
  Clarissa authored 7 years ago
  
  6cbbe40f
- SCRUM#282: loop over role_ids; change of strategy return roles from users · 4511f96b
  Clarissa authored 7 years ago
  
  4511f96b
- Merge branch 'issue/282' into 'master' · f54a723d
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  SCRUM#282: fixing return role_ids from users See merge request portalmec/portalmec!462
  f54a723d
- 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