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

May 25, 2017
- Merge branch 'rspec' into 'master' · eeedc04f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Rspec See merge request !431
  eeedc04f
- fix searches tests · ffdb7135
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  ffdb7135
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into rspec · be0fa306
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  be0fa306
- Adding curator and thumbnail in learning_objects tests · 89419ffe
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  89419ffe
- Merge branch '256-follow-PUT' into 'master' · 2013314f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Added PUT route & follow_toggle action (closes SCRUM#256) Closes SCRUM#256 See merge request !430
  2013314f
May 24, 2017
- Added PUT route & follow_toggle action (closes SCRUM#256) · 38c1dcb8
  bfs15 authored 7 years ago
  
  38c1dcb8
May 23, 2017
- Merge branch 'licenses' into 'master' · 54eb410d
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  fix order when search all See merge request !427
  54eb410d
- fix order when search all · bf3cef59
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  bf3cef59
- Merge branch 'licenses' into 'master' · 77d2f0d3
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  fix order in search See merge request !426
  77d2f0d3
- fix order in search · e71d8ed4
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  e71d8ed4
May 22, 2017
- fix search pagination · 05146aee
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  05146aee
- Merge branch 'follow' into 'master' · 2bc58dd0
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Follow See merge request !425
  2bc58dd0
- returning followable and follower · ce8c9cb9
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  ce8c9cb9
- add relations · 5ecf2751
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  5ecf2751
- Merge branch 'bugs' into 'master' · 173ba855
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  #215: added deleted_at for collection_items; destroy all collection_items when collection is deleted See merge request !423
  173ba855
May 18, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into bugs · 1d2c450c
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  1d2c450c
- Merge branch 'rspec' into 'master' · bdff910e
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Factory :download See merge request !424
  bdff910e
- Factory :download · 2a66ad51
  Clarissa authored 7 years ago
  
  2a66ad51
- Update collections_controller.rb · 18f93392
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  18f93392
- #215: added deleted_at for collection_items; destroy all collection_items when... · 736a9296
  Clarissa authored 7 years ago
  
  #215: added deleted_at for collection_items; destroy all collection_items when collection is deleted
  736a9296
- Merge branch 'collection-curator' into 'master' · d6fb5ff5
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Collection curator See merge request !422
  d6fb5ff5
- showing curator · 81b73a4a
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  81b73a4a
- permit curator in create and update collection · 042e9e02
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  042e9e02
- migration to add curaton field in collection model · ed71de4f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  ed71de4f
May 17, 2017
- Merge branch 'list' into 'master' · 010b118a
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  List - elasticsearch search See merge request !421
  010b118a
- #247: search return the number requested per_page and which page · c9e426bd
  Clarissa authored 7 years ago
  
  c9e426bd
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · b22d7ffb
  Clarissa authored 7 years ago
  
  b22d7ffb
May 16, 2017
- Merge branch 'list' into 'master' · 99536400
  Israel Barreto Sant'Anna authored 7 years ago
  
  List - Magnetlink See merge request !420
  99536400
- Merge branch 'master' into 'list' · b10a3500
  Clarissa authored 7 years ago
  
  # Conflicts: # app/controllers/v1/learning_objects_controller.rb
  b10a3500
May 15, 2017
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 2cb84884
  Clarissa authored 7 years ago
  
  2cb84884
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
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 1a7d2130
  Clarissa authored 7 years ago
  
  1a7d2130
- 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