Commits · 535c9c7f3dc2c076659ef833f051e7cd5db02b21 · Richard Fernando Heise Ferreira / cleaning-portalmec

Jun 02, 2017
- select and sort activities · 535c9c7f
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  535c9c7f
Jun 01, 2017
- Merge branch 'count-published-objects' into 'master' · 100f900d
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  change learning_objects_count to return only the published objects See merge request !437
  100f900d
- change learning_objects_count to return only the published objects · 88ecd877
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  88ecd877
- Merge branch 'trackable-params' into 'master' · 2aa142f1
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Added name to trackable params when in destroy activity See merge request !436
  2aa142f1
May 31, 2017
- Merge branch 'followed' into 'master' · 9ee22ba6
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  Followed See merge request !435
  9ee22ba6
- fix followed method in collection · 7b69d763
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  7b69d763
- fix followed method · a41cc40e
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  a41cc40e
May 26, 2017
- Merge branch 'bugs' into 'master' · d52e3c24
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  #252 - bugs See merge request !434
  d52e3c24
- #252: set link to null when object type is changed · 2476b3d0
  Clarissa authored 7 years ago
  
  2476b3d0
- Merge branch 'modifications' into 'master' · 283e611b
  Israel Barreto Sant'Anna authored 7 years ago
  
  #204 - Modifications See merge request !432
  283e611b
- fix PUT test · a7bb332e
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  a7bb332e
May 25, 2017
- Merge branch 'bugs' into 'master' · 2f2c1832
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  #255 - bugs See merge request !433
  2f2c1832
- #255: fix destroy learning_object with Institution owner · 3f4e77a1
  Clarissa authored 7 years ago
  
  3f4e77a1
- Fix some tests that now require to be logged in as admin · a8d1c165
  Marcela Ribeiro de Oliveira authored 7 years ago
  
  a8d1c165
- #204: Error with learning_objects check · 574f4b93
  Clarissa authored 7 years ago
  
  574f4b93
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into modifications · 24b0ca02
  Clarissa authored 7 years ago
  
  24b0ca02
- #204: commitão of changing policies to add a moderator · 916dbbc4
  Clarissa authored 7 years ago
  
  916dbbc4
- 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
- Added name to trackable params when in destroy activity · c0202177
  Israel Barreto Sant'Anna authored 7 years ago
  
  c0202177
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 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into modifications · 40ebaa90
  Clarissa authored 7 years ago
  
  40ebaa90
- 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