Commits · 750d84103162ad9fcf12cc7deb1bcf8ac85e23b6 · Richard Fernando Heise Ferreira / cleaning-portalmec

Jan 09, 2017
- Merge branch 'update-user-model' into 'master' · 750d8410
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  Add nickname column to user model See merge request !348
  750d8410
- Add nickname column to user model · 09ad2399
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  09ad2399
Dec 09, 2016
- Merge branch 'user-devise-serializer' into 'master' · 47f2591a
  Giovanne Marcelo authored 8 years ago
  
  add user devise serializer See merge request !347
  47f2591a
- add user devise serializer · ab8828bd
  Giovanne Marcelo authored 8 years ago
  
  ab8828bd
- Merge branch 'add-complained' into 'master' · e976df6f
  Giovanne Marcelo authored 8 years ago
  
  fixed See merge request !346
  e976df6f
- fixed · df525197
  Bruno FS authored 8 years ago
  
  df525197
- Merge branch 'add-complained' into 'master' · 56db2009
  Giovanne Marcelo authored 8 years ago
  
  Add complained See merge request !344
  56db2009
- Added reviewed and complained to serializers · 3cc79d85
  Bruno FS authored 8 years ago
  
  3cc79d85
- Fixed 'complained?', added to serializer · f712775e
  Bruno FS authored 8 years ago
  
  f712775e
- Merge branch 'fix-collection_item_serializer' into 'master' · 8a11d181
  Giovanne Marcelo authored 8 years ago
  
  Fix collection item serializer See merge request !342
  8a11d181
- Added flag to serializer & complained? · ed0de2ff
  Bruno FS authored 8 years ago
  
  ed0de2ff
- update review controller · 4f2be9a5
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  4f2be9a5
- Add route to update review · 2e6079eb
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  2e6079eb
- Removed from cache, changed attribute name · d4b8c136
  Bruno FS authored 8 years ago
  
  d4b8c136
- Added to serializer & 'reviewed?' · 3c37181c
  Bruno FS authored 8 years ago
  
  3c37181c
- Merge branch 'add-liked' into 'master' · d6a3ba2e
  Giovanne Marcelo authored 8 years ago
  
  add liked in collection serializer and collection min serializer See merge request !341
  d6a3ba2e
- add liked in collection serializer and collection min serializer · 1fec9841
  Giovanne Marcelo authored 8 years ago
  
  1fec9841
Dec 08, 2016
- Merge branch 'fix-collection_item_serializer' into 'master' · 7789dc50
  Giovanne Marcelo authored 8 years ago
  
  fix show See merge request !340
  7789dc50
- fix show · 6a7fbe96
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  6a7fbe96
- Merge branch 'fix-collection_item_serializer' into 'master' · 31ad71e4
  Giovanne Marcelo authored 8 years ago
  
  Fix collection item serializer See merge request !339
  31ad71e4
- update complaints reasons · e3426b75
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  e3426b75
- Merge branch 'fix-like' into 'master' · 9f15a55e
  Giovanne Marcelo authored 8 years ago
  
  remove likes_count caching See merge request !338
  9f15a55e
- Merge branch 'fix_activities_filter' into 'master' · 2d9f214a
  Giovanne Marcelo authored 8 years ago
  
  Changed activities filter Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br> See merge request !337
  2d9f214a
- Changed activities filter · 0559ab42
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  0559ab42
Dec 07, 2016
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into... · 9a2fe8af
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-collection_item_serializer
  9a2fe8af
- Change complaints reasons · d10d1b5a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  d10d1b5a
- remove likes_count caching · da149c07
  Giovanne Marcelo authored 8 years ago
  
  da149c07
Dec 06, 2016
- Update learning_object_serializer.rb · badacd18
  Mateus Rambo Strey authored 8 years ago
  
  badacd18
- change allowed content_type in user avatar · c31cce68
  Mateus Rambo Strey authored 8 years ago
  
  c31cce68
Dec 05, 2016
- Merge branch 'filter_activity' into 'master' · cdf7473b
  Mateus Rambo Strey authored 8 years ago
  
  Filter activities Added filter to activities See merge request !336
  cdf7473b
- Merge branch 'master' into filter_activity · dcd47736
  Israel Barreto Sant'Anna authored 8 years ago
  
  dcd47736
- Created ActivitiesFilterService to maintain the code in one place · 6e5dd497
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  6e5dd497
Dec 02, 2016
- validate learning_object's dspace_id only in creation · 0a75266f
  Mateus Rambo Strey authored 8 years ago
  
  0a75266f
- Merge branch 'master' into filter_activity · ccfff5e8
  Israel Barreto Sant'Anna authored 8 years ago
  
  ccfff5e8
- Added filter to activities · 9daef03e
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  9daef03e
Nov 30, 2016
- Merge branch 'fix-collection_item_serializer' into 'master' · 60ed315d
  Mateus Rambo Strey authored 8 years ago
  
  fix destroy items See merge request !335
  60ed315d
- fix destroy items · 6d0490ff
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  6d0490ff
- Merge branch 'fix-collection_item_serializer' into 'master' · 5c89aa32
  Mateus Rambo Strey authored 8 years ago
  
  CollectionMinSerializer See merge request !334
  5c89aa32
- CollectionMinSerializer · 523a9683
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  523a9683
Nov 28, 2016
- Merge branch 'add-items-to-collection' into 'master' · 04a047ae
  Mateus Rambo Strey authored 8 years ago
  
  Add items to collection See merge request !333
  04a047ae