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

Dec 08, 2016
- update complaints reasons · e3426b75
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  e3426b75
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
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
- solve conflicts · c55103aa
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  c55103aa
- fix collection_item serializer · be2eb56a
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  be2eb56a
- add gem acts_as_list · ed0546ea
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  ed0546ea
- fix add items to collection method · 001e7f51
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  001e7f51
- Migrate colection_item column name · 4a0922a4
  Marcela Ribeiro de Oliveira authored 8 years ago
  
  4a0922a4
- Merge branch 'collections-controller-update' into 'master' · 662d2c9b
  Mateus Rambo Strey authored 8 years ago
  
  Fix error in update See merge request !332
  662d2c9b
- Fix error in update · af665266
  Bernardo Chagas authored 8 years ago
  
  af665266
Nov 26, 2016
- add thumbnail to collection serializer · f7afb780
  Mateus Rambo Strey authored 8 years ago
  
  f7afb780
Nov 25, 2016
- add likes_count and review_average to collection serializer · 75a71f62
  Mateus Rambo Strey authored 8 years ago
  
  75a71f62
- regression in devise' session controller to work with ng-token-auth · 6a3c9338
  Mateus Rambo Strey authored 8 years ago
  
  6a3c9338
- add provider to user serializer · 2f5879af
  Mateus Rambo Strey authored 8 years ago
  
  2f5879af
- Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec · 397e7faf
  Mateus Rambo Strey authored 8 years ago
  
  397e7faf
- add counters to user auth sign in object · a1d36ebc
  Mateus Rambo Strey authored 8 years ago
  
  a1d36ebc
- Merge branch 'collections-controller-update' into 'master' · 88f69753
  Mateus Rambo Strey authored 8 years ago
  
  Fix update error in extra_params See merge request !331
  88f69753
- Fix update error in extra_params · 62bec799
  Bernardo Chagas authored 8 years ago
  
  62bec799
- fix collection creation · 2fb0ab22
  Mateus Rambo Strey authored 8 years ago
  
  2fb0ab22
- update locales to rails 5 · cc528411
  Mateus Rambo Strey authored 8 years ago
  
  cc528411
Nov 24, 2016
- add drafts route · 9b1e1168
  Mateus Rambo Strey authored 8 years ago
  
  9b1e1168
- add owner to collection serializer · 8abb1c71
  Mateus Rambo Strey authored 8 years ago
  
  8abb1c71
Nov 23, 2016
- Merge branch 'show-all-activities' into 'master' · c9c2a381
  Mateus Rambo Strey authored 8 years ago
  
  Show all activities Changed activities index to show all activities. Created activities/me route. Added privacy to activities See merge request !330
  c9c2a381
- Added activities to user on create and update · 81f42813
  Israel Barreto Sant'Anna authored 8 years ago
  
  Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
  81f42813
- Merge branch 'master' into show-all-activities · 31b10223
  Israel Barreto Sant'Anna authored 8 years ago
  
  31b10223
- remove junk · 552cbe55
  Mateus Rambo Strey authored 8 years ago
  
  552cbe55
- Merge branch 'publisher_route' into 'master' · c1e482ea
  Mateus Rambo Strey authored 8 years ago
  
  Create route for Publisher See merge request !327
  c1e482ea