Commits · 1158044382fb881b3bde23f1581d785485f96d21 · Richard Fernando Heise Ferreira / cleaning-portalmec · GitLab

Snippets Groups Projects

Nov 13, 2016
- Merge branch 'fix_activities' into 'master' · 11580443
  Mateus Rambo Strey authored 8 years ago
  
  Fix activities Included recipient declaration in trackable models See merge request !324
  11580443
Nov 11, 2016
- Merge branch 'master' into fix_activities · ee831c2a
  Israel Barreto Sant'Anna authored 8 years ago
  
  ee831c2a
Nov 10, 2016
- Fixed activities recipient · 2902abf3
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  2902abf3
Nov 09, 2016
- fix object_type name in search [missing file] · 7395d0d4
  Mateus Rambo Strey authored 8 years ago
  
  7395d0d4
- fix object_type name in search · 3ae6078e
  Mateus Rambo Strey authored 8 years ago
  
  3ae6078e
- index learning object's object type id in elasticsearch · f9962ced
  Mateus Rambo Strey authored 8 years ago
  
  f9962ced
- add missing fields to learning object serializer · 2c824da8
  Mateus Rambo Strey authored 8 years ago
  
  2c824da8
- add rack-attack and optize search eager loaders · 756de6d1
  Mateus Rambo Strey authored 8 years ago
  
  756de6d1
- Fixed merge conflicts · a4ea0e6a
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  a4ea0e6a
Nov 08, 2016
- add some tests to locustfile · 50851399
  Mateus Rambo Strey authored 8 years ago
  
  50851399
- Included recipient declaration in trackable models. Changed user watching action to following. · 7a57eefb
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  7a57eefb
- add example locustfile · 5dd4db90
  Mateus Rambo Strey authored 8 years ago
  
  5dd4db90
- add cache to serializers · ea076e2c
  Mateus Rambo Strey authored 8 years ago
  
  ea076e2c
- http_cache_forever in learning objects index · 4be28b0d
  Mateus Rambo Strey authored 8 years ago
  
  4be28b0d
- cache learning object serializer · dc31a459
  Mateus Rambo Strey authored 8 years ago
  
  dc31a459
- Merge branch 'user_description' into 'master' · f0d9a51a
  Mateus Rambo Strey authored 8 years ago
  
  User description See merge request !322
  f0d9a51a
- updating users tests · 85d75ab7
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  85d75ab7
- add description in controller and serializer of user · 34657d98
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  34657d98
- Add description parameter in permited parameters in user creation · da8422aa
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  da8422aa
- Add column description in users table · 0c68bf88
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  0c68bf88
- get subjects and educational stages ids in search · b1c3fa36
  Mateus Rambo Strey authored 8 years ago
  
  b1c3fa36
- add subjects and educational_stages to search · 524e3f4b
  Mateus Rambo Strey authored 8 years ago
  
  524e3f4b
Nov 07, 2016
- fix collection update and tests · 427a604b
  Mateus Rambo Strey authored 8 years ago
  
  427a604b
- Merge branch 'Social-authentication' into 'master' · a106d73c
  Mateus Rambo Strey authored 8 years ago
  
  Added Omniauth config/initializers, removed skipped omniauth callback See merge request !321
  a106d73c
- Merge branch 'delete_collections' into 'master' · 656d0932
  Mateus Rambo Strey authored 8 years ago
  
  Change destroy method, only owner user can destroy collection See merge request !319
  656d0932
- Merge branch 'master' into 'delete_collections' · b56b0517
  Mateus Rambo Strey authored 8 years ago
  
  # Conflicts: # test/controllers/v1/collections_controller_test.rb
  b56b0517
- Merge branch 'collection_patch_test' into 'master' · ee9451ea
  Mateus Rambo Strey authored 8 years ago
  
  Added collection update test See merge request !317
  ee9451ea
- Update collections_controller_test.rb · 146b61b8
  Mateus Rambo Strey authored 8 years ago
  
  146b61b8
- Merge branch 'master' into 'collection_patch_test' · 9deac0d3
  Mateus Rambo Strey authored 8 years ago
  
  # Conflicts: # test/controllers/v1/collections_controller_test.rb
  9deac0d3
Nov 04, 2016
- add elasticsearch script to calculate search score · 0a8ffefb
  Mateus Rambo Strey authored 8 years ago
  
  0a8ffefb
- Added Omniauth config/initializers, removed skipped omniauth callback · 3612a920
  Bruno FS authored 8 years ago
  
  3612a920
- Update collections_controller.rb · f32471f4
  Mateus Rambo Strey authored 8 years ago
  
  f32471f4
- Merge branch 'delete_objects' into 'master' · ade05c91
  Mateus Rambo Strey authored 8 years ago
  
  add remove collection item See merge request !314
  ade05c91
Nov 03, 2016
- fix typo · 9d198837
  Mateus Rambo Strey authored 8 years ago
  
  9d198837
- Update collections_controller.rb · 9cd35ac6
  Mateus Rambo Strey authored 8 years ago
  
  9cd35ac6
- Update collections_controller.rb · c985ef54
  Mateus Rambo Strey authored 8 years ago
  
  c985ef54
- fix some tests · a2051bbf
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  a2051bbf
- Fix failure on delete collection test · 3b3e50be
  Bernardo Chagas authored 8 years ago
  
  3b3e50be
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into delete_collections · 4aaccf8b
  Bernardo Chagas authored 8 years ago
  
  4aaccf8b
- Add 'user delete collection' tests · 94ec92a5
  Bernardo Chagas authored 8 years ago
  
  94ec92a5