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

May 16, 2017
- Merge branch 'master' into 'list' · b10a3500
  Clarissa authored 7 years ago
  
  # Conflicts: # app/controllers/v1/learning_objects_controller.rb
  b10a3500
May 12, 2017
- #245: magnetlink added to learning_objects · a518f1e6
  Clarissa authored 7 years ago
  
  a518f1e6
- Merge branch 'curator' into 'master' · 4ee03458
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Curator See merge request !419
  4ee03458
- send curator as dc.curator metadata to dspace · e5647d67
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  e5647d67
- permit curator in learning_object upload · dac7cad5
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  dac7cad5
- returning curator in learning_object serializer · ca79cfc7
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  ca79cfc7
- add curator field to learning_object model · 0ade6cfc
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  0ade6cfc
May 11, 2017
- Merge branch 'elasticsearch-fix' into 'master' · c64cc183
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Elasticsearch fix See merge request !418
  c64cc183
- fix search · 75f46821
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  75f46821
May 10, 2017
- update Gemfile.lock · 225d75af
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  225d75af
- remove searchkick version · ea4a2375
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  ea4a2375
- initializer to elasticsearch · 7a1bf0fa
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  7a1bf0fa
May 09, 2017
- Merge branch 'bugs' into 'master' · 97e0662c
  Israel Barreto Sant'Anna authored 7 years ago
  
  Bugs - Collections See merge request !417
  97e0662c
- #241: fix bug - show collection of cuurent_user (index) · 65a9d2f8
  Clarissa authored 7 years ago
  
  65a9d2f8
May 08, 2017
- #214: fix bug - Dont show private collection inside a public collection · 02b7b1a1
  Clarissa authored 7 years ago
  
  02b7b1a1
May 04, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 817245d9
  Clarissa authored 7 years ago
  
  817245d9
May 03, 2017
- Merge branch 'avatar-in-institution' into 'master' · 4d58eaa6
  Israel Barreto Sant'Anna authored 7 years ago
  
  Avatar in institution See merge request !416
  4d58eaa6
- add avatar in model and serializer of institution · b6ce54cf
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  b6ce54cf
- migration to add avatar to institutions · fbc6330e
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  fbc6330e
May 02, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 59e8fb3f
  Clarissa authored 7 years ago
  
  59e8fb3f
Apr 20, 2017
- Merge branch 'rspec' into 'master' · 99bfc716
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Rspec See merge request !415
  99bfc716
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 1a0dc293
  Clarissa authored 7 years ago
  
  1a0dc293
Apr 19, 2017
- Fix activity creation on destroy · a5c45ca0
  Israel Barreto Sant'Anna authored 7 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  a5c45ca0
- Double declaration · 7ac730e1
  Clarissa authored 7 years ago
  
  7ac730e1
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
- Merge branch 'elasticsearch_update' into 'master' · c221f5e4
  Israel Barreto Sant'Anna authored 7 years ago
  
  Elasticsearch update See merge request !413
  c221f5e4
- Merge branch 'master' into elasticsearch_update · 6a35af76
  Israel Barreto Sant'Anna authored 7 years ago
  
  6a35af76
- Merge branch 'suggestions-mailer' into 'master' · 59387a6d
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Suggestions mailer See merge request !412
  59387a6d
- #218: Copying old descriptions · 63e9270f
  Clarissa authored 7 years ago
  
  63e9270f
Apr 11, 2017
- Fixed search for elasticsearch 5.3.0 · 601822a0
  Israel Barreto Sant'Anna authored 7 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  601822a0
Apr 06, 2017
- views to suggestion mailer · 413a4f78
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  413a4f78
- suggestions mailer · b0b483ea
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  b0b483ea
- sent email when a suggestion is created or updated · a9d945a4
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  a9d945a4
Apr 05, 2017
- add default from · c3a6f741
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  c3a6f741
- Merge branch 'sent-emails' into 'master' · aa299b93
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Sent emails See merge request !411
  aa299b93
- default from is set in config/environments · 98679e1b
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  98679e1b
- send email when a contact is updated too · d6c1767c
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  d6c1767c
- ... · 64a66814
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  64a66814