Commits · 1d2c450c81347c6a3fad4ba4e290066349e22828 · Richard Fernando Heise Ferreira / cleaning-portalmec

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
- 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 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 711c7a18
  Clarissa authored 7 years ago
  
  711c7a18
- 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